diff --git a/backend/core/prompts/prompt_system/__init__.py b/backend/core/prompts/__init__.py
similarity index 100%
rename from backend/core/prompts/prompt_system/__init__.py
rename to backend/core/prompts/__init__.py
diff --git a/backend/core/prompts/prompt_system/assembler.py b/backend/core/prompts/assembler.py
similarity index 100%
rename from backend/core/prompts/prompt_system/assembler.py
rename to backend/core/prompts/assembler.py
diff --git a/backend/core/prompts/prompt_system/config/__init__.py b/backend/core/prompts/config/__init__.py
similarity index 100%
rename from backend/core/prompts/prompt_system/config/__init__.py
rename to backend/core/prompts/config/__init__.py
diff --git a/backend/core/prompts/prompt_system/config/agent.yaml b/backend/core/prompts/config/agent.yaml
similarity index 100%
rename from backend/core/prompts/prompt_system/config/agent.yaml
rename to backend/core/prompts/config/agent.yaml
diff --git a/backend/core/prompts/prompt_system/config/environment.yaml b/backend/core/prompts/config/environment.yaml
similarity index 100%
rename from backend/core/prompts/prompt_system/config/environment.yaml
rename to backend/core/prompts/config/environment.yaml
diff --git a/backend/core/prompts/prompt_system/config/system.yaml b/backend/core/prompts/config/system.yaml
similarity index 100%
rename from backend/core/prompts/prompt_system/config/system.yaml
rename to backend/core/prompts/config/system.yaml
diff --git a/backend/core/prompts/prompt.py b/backend/core/prompts/prompt.py
index fc619909..5c652c74 100644
--- a/backend/core/prompts/prompt.py
+++ b/backend/core/prompts/prompt.py
@@ -28,7 +28,7 @@ from pathlib import Path
 
 # Import the modular prompt assembler
 try:
-    from .prompt_system.assembler import (
+    from .assembler import (
         PromptAssembler,
         get_assembler,
         get_system_prompt as _get_system_prompt
@@ -38,7 +38,7 @@ except ImportError as e:
     MODULAR_SYSTEM_AVAILABLE = False
     raise ImportError(
         f"Failed to import modular prompt system: {e}. "
-        "Ensure prompt_system module is properly installed."
+        "Ensure assembler module is properly installed."
     )
 
 
diff --git a/backend/core/prompts/prompt_system/schemas/__init__.py b/backend/core/prompts/schemas/__init__.py
similarity index 100%
rename from backend/core/prompts/prompt_system/schemas/__init__.py
rename to backend/core/prompts/schemas/__init__.py
diff --git a/backend/core/prompts/prompt_system/schemas/agents.json b/backend/core/prompts/schemas/agents.json
similarity index 100%
rename from backend/core/prompts/prompt_system/schemas/agents.json
rename to backend/core/prompts/schemas/agents.json
diff --git a/backend/core/prompts/prompt_system/schemas/design.json b/backend/core/prompts/schemas/design.json
similarity index 100%
rename from backend/core/prompts/prompt_system/schemas/design.json
rename to backend/core/prompts/schemas/design.json
diff --git a/backend/core/prompts/prompt_system/schemas/files.json b/backend/core/prompts/schemas/files.json
similarity index 100%
rename from backend/core/prompts/prompt_system/schemas/files.json
rename to backend/core/prompts/schemas/files.json
diff --git a/backend/core/prompts/prompt_system/schemas/knowledge_base.json b/backend/core/prompts/schemas/knowledge_base.json
similarity index 100%
rename from backend/core/prompts/prompt_system/schemas/knowledge_base.json
rename to backend/core/prompts/schemas/knowledge_base.json
diff --git a/backend/core/prompts/prompt_system/schemas/web.json b/backend/core/prompts/schemas/web.json
similarity index 100%
rename from backend/core/prompts/prompt_system/schemas/web.json
rename to backend/core/prompts/schemas/web.json
diff --git a/backend/core/prompts/prompt_system/templates/__init__.py b/backend/core/prompts/templates/__init__.py
similarity index 100%
rename from backend/core/prompts/prompt_system/templates/__init__.py
rename to backend/core/prompts/templates/__init__.py
diff --git a/backend/core/prompts/prompt_system/templates/agents.yaml b/backend/core/prompts/templates/agents.yaml
similarity index 100%
rename from backend/core/prompts/prompt_system/templates/agents.yaml
rename to backend/core/prompts/templates/agents.yaml
diff --git a/backend/core/prompts/prompt_system/templates/base.yaml b/backend/core/prompts/templates/base.yaml
similarity index 100%
rename from backend/core/prompts/prompt_system/templates/base.yaml
rename to backend/core/prompts/templates/base.yaml
diff --git a/backend/core/prompts/prompt_system/templates/browser.yaml b/backend/core/prompts/templates/browser.yaml
similarity index 100%
rename from backend/core/prompts/prompt_system/templates/browser.yaml
rename to backend/core/prompts/templates/browser.yaml
diff --git a/backend/core/prompts/prompt_system/templates/design.yaml b/backend/core/prompts/templates/design.yaml
similarity index 100%
rename from backend/core/prompts/prompt_system/templates/design.yaml
rename to backend/core/prompts/templates/design.yaml
diff --git a/backend/core/prompts/prompt_system/templates/files.yaml b/backend/core/prompts/templates/files.yaml
similarity index 100%
rename from backend/core/prompts/prompt_system/templates/files.yaml
rename to backend/core/prompts/templates/files.yaml
diff --git a/backend/core/prompts/prompt_system/templates/web.yaml b/backend/core/prompts/templates/web.yaml
similarity index 100%
rename from backend/core/prompts/prompt_system/templates/web.yaml
rename to backend/core/prompts/templates/web.yaml