diff --git a/src/services/llm/ai_service_manager.ts b/src/services/llm/ai_service_manager.ts
index 329574275..632124d43 100644
--- a/src/services/llm/ai_service_manager.ts
+++ b/src/services/llm/ai_service_manager.ts
@@ -8,7 +8,7 @@ import { ContextExtractor } from './context/index.js';
 import contextService from './context_service.js';
 import indexService from './index_service.js';
 import { getEmbeddingProvider, getEnabledEmbeddingProviders } from './providers/providers.js';
-import agentTools from './agent_tools/index.js';
+import agentTools from './context_extractors/index.js';
 
 // Import interfaces
 import type {
@@ -392,7 +392,7 @@ export class AIServiceManager implements IAIServiceManager {
 
             // Initialize agent tools with this service manager instance
             await agentTools.initialize(this);
-            
+
             // Initialize LLM tools - this is the single place where tools are initialized
             const toolInitializer = await import('./tools/tool_initializer.js');
             await toolInitializer.default.initializeTools();
diff --git a/src/services/llm/agent_tools/contextual_thinking_tool.ts b/src/services/llm/context_extractors/contextual_thinking_tool.ts
similarity index 100%
rename from src/services/llm/agent_tools/contextual_thinking_tool.ts
rename to src/services/llm/context_extractors/contextual_thinking_tool.ts
diff --git a/src/services/llm/agent_tools/index.ts b/src/services/llm/context_extractors/index.ts
similarity index 100%
rename from src/services/llm/agent_tools/index.ts
rename to src/services/llm/context_extractors/index.ts
diff --git a/src/services/llm/agent_tools/note_navigator_tool.ts b/src/services/llm/context_extractors/note_navigator_tool.ts
similarity index 100%
rename from src/services/llm/agent_tools/note_navigator_tool.ts
rename to src/services/llm/context_extractors/note_navigator_tool.ts
diff --git a/src/services/llm/agent_tools/query_decomposition_tool.ts b/src/services/llm/context_extractors/query_decomposition_tool.ts
similarity index 100%
rename from src/services/llm/agent_tools/query_decomposition_tool.ts
rename to src/services/llm/context_extractors/query_decomposition_tool.ts
diff --git a/src/services/llm/agent_tools/vector_search_tool.ts b/src/services/llm/context_extractors/vector_search_tool.ts
similarity index 100%
rename from src/services/llm/agent_tools/vector_search_tool.ts
rename to src/services/llm/context_extractors/vector_search_tool.ts
diff --git a/src/services/llm/interfaces/agent_tool_interfaces.ts b/src/services/llm/interfaces/agent_tool_interfaces.ts
index a9b7a20f8..dcf990827 100644
--- a/src/services/llm/interfaces/agent_tool_interfaces.ts
+++ b/src/services/llm/interfaces/agent_tool_interfaces.ts
@@ -1,8 +1,8 @@
 import type { ChatResponse } from '../ai_interface.js';
-import type { VectorSearchResult } from '../agent_tools/vector_search_tool.js';
-import type { NoteInfo, NotePathInfo, NoteHierarchyLevel } from '../agent_tools/note_navigator_tool.js';
-import type { DecomposedQuery, SubQuery } from '../agent_tools/query_decomposition_tool.js';
-import type { ThinkingProcess, ThinkingStep } from '../agent_tools/contextual_thinking_tool.js';
+import type { VectorSearchResult } from '../context_extractors/vector_search_tool.js';
+import type { NoteInfo, NotePathInfo, NoteHierarchyLevel } from '../context_extractors/note_navigator_tool.js';
+import type { DecomposedQuery, SubQuery } from '../context_extractors/query_decomposition_tool.js';
+import type { ThinkingProcess, ThinkingStep } from '../context_extractors/contextual_thinking_tool.js';
 import type BAttribute from '../../../becca/entities/battribute.js';
 
 /**