diff --git a/src/core/ClaudeDev.ts b/src/core/ClaudeDev.ts
index 59a7407..fb1baa2 100644
--- a/src/core/ClaudeDev.ts
+++ b/src/core/ClaudeDev.ts
@@ -11,7 +11,7 @@ import { serializeError } from "serialize-error"
 import * as vscode from "vscode"
 import { ApiHandler, buildApiHandler } from "../api"
 import { TerminalManager } from "../integrations/TerminalManager"
-import { listFiles, parseSourceCodeForDefinitionsTopLevel } from "./tree-sitter"
+import { listFiles, parseSourceCodeForDefinitionsTopLevel } from "../services/tree-sitter"
 import { ClaudeDevProvider } from "./webviews/ClaudeDevProvider"
 import { ApiConfiguration } from "../shared/api"
 import { ClaudeRequestResult } from "../shared/ClaudeRequestResult"
diff --git a/src/integrations/WorkspaceTracker.ts b/src/integrations/WorkspaceTracker.ts
index 0e3e87a..2e6baf8 100644
--- a/src/integrations/WorkspaceTracker.ts
+++ b/src/integrations/WorkspaceTracker.ts
@@ -1,6 +1,6 @@
 import * as vscode from "vscode"
 import * as path from "path"
-import { listFiles } from "../core/tree-sitter/index"
+import { listFiles } from "../services/tree-sitter/index"
 import { ClaudeDevProvider } from "../core/webviews/ClaudeDevProvider"
 
 const cwd = vscode.workspace.workspaceFolders?.map((folder) => folder.uri.fsPath).at(0)
diff --git a/src/core/tree-sitter/index.ts b/src/services/tree-sitter/index.ts
similarity index 100%
rename from src/core/tree-sitter/index.ts
rename to src/services/tree-sitter/index.ts
diff --git a/src/core/tree-sitter/languageParser.ts b/src/services/tree-sitter/languageParser.ts
similarity index 100%
rename from src/core/tree-sitter/languageParser.ts
rename to src/services/tree-sitter/languageParser.ts
diff --git a/src/core/tree-sitter/queries/c-sharp.ts b/src/services/tree-sitter/queries/c-sharp.ts
similarity index 100%
rename from src/core/tree-sitter/queries/c-sharp.ts
rename to src/services/tree-sitter/queries/c-sharp.ts
diff --git a/src/core/tree-sitter/queries/c.ts b/src/services/tree-sitter/queries/c.ts
similarity index 100%
rename from src/core/tree-sitter/queries/c.ts
rename to src/services/tree-sitter/queries/c.ts
diff --git a/src/core/tree-sitter/queries/cpp.ts b/src/services/tree-sitter/queries/cpp.ts
similarity index 100%
rename from src/core/tree-sitter/queries/cpp.ts
rename to src/services/tree-sitter/queries/cpp.ts
diff --git a/src/core/tree-sitter/queries/go.ts b/src/services/tree-sitter/queries/go.ts
similarity index 100%
rename from src/core/tree-sitter/queries/go.ts
rename to src/services/tree-sitter/queries/go.ts
diff --git a/src/core/tree-sitter/queries/index.ts b/src/services/tree-sitter/queries/index.ts
similarity index 100%
rename from src/core/tree-sitter/queries/index.ts
rename to src/services/tree-sitter/queries/index.ts
diff --git a/src/core/tree-sitter/queries/java.ts b/src/services/tree-sitter/queries/java.ts
similarity index 100%
rename from src/core/tree-sitter/queries/java.ts
rename to src/services/tree-sitter/queries/java.ts
diff --git a/src/core/tree-sitter/queries/javascript.ts b/src/services/tree-sitter/queries/javascript.ts
similarity index 100%
rename from src/core/tree-sitter/queries/javascript.ts
rename to src/services/tree-sitter/queries/javascript.ts
diff --git a/src/core/tree-sitter/queries/php.ts b/src/services/tree-sitter/queries/php.ts
similarity index 100%
rename from src/core/tree-sitter/queries/php.ts
rename to src/services/tree-sitter/queries/php.ts
diff --git a/src/core/tree-sitter/queries/python.ts b/src/services/tree-sitter/queries/python.ts
similarity index 100%
rename from src/core/tree-sitter/queries/python.ts
rename to src/services/tree-sitter/queries/python.ts
diff --git a/src/core/tree-sitter/queries/ruby.ts b/src/services/tree-sitter/queries/ruby.ts
similarity index 100%
rename from src/core/tree-sitter/queries/ruby.ts
rename to src/services/tree-sitter/queries/ruby.ts
diff --git a/src/core/tree-sitter/queries/rust.ts b/src/services/tree-sitter/queries/rust.ts
similarity index 100%
rename from src/core/tree-sitter/queries/rust.ts
rename to src/services/tree-sitter/queries/rust.ts
diff --git a/src/core/tree-sitter/queries/swift.ts b/src/services/tree-sitter/queries/swift.ts
similarity index 100%
rename from src/core/tree-sitter/queries/swift.ts
rename to src/services/tree-sitter/queries/swift.ts
diff --git a/src/core/tree-sitter/queries/typescript.ts b/src/services/tree-sitter/queries/typescript.ts
similarity index 100%
rename from src/core/tree-sitter/queries/typescript.ts
rename to src/services/tree-sitter/queries/typescript.ts