diff --git a/frontend/src/app/pages/Dashboard/DashboardOverlays.tsx b/frontend/src/app/pages/Dashboard/DashboardOverlays.tsx
index af96c309..51a948b7 100644
--- a/frontend/src/app/pages/Dashboard/DashboardOverlays.tsx
+++ b/frontend/src/app/pages/Dashboard/DashboardOverlays.tsx
@@ -1,9 +1,9 @@
 import React, { type RefObject } from 'react';
 import Box from '@mui/material/Box';
 import DashboardToolbar from './DashboardToolbar';
-import CanvasControls from './CanvasControls';
-import CardSearchPalette from './CardSearchPalette';
-import DirectionHints from './DirectionHints';
+import CanvasControls from './controls/CanvasControls';
+import CardSearchPalette from './controls/CardSearchPalette';
+import DirectionHints from './controls/DirectionHints';
 import type { AgentSession } from '@/shared/state/agentsSlice';
 import type {
   CardPosition,
diff --git a/frontend/src/app/pages/Dashboard/CanvasControls.tsx b/frontend/src/app/pages/Dashboard/controls/CanvasControls.tsx
similarity index 98%
rename from frontend/src/app/pages/Dashboard/CanvasControls.tsx
rename to frontend/src/app/pages/Dashboard/controls/CanvasControls.tsx
index 4999b8a2..29ff9bba 100644
--- a/frontend/src/app/pages/Dashboard/CanvasControls.tsx
+++ b/frontend/src/app/pages/Dashboard/controls/CanvasControls.tsx
@@ -9,7 +9,7 @@ import FitScreenIcon from '@mui/icons-material/FitScreen';
 import AutoAwesomeIcon from '@mui/icons-material/AutoAwesome';
 import MapIcon from '@mui/icons-material/Map';
 import { useClaudeTokens } from '@/shared/styles/ThemeContext';
-import type { CanvasActions } from './useCanvasControls';
+import type { CanvasActions } from '../useCanvasControls';
 import Minimap from './Minimap';
 import type { MinimapProps } from './Minimap';
 
diff --git a/frontend/src/app/pages/Dashboard/CardSearchPalette.tsx b/frontend/src/app/pages/Dashboard/controls/CardSearchPalette.tsx
similarity index 100%
rename from frontend/src/app/pages/Dashboard/CardSearchPalette.tsx
rename to frontend/src/app/pages/Dashboard/controls/CardSearchPalette.tsx
diff --git a/frontend/src/app/pages/Dashboard/CloseAgentDialog.tsx b/frontend/src/app/pages/Dashboard/controls/CloseAgentDialog.tsx
similarity index 100%
rename from frontend/src/app/pages/Dashboard/CloseAgentDialog.tsx
rename to frontend/src/app/pages/Dashboard/controls/CloseAgentDialog.tsx
diff --git a/frontend/src/app/pages/Dashboard/DirectionHints.tsx b/frontend/src/app/pages/Dashboard/controls/DirectionHints.tsx
similarity index 100%
rename from frontend/src/app/pages/Dashboard/DirectionHints.tsx
rename to frontend/src/app/pages/Dashboard/controls/DirectionHints.tsx
diff --git a/frontend/src/app/pages/Dashboard/Minimap.tsx b/frontend/src/app/pages/Dashboard/controls/Minimap.tsx
similarity index 100%
rename from frontend/src/app/pages/Dashboard/Minimap.tsx
rename to frontend/src/app/pages/Dashboard/controls/Minimap.tsx