diff --git a/src/components/canvas/players/ai-icons.ts b/src/components/canvas/players/generation/icons.ts
similarity index 100%
rename from src/components/canvas/players/ai-icons.ts
rename to src/components/canvas/players/generation/icons.ts
diff --git a/src/components/canvas/players/ai-pending-overlay.ts b/src/components/canvas/players/generation/pending-overlay.ts
similarity index 99%
rename from src/components/canvas/players/ai-pending-overlay.ts
rename to src/components/canvas/players/generation/pending-overlay.ts
index 3f667235..c9086bbe 100644
--- a/src/components/canvas/players/ai-pending-overlay.ts
+++ b/src/components/canvas/players/generation/pending-overlay.ts
@@ -1,7 +1,7 @@
 import { getAuroraHues, hslToHex, truncatePrompt, getAiAssetTypeLabel } from "@core/shared/ai-asset-utils";
 import * as pixi from "pixi.js";
 
-import { type AiIconType, AI_ICON_FILL_PATHS } from "./ai-icons";
+import { type AiIconType, AI_ICON_FILL_PATHS } from "./icons";
 
 export type { AiIconType };
 
diff --git a/src/components/canvas/players/image-to-video-player.ts b/src/components/canvas/players/image-to-video-player.ts
index 081aec44..9d6d3600 100644
--- a/src/components/canvas/players/image-to-video-player.ts
+++ b/src/components/canvas/players/image-to-video-player.ts
@@ -5,7 +5,7 @@ import { type Size } from "@layouts/geometry";
 import { type ResolvedClip } from "@schemas";
 import * as pixi from "pixi.js";
 
-import { AiPendingOverlay } from "./ai-pending-overlay";
+import { AiPendingOverlay } from "./generation/pending-overlay";
 import { createPlaceholderGraphic } from "./placeholder-graphic";
 import { Player, PlayerType } from "./player";
 
diff --git a/src/components/canvas/players/text-to-image-player.ts b/src/components/canvas/players/text-to-image-player.ts
index 410123b1..2516ebca 100644
--- a/src/components/canvas/players/text-to-image-player.ts
+++ b/src/components/canvas/players/text-to-image-player.ts
@@ -3,7 +3,7 @@ import { computeAiAssetNumber, isAiAsset } from "@core/shared/ai-asset-utils";
 import { type Size } from "@layouts/geometry";
 import type { ResolvedClip } from "@schemas";
 
-import { AiPendingOverlay } from "./ai-pending-overlay";
+import { AiPendingOverlay } from "./generation/pending-overlay";
 import { Player, PlayerType } from "./player";
 
 export class TextToImagePlayer extends Player {
diff --git a/src/components/timeline/components/clip/clip-component.ts b/src/components/timeline/components/clip/clip-component.ts
index 4ae197b9..31e5d2ea 100644
--- a/src/components/timeline/components/clip/clip-component.ts
+++ b/src/components/timeline/components/clip/clip-component.ts
@@ -1,7 +1,7 @@
 import { aiAssetKind, getAiAssetTypeLabel, isAiAsset, type ResolvedClipWithId } from "@core/shared/ai-asset-utils";
 import type { ResolvedClip } from "@schemas";
 
-import { AI_ICON_LINE_PATHS } from "../../../canvas/players/ai-icons";
+import { AI_ICON_LINE_PATHS } from "../../../canvas/players/generation/icons";
 import { formatClipErrorMessage } from "../../error-messages";
 import type { ClipState, ClipRenderer } from "../../timeline.types";
 
diff --git a/tests/media-player-fallback.test.ts b/tests/media-player-fallback.test.ts
index 69f4c569..511abb2a 100644
--- a/tests/media-player-fallback.test.ts
+++ b/tests/media-player-fallback.test.ts
@@ -14,7 +14,7 @@ jest.mock("@canvas/players/placeholder-graphic", () => ({
 	createPlaceholderGraphic: mockCreatePlaceholderGraphic
 }));
 
-jest.mock("@canvas/players/ai-pending-overlay", () => ({
+jest.mock("@canvas/players/generation/pending-overlay", () => ({
 	AiPendingOverlay: jest.fn().mockImplementation(() => ({
 		getContainer: jest.fn(() => ({ destroy: jest.fn() })),
 		dispose: jest.fn()