diff --git a/src/routes/api/llm.ts b/src/routes/api/llm.ts
index e15859ed7..7cf70665b 100644
--- a/src/routes/api/llm.ts
+++ b/src/routes/api/llm.ts
@@ -13,7 +13,7 @@ import contextService from "../../services/llm/context_service.js";
 import sql from "../../services/sql.js";
 // Import the index service for knowledge base management
 import indexService from "../../services/llm/index_service.js";
-import { CONTEXT_PROMPTS } from '../../services/llm/llm_prompt_constants.js';
+import { CONTEXT_PROMPTS } from '../../services/llm/prompts/llm_prompt_constants.js';
 
 // LLM service constants
 export const LLM_CONSTANTS = {
diff --git a/src/services/llm/agent_tools/contextual_thinking_tool.ts b/src/services/llm/agent_tools/contextual_thinking_tool.ts
index 139f3e604..65acf334a 100644
--- a/src/services/llm/agent_tools/contextual_thinking_tool.ts
+++ b/src/services/llm/agent_tools/contextual_thinking_tool.ts
@@ -15,7 +15,7 @@
 
 import log from "../../log.js";
 import aiServiceManager from "../ai_service_manager.js";
-import { AGENT_TOOL_PROMPTS } from '../llm_prompt_constants.js';
+import { AGENT_TOOL_PROMPTS } from '../prompts/llm_prompt_constants.js';
 
 /**
  * Represents a single reasoning step taken by the agent
diff --git a/src/services/llm/agent_tools/query_decomposition_tool.ts b/src/services/llm/agent_tools/query_decomposition_tool.ts
index 4286982ee..99c871afe 100644
--- a/src/services/llm/agent_tools/query_decomposition_tool.ts
+++ b/src/services/llm/agent_tools/query_decomposition_tool.ts
@@ -13,7 +13,7 @@
  */
 
 import log from '../../log.js';
-import { AGENT_TOOL_PROMPTS } from '../llm_prompt_constants.js';
+import { AGENT_TOOL_PROMPTS } from '../prompts/llm_prompt_constants.js';
 
 export interface SubQuery {
     id: string;
diff --git a/src/services/llm/base_ai_service.ts b/src/services/llm/base_ai_service.ts
index 64f8e8299..daf63a7ec 100644
--- a/src/services/llm/base_ai_service.ts
+++ b/src/services/llm/base_ai_service.ts
@@ -1,6 +1,6 @@
 import options from '../options.js';
 import type { AIService, ChatCompletionOptions, ChatResponse, Message } from './ai_interface.js';
-import { DEFAULT_SYSTEM_PROMPT } from './llm_prompt_constants.js';
+import { DEFAULT_SYSTEM_PROMPT } from './prompts/llm_prompt_constants.js';
 
 export abstract class BaseAIService implements AIService {
     protected name: string;
diff --git a/src/services/llm/context/modules/context_formatter.ts b/src/services/llm/context/modules/context_formatter.ts
index c37767e66..89040aefd 100644
--- a/src/services/llm/context/modules/context_formatter.ts
+++ b/src/services/llm/context/modules/context_formatter.ts
@@ -1,6 +1,6 @@
 import sanitizeHtml from 'sanitize-html';
 import log from '../../../log.js';
-import { CONTEXT_PROMPTS } from '../../llm_prompt_constants.js';
+import { CONTEXT_PROMPTS } from '../../prompts/llm_prompt_constants.js';
 
 // Constants for context window sizes, defines in-module to avoid circular dependencies
 const CONTEXT_WINDOW = {
diff --git a/src/services/llm/context/modules/context_service.ts b/src/services/llm/context/modules/context_service.ts
index dd749c7a1..bd6091e73 100644
--- a/src/services/llm/context/modules/context_service.ts
+++ b/src/services/llm/context/modules/context_service.ts
@@ -6,7 +6,7 @@ import queryEnhancer from './query_enhancer.js';
 import contextFormatter from './context_formatter.js';
 import aiServiceManager from '../../ai_service_manager.js';
 import { ContextExtractor } from '../index.js';
-import { CONTEXT_PROMPTS } from '../../llm_prompt_constants.js';
+import { CONTEXT_PROMPTS } from '../../prompts/llm_prompt_constants.js';
 
 /**
  * Main context service that integrates all context-related functionality
diff --git a/src/services/llm/context/modules/query_enhancer.ts b/src/services/llm/context/modules/query_enhancer.ts
index 6eaef3b32..6c63ff660 100644
--- a/src/services/llm/context/modules/query_enhancer.ts
+++ b/src/services/llm/context/modules/query_enhancer.ts
@@ -1,7 +1,7 @@
 import log from '../../../log.js';
 import cacheManager from './cache_manager.js';
 import type { Message } from '../../ai_interface.js';
-import { CONTEXT_PROMPTS } from '../../llm_prompt_constants.js';
+import { CONTEXT_PROMPTS } from '../../prompts/llm_prompt_constants.js';
 
 /**
  * Provides utilities for enhancing queries and generating search queries
diff --git a/src/services/llm/index_service.ts b/src/services/llm/index_service.ts
index 434fc5e07..c67f6e5b8 100644
--- a/src/services/llm/index_service.ts
+++ b/src/services/llm/index_service.ts
@@ -20,7 +20,7 @@ import type { NoteEmbeddingContext } from "./embeddings/embeddings_interface.js"
 import type { OptionDefinitions } from "../options_interface.js";
 import sql from "../sql.js";
 import sqlInit from "../sql_init.js";
-import { CONTEXT_PROMPTS } from './llm_prompt_constants.js';
+import { CONTEXT_PROMPTS } from './prompts/llm_prompt_constants.js';
 
 class IndexService {
     private initialized = false;
diff --git a/src/services/llm/llm_prompt_constants.ts b/src/services/llm/prompts/llm_prompt_constants.ts
similarity index 100%
rename from src/services/llm/llm_prompt_constants.ts
rename to src/services/llm/prompts/llm_prompt_constants.ts