diff --git a/backend/apps/agents.py b/backend/apps/agents/agents.py
similarity index 100%
rename from backend/apps/agents.py
rename to backend/apps/agents/agents.py
diff --git a/backend/apps/session_store.py b/backend/apps/agents/session_store.py
similarity index 100%
rename from backend/apps/session_store.py
rename to backend/apps/agents/session_store.py
diff --git a/backend/apps/Agent/Agent.py b/backend/core/Agent/Agent.py
similarity index 100%
rename from backend/apps/Agent/Agent.py
rename to backend/core/Agent/Agent.py
diff --git a/backend/apps/Agent/__init__.py b/backend/core/Agent/__init__.py
similarity index 100%
rename from backend/apps/Agent/__init__.py
rename to backend/core/Agent/__init__.py
diff --git a/backend/apps/Agent/run_agent_loop/__init__.py b/backend/core/Agent/run_agent_loop/__init__.py
similarity index 100%
rename from backend/apps/Agent/run_agent_loop/__init__.py
rename to backend/core/Agent/run_agent_loop/__init__.py
diff --git a/backend/apps/Agent/run_agent_loop/helpers/__init__.py b/backend/core/Agent/run_agent_loop/helpers/__init__.py
similarity index 100%
rename from backend/apps/Agent/run_agent_loop/helpers/__init__.py
rename to backend/core/Agent/run_agent_loop/helpers/__init__.py
diff --git a/backend/apps/Agent/run_agent_loop/helpers/handle_assistant_message.py b/backend/core/Agent/run_agent_loop/helpers/handle_assistant_message.py
similarity index 100%
rename from backend/apps/Agent/run_agent_loop/helpers/handle_assistant_message.py
rename to backend/core/Agent/run_agent_loop/helpers/handle_assistant_message.py
diff --git a/backend/apps/Agent/run_agent_loop/helpers/handle_stream_event.py b/backend/core/Agent/run_agent_loop/helpers/handle_stream_event.py
similarity index 100%
rename from backend/apps/Agent/run_agent_loop/helpers/handle_stream_event.py
rename to backend/core/Agent/run_agent_loop/helpers/handle_stream_event.py
diff --git a/backend/apps/Agent/run_agent_loop/run_agent_loop.py b/backend/core/Agent/run_agent_loop/run_agent_loop.py
similarity index 100%
rename from backend/apps/Agent/run_agent_loop/run_agent_loop.py
rename to backend/core/Agent/run_agent_loop/run_agent_loop.py
diff --git a/backend/apps/Agent/shared_structs/ApprovalRequest.py b/backend/core/Agent/shared_structs/ApprovalRequest.py
similarity index 100%
rename from backend/apps/Agent/shared_structs/ApprovalRequest.py
rename to backend/core/Agent/shared_structs/ApprovalRequest.py
diff --git a/backend/apps/Agent/shared_structs/Message/Message.py b/backend/core/Agent/shared_structs/Message/Message.py
similarity index 100%
rename from backend/apps/Agent/shared_structs/Message/Message.py
rename to backend/core/Agent/shared_structs/Message/Message.py
diff --git a/backend/apps/Agent/shared_structs/Message/__init__.py b/backend/core/Agent/shared_structs/Message/__init__.py
similarity index 100%
rename from backend/apps/Agent/shared_structs/Message/__init__.py
rename to backend/core/Agent/shared_structs/Message/__init__.py
diff --git a/backend/apps/Agent/shared_structs/Message/agent_inputs.py b/backend/core/Agent/shared_structs/Message/agent_inputs.py
similarity index 100%
rename from backend/apps/Agent/shared_structs/Message/agent_inputs.py
rename to backend/core/Agent/shared_structs/Message/agent_inputs.py
diff --git a/backend/apps/Agent/shared_structs/Message/agent_outputs.py b/backend/core/Agent/shared_structs/Message/agent_outputs.py
similarity index 100%
rename from backend/apps/Agent/shared_structs/Message/agent_outputs.py
rename to backend/core/Agent/shared_structs/Message/agent_outputs.py
diff --git a/backend/apps/Agent/shared_structs/MessageLog.py b/backend/core/Agent/shared_structs/MessageLog.py
similarity index 100%
rename from backend/apps/Agent/shared_structs/MessageLog.py
rename to backend/core/Agent/shared_structs/MessageLog.py
diff --git a/backend/apps/Agent/shared_structs/__init__.py b/backend/core/Agent/shared_structs/__init__.py
similarity index 100%
rename from backend/apps/Agent/shared_structs/__init__.py
rename to backend/core/Agent/shared_structs/__init__.py
diff --git a/backend/apps/Agent/shared_structs/events.py b/backend/core/events/events.py
similarity index 100%
rename from backend/apps/Agent/shared_structs/events.py
rename to backend/core/events/events.py
diff --git a/backend/apps/tools/__init__.py b/backend/core/tools/__init__.py
similarity index 100%
rename from backend/apps/tools/__init__.py
rename to backend/core/tools/__init__.py
diff --git a/backend/apps/tools/make_builtin_toolkit/__init__.py b/backend/core/tools/make_builtin_toolkit/__init__.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/__init__.py
rename to backend/core/tools/make_builtin_toolkit/__init__.py
diff --git a/backend/apps/tools/make_builtin_toolkit/make_builtin_toolkit.py b/backend/core/tools/make_builtin_toolkit/make_builtin_toolkit.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/make_builtin_toolkit.py
rename to backend/core/tools/make_builtin_toolkit/make_builtin_toolkit.py
diff --git a/backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/__init__.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/__init__.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/__init__.py
rename to backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/__init__.py
diff --git a/backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/__init__.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/__init__.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/__init__.py
rename to backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/__init__.py
diff --git a/backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/__init__.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/__init__.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/__init__.py
rename to backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/__init__.py
diff --git a/backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_create_agent_handler.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_create_agent_handler.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_create_agent_handler.py
rename to backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_create_agent_handler.py
diff --git a/backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_invoke_agent_handler.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_invoke_agent_handler.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_invoke_agent_handler.py
rename to backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/make_invoke_agent_handler.py
diff --git a/backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/make_agents_toolkit.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/make_agents_toolkit.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/make_agents_toolkit.py
rename to backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/make_agents_toolkit.py
diff --git a/backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/__init__.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/__init__.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/__init__.py
rename to backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/__init__.py
diff --git a/backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/__init__.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/__init__.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/__init__.py
rename to backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/__init__.py
diff --git a/backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/__init__.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/__init__.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/__init__.py
rename to backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/__init__.py
diff --git a/backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/browser_action_input_schemas.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/browser_action_input_schemas.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/browser_action_input_schemas.py
rename to backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/browser_action_input_schemas.py
diff --git a/backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/make_browser_action_handler.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/make_browser_action_handler.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/make_browser_action_handler.py
rename to backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/make_browser_action_handler.py
diff --git a/backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/make_browser_actions_toolkit.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/make_browser_actions_toolkit.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/make_browser_actions_toolkit.py
rename to backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/make_browser_actions_toolkit.py
diff --git a/backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/__init__.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/__init__.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/__init__.py
rename to backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/__init__.py
diff --git a/backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/__init__.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/__init__.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/__init__.py
rename to backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/__init__.py
diff --git a/backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/make_create_browser_agent_handler.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/make_create_browser_agent_handler.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/make_create_browser_agent_handler.py
rename to backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/make_create_browser_agent_handler.py
diff --git a/backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/make_invoke_browser_agent_handler.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/make_invoke_browser_agent_handler.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/make_invoke_browser_agent_handler.py
rename to backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/make_invoke_browser_agent_handler.py
diff --git a/backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/__init__.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/__init__.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/__init__.py
rename to backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/__init__.py
diff --git a/backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/constants.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/constants.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/constants.py
rename to backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/constants.py
diff --git a/backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/create_browser_card.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/create_browser_card.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/create_browser_card.py
rename to backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/create_browser_card.py
diff --git a/backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/run_browser_agent.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/run_browser_agent.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/run_browser_agent.py
rename to backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/run_browser_agent.py
diff --git a/backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/make_browser_delegation_toolkit.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/make_browser_delegation_toolkit.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/make_browser_delegation_toolkit.py
rename to backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/make_browser_delegation_toolkit.py
diff --git a/backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_toolkit.py b/backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_toolkit.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_toolkit.py
rename to backend/core/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_toolkit.py
diff --git a/backend/apps/tools/make_builtin_toolkit/pre_existing_toolkits/__init__.py b/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/__init__.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/pre_existing_toolkits/__init__.py
rename to backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/__init__.py
diff --git a/backend/apps/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/FILESYSTEM_TOOLKIT.py b/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/FILESYSTEM_TOOLKIT.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/FILESYSTEM_TOOLKIT.py
rename to backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/FILESYSTEM_TOOLKIT.py
diff --git a/backend/apps/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/SEARCH_TOOLKIT.py b/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/SEARCH_TOOLKIT.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/SEARCH_TOOLKIT.py
rename to backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/SEARCH_TOOLKIT.py
diff --git a/backend/apps/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/SYSTEM_TOOLKIT.py b/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/SYSTEM_TOOLKIT.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/SYSTEM_TOOLKIT.py
rename to backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/SYSTEM_TOOLKIT.py
diff --git a/backend/apps/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/INTERACTION_TOOLKIT.py b/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/INTERACTION_TOOLKIT.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/INTERACTION_TOOLKIT.py
rename to backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/INTERACTION_TOOLKIT.py
diff --git a/backend/apps/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/PLANNING_TOOLKIT.py b/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/PLANNING_TOOLKIT.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/PLANNING_TOOLKIT.py
rename to backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/PLANNING_TOOLKIT.py
diff --git a/backend/apps/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/SCHEDULING_TOOLKIT.py b/backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/SCHEDULING_TOOLKIT.py
similarity index 100%
rename from backend/apps/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/SCHEDULING_TOOLKIT.py
rename to backend/core/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/SCHEDULING_TOOLKIT.py
diff --git a/backend/apps/tools/shared_structs/MCP_Tool.py b/backend/core/tools/shared_structs/MCP_Tool.py
similarity index 100%
rename from backend/apps/tools/shared_structs/MCP_Tool.py
rename to backend/core/tools/shared_structs/MCP_Tool.py
diff --git a/backend/apps/tools/shared_structs/TOOL_PERMISSIONS.py b/backend/core/tools/shared_structs/TOOL_PERMISSIONS.py
similarity index 100%
rename from backend/apps/tools/shared_structs/TOOL_PERMISSIONS.py
rename to backend/core/tools/shared_structs/TOOL_PERMISSIONS.py
diff --git a/backend/apps/tools/shared_structs/Tool.py b/backend/core/tools/shared_structs/Tool.py
similarity index 100%
rename from backend/apps/tools/shared_structs/Tool.py
rename to backend/core/tools/shared_structs/Tool.py
diff --git a/backend/apps/tools/shared_structs/Toolkit.py b/backend/core/tools/shared_structs/Toolkit.py
similarity index 100%
rename from backend/apps/tools/shared_structs/Toolkit.py
rename to backend/core/tools/shared_structs/Toolkit.py
diff --git a/backend/apps/tools/shared_structs/__init__.py b/backend/core/tools/shared_structs/__init__.py
similarity index 100%
rename from backend/apps/tools/shared_structs/__init__.py
rename to backend/core/tools/shared_structs/__init__.py