diff --git a/src/core/ClaudeDev.ts b/src/core/ClaudeDev.ts
index c974ebc..418aff8 100644
--- a/src/core/ClaudeDev.ts
+++ b/src/core/ClaudeDev.ts
@@ -10,7 +10,7 @@ import * as path from "path"
 import { serializeError } from "serialize-error"
 import * as vscode from "vscode"
 import { ApiHandler, buildApiHandler } from "../api"
-import { TerminalManager } from "../integrations/TerminalManager"
+import { TerminalManager } from "../integrations/terminal/TerminalManager"
 import { parseSourceCodeForDefinitionsTopLevel } from "../services/tree-sitter"
 import { listFiles } from "../services/glob/list-files"
 import { ClaudeDevProvider } from "./webviews/ClaudeDevProvider"
diff --git a/src/core/webviews/ClaudeDevProvider.ts b/src/core/webviews/ClaudeDevProvider.ts
index 6f19aed..e095d7a 100644
--- a/src/core/webviews/ClaudeDevProvider.ts
+++ b/src/core/webviews/ClaudeDevProvider.ts
@@ -11,7 +11,7 @@ import { HistoryItem } from "../../shared/HistoryItem"
 import axios from "axios"
 import { getTheme } from "../../integrations/theme/getTheme"
 import { openFile, openImage } from "../../utils/open-file"
-import WorkspaceTracker from "../../integrations/WorkspaceTracker"
+import WorkspaceTracker from "../../integrations/workspace/WorkspaceTracker"
 import { openMention } from "../../utils/context-mentions"
 
 /*
diff --git a/src/integrations/DiagnosticsMonitor.ts b/src/integrations/diagnostics/DiagnosticsMonitor.ts
similarity index 100%
rename from src/integrations/DiagnosticsMonitor.ts
rename to src/integrations/diagnostics/DiagnosticsMonitor.ts
diff --git a/src/integrations/TerminalManager.ts b/src/integrations/terminal/TerminalManager.ts
similarity index 100%
rename from src/integrations/TerminalManager.ts
rename to src/integrations/terminal/TerminalManager.ts
diff --git a/src/integrations/WorkspaceTracker.ts b/src/integrations/workspace/WorkspaceTracker.ts
similarity index 100%
rename from src/integrations/WorkspaceTracker.ts
rename to src/integrations/workspace/WorkspaceTracker.ts