diff --git a/MEMORY.md b/MEMORY.md
new file mode 100644
index 0000000..51c3e64
--- /dev/null
+++ b/MEMORY.md
@@ -0,0 +1,54 @@
+# Timmy Hot Memory
+
+> Working RAM — always loaded, ~300 lines max, pruned monthly
+> Last updated: 2026-02-26
+
+---
+
+## Current Status
+
+**Agent State:** Operational  
+**Mode:** Development  
+**Active Tasks:** 0  
+**Pending Decisions:** None
+
+---
+
+## Standing Rules
+
+1. **Sovereignty First** — No cloud dependencies
+2. **Local-Only Inference** — Ollama on localhost
+3. **Privacy by Design** — Telemetry disabled
+4. **Tool Minimalism** — Use tools only when necessary
+5. **Memory Discipline** — Write handoffs at session end
+
+---
+
+## Agent Roster
+
+| Agent | Role | Status |
+|-------|------|--------|
+| Timmy | Core | Active |
+
+---
+
+## User Profile
+
+**Name:** (not set)  
+**Interests:** (to be learned)
+
+---
+
+## Key Decisions
+
+(none yet)
+
+---
+
+## Pending Actions
+
+- [ ] Learn user's name
+
+---
+
+*Prune date: 2026-02-25*
diff --git a/tests/creative/__init__.py b/tests/creative/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_assembler.py b/tests/creative/test_assembler.py
similarity index 100%
rename from tests/test_assembler.py
rename to tests/creative/test_assembler.py
diff --git a/tests/test_assembler_integration.py b/tests/creative/test_assembler_integration.py
similarity index 100%
rename from tests/test_assembler_integration.py
rename to tests/creative/test_assembler_integration.py
diff --git a/tests/test_creative_director.py b/tests/creative/test_creative_director.py
similarity index 100%
rename from tests/test_creative_director.py
rename to tests/creative/test_creative_director.py
diff --git a/tests/test_creative_route.py b/tests/creative/test_creative_route.py
similarity index 100%
rename from tests/test_creative_route.py
rename to tests/creative/test_creative_route.py
diff --git a/tests/test_image_tools.py b/tests/creative/test_image_tools.py
similarity index 100%
rename from tests/test_image_tools.py
rename to tests/creative/test_image_tools.py
diff --git a/tests/test_music_tools.py b/tests/creative/test_music_tools.py
similarity index 100%
rename from tests/test_music_tools.py
rename to tests/creative/test_music_tools.py
diff --git a/tests/test_music_video_integration.py b/tests/creative/test_music_video_integration.py
similarity index 100%
rename from tests/test_music_video_integration.py
rename to tests/creative/test_music_video_integration.py
diff --git a/tests/test_video_tools.py b/tests/creative/test_video_tools.py
similarity index 100%
rename from tests/test_video_tools.py
rename to tests/creative/test_video_tools.py
diff --git a/tests/dashboard/__init__.py b/tests/dashboard/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_briefing.py b/tests/dashboard/test_briefing.py
similarity index 100%
rename from tests/test_briefing.py
rename to tests/dashboard/test_briefing.py
diff --git a/tests/test_dashboard.py b/tests/dashboard/test_dashboard.py
similarity index 100%
rename from tests/test_dashboard.py
rename to tests/dashboard/test_dashboard.py
diff --git a/tests/test_dashboard_routes.py b/tests/dashboard/test_dashboard_routes.py
similarity index 100%
rename from tests/test_dashboard_routes.py
rename to tests/dashboard/test_dashboard_routes.py
diff --git a/tests/test_integration_full.py b/tests/dashboard/test_integration_full.py
similarity index 100%
rename from tests/test_integration_full.py
rename to tests/dashboard/test_integration_full.py
diff --git a/tests/test_ledger.py b/tests/dashboard/test_ledger.py
similarity index 100%
rename from tests/test_ledger.py
rename to tests/dashboard/test_ledger.py
diff --git a/tests/test_mission_control.py b/tests/dashboard/test_mission_control.py
similarity index 100%
rename from tests/test_mission_control.py
rename to tests/dashboard/test_mission_control.py
diff --git a/tests/test_mobile_scenarios.py b/tests/dashboard/test_mobile_scenarios.py
similarity index 97%
rename from tests/test_mobile_scenarios.py
rename to tests/dashboard/test_mobile_scenarios.py
index 050a1b4..b3ea34a 100644
--- a/tests/test_mobile_scenarios.py
+++ b/tests/dashboard/test_mobile_scenarios.py
@@ -22,7 +22,7 @@ from unittest.mock import AsyncMock, MagicMock, patch
 
 def _css() -> str:
     """Read the main stylesheet."""
-    css_path = Path(__file__).parent.parent / "static" / "style.css"
+    css_path = Path(__file__).parent.parent.parent / "static" / "style.css"
     return css_path.read_text()
 
 
@@ -290,13 +290,13 @@ def test_M605_health_status_passes_model_to_template(client):
 
 def _mobile_html() -> str:
     """Read the mobile template source."""
-    path = Path(__file__).parent.parent / "src" / "dashboard" / "templates" / "mobile.html"
+    path = Path(__file__).parent.parent.parent / "src" / "dashboard" / "templates" / "mobile.html"
     return path.read_text()
 
 
 def _swarm_live_html() -> str:
     """Read the swarm live template source."""
-    path = Path(__file__).parent.parent / "src" / "dashboard" / "templates" / "swarm_live.html"
+    path = Path(__file__).parent.parent.parent / "src" / "dashboard" / "templates" / "swarm_live.html"
     return path.read_text()
 
 
diff --git a/tests/test_routes_tools.py b/tests/dashboard/test_routes_tools.py
similarity index 100%
rename from tests/test_routes_tools.py
rename to tests/dashboard/test_routes_tools.py
diff --git a/tests/hands/__init__.py b/tests/hands/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_hands.py b/tests/hands/test_hands.py
similarity index 100%
rename from tests/test_hands.py
rename to tests/hands/test_hands.py
diff --git a/tests/test_hands_oracle_sentinel.py b/tests/hands/test_hands_oracle_sentinel.py
similarity index 100%
rename from tests/test_hands_oracle_sentinel.py
rename to tests/hands/test_hands_oracle_sentinel.py
diff --git a/tests/test_hands_phase5.py b/tests/hands/test_hands_phase5.py
similarity index 100%
rename from tests/test_hands_phase5.py
rename to tests/hands/test_hands_phase5.py
diff --git a/tests/infrastructure/__init__.py b/tests/infrastructure/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_functional_router.py b/tests/infrastructure/test_functional_router.py
similarity index 100%
rename from tests/test_functional_router.py
rename to tests/infrastructure/test_functional_router.py
diff --git a/tests/test_router_api.py b/tests/infrastructure/test_router_api.py
similarity index 100%
rename from tests/test_router_api.py
rename to tests/infrastructure/test_router_api.py
diff --git a/tests/test_router_cascade.py b/tests/infrastructure/test_router_cascade.py
similarity index 100%
rename from tests/test_router_cascade.py
rename to tests/infrastructure/test_router_cascade.py
diff --git a/tests/integrations/__init__.py b/tests/integrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_chat_bridge.py b/tests/integrations/test_chat_bridge.py
similarity index 100%
rename from tests/test_chat_bridge.py
rename to tests/integrations/test_chat_bridge.py
diff --git a/tests/test_discord_vendor.py b/tests/integrations/test_discord_vendor.py
similarity index 100%
rename from tests/test_discord_vendor.py
rename to tests/integrations/test_discord_vendor.py
diff --git a/tests/test_notifications.py b/tests/integrations/test_notifications.py
similarity index 100%
rename from tests/test_notifications.py
rename to tests/integrations/test_notifications.py
diff --git a/tests/test_shortcuts.py b/tests/integrations/test_shortcuts.py
similarity index 100%
rename from tests/test_shortcuts.py
rename to tests/integrations/test_shortcuts.py
diff --git a/tests/test_telegram_bot.py b/tests/integrations/test_telegram_bot.py
similarity index 100%
rename from tests/test_telegram_bot.py
rename to tests/integrations/test_telegram_bot.py
diff --git a/tests/test_voice_enhanced.py b/tests/integrations/test_voice_enhanced.py
similarity index 100%
rename from tests/test_voice_enhanced.py
rename to tests/integrations/test_voice_enhanced.py
diff --git a/tests/test_voice_nlu.py b/tests/integrations/test_voice_nlu.py
similarity index 100%
rename from tests/test_voice_nlu.py
rename to tests/integrations/test_voice_nlu.py
diff --git a/tests/test_voice_tts_functional.py b/tests/integrations/test_voice_tts_functional.py
similarity index 100%
rename from tests/test_voice_tts_functional.py
rename to tests/integrations/test_voice_tts_functional.py
diff --git a/tests/test_websocket.py b/tests/integrations/test_websocket.py
similarity index 100%
rename from tests/test_websocket.py
rename to tests/integrations/test_websocket.py
diff --git a/tests/test_websocket_extended.py b/tests/integrations/test_websocket_extended.py
similarity index 100%
rename from tests/test_websocket_extended.py
rename to tests/integrations/test_websocket_extended.py
diff --git a/tests/lightning/__init__.py b/tests/lightning/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_l402_proxy.py b/tests/lightning/test_l402_proxy.py
similarity index 100%
rename from tests/test_l402_proxy.py
rename to tests/lightning/test_l402_proxy.py
diff --git a/tests/test_lightning_interface.py b/tests/lightning/test_lightning_interface.py
similarity index 100%
rename from tests/test_lightning_interface.py
rename to tests/lightning/test_lightning_interface.py
diff --git a/tests/test_lnd_backend.py b/tests/lightning/test_lnd_backend.py
similarity index 100%
rename from tests/test_lnd_backend.py
rename to tests/lightning/test_lnd_backend.py
diff --git a/tests/mcp/__init__.py b/tests/mcp/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_functional_mcp.py b/tests/mcp/test_functional_mcp.py
similarity index 100%
rename from tests/test_functional_mcp.py
rename to tests/mcp/test_functional_mcp.py
diff --git a/tests/test_mcp_bootstrap.py b/tests/mcp/test_mcp_bootstrap.py
similarity index 100%
rename from tests/test_mcp_bootstrap.py
rename to tests/mcp/test_mcp_bootstrap.py
diff --git a/tests/test_mcp_discovery.py b/tests/mcp/test_mcp_discovery.py
similarity index 100%
rename from tests/test_mcp_discovery.py
rename to tests/mcp/test_mcp_discovery.py
diff --git a/tests/test_tool_executor.py b/tests/mcp/test_tool_executor.py
similarity index 100%
rename from tests/test_tool_executor.py
rename to tests/mcp/test_tool_executor.py
diff --git a/tests/scripture/__init__.py b/tests/scripture/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_scripture.py b/tests/scripture/test_scripture.py
similarity index 100%
rename from tests/test_scripture.py
rename to tests/scripture/test_scripture.py
diff --git a/tests/security/__init__.py b/tests/security/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_security_fixes_xss.py b/tests/security/test_security_fixes_xss.py
similarity index 100%
rename from tests/test_security_fixes_xss.py
rename to tests/security/test_security_fixes_xss.py
diff --git a/tests/test_security_regression.py b/tests/security/test_security_regression.py
similarity index 100%
rename from tests/test_security_regression.py
rename to tests/security/test_security_regression.py
diff --git a/tests/test_xss_prevention.py b/tests/security/test_xss_prevention.py
similarity index 100%
rename from tests/test_xss_prevention.py
rename to tests/security/test_xss_prevention.py
diff --git a/tests/self_coding/__init__.py b/tests/self_coding/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_codebase_indexer.py b/tests/self_coding/test_codebase_indexer.py
similarity index 100%
rename from tests/test_codebase_indexer.py
rename to tests/self_coding/test_codebase_indexer.py
diff --git a/tests/test_codebase_indexer_errors.py b/tests/self_coding/test_codebase_indexer_errors.py
similarity index 100%
rename from tests/test_codebase_indexer_errors.py
rename to tests/self_coding/test_codebase_indexer_errors.py
diff --git a/tests/test_git_safety.py b/tests/self_coding/test_git_safety.py
similarity index 100%
rename from tests/test_git_safety.py
rename to tests/self_coding/test_git_safety.py
diff --git a/tests/test_git_safety_errors.py b/tests/self_coding/test_git_safety_errors.py
similarity index 100%
rename from tests/test_git_safety_errors.py
rename to tests/self_coding/test_git_safety_errors.py
diff --git a/tests/test_git_tools.py b/tests/self_coding/test_git_tools.py
similarity index 100%
rename from tests/test_git_tools.py
rename to tests/self_coding/test_git_tools.py
diff --git a/tests/test_learner.py b/tests/self_coding/test_learner.py
similarity index 100%
rename from tests/test_learner.py
rename to tests/self_coding/test_learner.py
diff --git a/tests/test_modification_journal.py b/tests/self_coding/test_modification_journal.py
similarity index 100%
rename from tests/test_modification_journal.py
rename to tests/self_coding/test_modification_journal.py
diff --git a/tests/test_scary_paths.py b/tests/self_coding/test_scary_paths.py
similarity index 100%
rename from tests/test_scary_paths.py
rename to tests/self_coding/test_scary_paths.py
diff --git a/tests/test_self_coding_dashboard.py b/tests/self_coding/test_self_coding_dashboard.py
similarity index 100%
rename from tests/test_self_coding_dashboard.py
rename to tests/self_coding/test_self_coding_dashboard.py
diff --git a/tests/test_self_coding_integration.py b/tests/self_coding/test_self_coding_integration.py
similarity index 100%
rename from tests/test_self_coding_integration.py
rename to tests/self_coding/test_self_coding_integration.py
diff --git a/tests/test_self_edit_tool.py b/tests/self_coding/test_self_edit_tool.py
similarity index 100%
rename from tests/test_self_edit_tool.py
rename to tests/self_coding/test_self_edit_tool.py
diff --git a/tests/test_self_modify.py b/tests/self_coding/test_self_modify.py
similarity index 100%
rename from tests/test_self_modify.py
rename to tests/self_coding/test_self_modify.py
diff --git a/tests/test_watchdog.py b/tests/self_coding/test_watchdog.py
similarity index 100%
rename from tests/test_watchdog.py
rename to tests/self_coding/test_watchdog.py
diff --git a/tests/test_watchdog_functional.py b/tests/self_coding/test_watchdog_functional.py
similarity index 100%
rename from tests/test_watchdog_functional.py
rename to tests/self_coding/test_watchdog_functional.py
diff --git a/tests/spark/__init__.py b/tests/spark/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_event_log.py b/tests/spark/test_event_log.py
similarity index 100%
rename from tests/test_event_log.py
rename to tests/spark/test_event_log.py
diff --git a/tests/test_spark.py b/tests/spark/test_spark.py
similarity index 100%
rename from tests/test_spark.py
rename to tests/spark/test_spark.py
diff --git a/tests/test_spark_tools_creative.py b/tests/spark/test_spark_tools_creative.py
similarity index 100%
rename from tests/test_spark_tools_creative.py
rename to tests/spark/test_spark_tools_creative.py
diff --git a/tests/swarm/__init__.py b/tests/swarm/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_approvals.py b/tests/swarm/test_approvals.py
similarity index 100%
rename from tests/test_approvals.py
rename to tests/swarm/test_approvals.py
diff --git a/tests/test_coordinator.py b/tests/swarm/test_coordinator.py
similarity index 100%
rename from tests/test_coordinator.py
rename to tests/swarm/test_coordinator.py
diff --git a/tests/test_docker_agent.py b/tests/swarm/test_docker_agent.py
similarity index 100%
rename from tests/test_docker_agent.py
rename to tests/swarm/test_docker_agent.py
diff --git a/tests/test_docker_runner.py b/tests/swarm/test_docker_runner.py
similarity index 100%
rename from tests/test_docker_runner.py
rename to tests/swarm/test_docker_runner.py
diff --git a/tests/test_inter_agent.py b/tests/swarm/test_inter_agent.py
similarity index 100%
rename from tests/test_inter_agent.py
rename to tests/swarm/test_inter_agent.py
diff --git a/tests/test_swarm.py b/tests/swarm/test_swarm.py
similarity index 100%
rename from tests/test_swarm.py
rename to tests/swarm/test_swarm.py
diff --git a/tests/test_swarm_integration.py b/tests/swarm/test_swarm_integration.py
similarity index 100%
rename from tests/test_swarm_integration.py
rename to tests/swarm/test_swarm_integration.py
diff --git a/tests/test_swarm_integration_full.py b/tests/swarm/test_swarm_integration_full.py
similarity index 100%
rename from tests/test_swarm_integration_full.py
rename to tests/swarm/test_swarm_integration_full.py
diff --git a/tests/test_swarm_live_page.py b/tests/swarm/test_swarm_live_page.py
similarity index 100%
rename from tests/test_swarm_live_page.py
rename to tests/swarm/test_swarm_live_page.py
diff --git a/tests/test_swarm_node.py b/tests/swarm/test_swarm_node.py
similarity index 100%
rename from tests/test_swarm_node.py
rename to tests/swarm/test_swarm_node.py
diff --git a/tests/test_swarm_personas.py b/tests/swarm/test_swarm_personas.py
similarity index 100%
rename from tests/test_swarm_personas.py
rename to tests/swarm/test_swarm_personas.py
diff --git a/tests/test_swarm_recovery.py b/tests/swarm/test_swarm_recovery.py
similarity index 100%
rename from tests/test_swarm_recovery.py
rename to tests/swarm/test_swarm_recovery.py
diff --git a/tests/test_swarm_routes_functional.py b/tests/swarm/test_swarm_routes_functional.py
similarity index 100%
rename from tests/test_swarm_routes_functional.py
rename to tests/swarm/test_swarm_routes_functional.py
diff --git a/tests/test_swarm_routing.py b/tests/swarm/test_swarm_routing.py
similarity index 100%
rename from tests/test_swarm_routing.py
rename to tests/swarm/test_swarm_routing.py
diff --git a/tests/test_swarm_stats.py b/tests/swarm/test_swarm_stats.py
similarity index 100%
rename from tests/test_swarm_stats.py
rename to tests/swarm/test_swarm_stats.py
diff --git a/tests/test_task_queue.py b/tests/swarm/test_task_queue.py
similarity index 100%
rename from tests/test_task_queue.py
rename to tests/swarm/test_task_queue.py
diff --git a/tests/test_work_orders.py b/tests/swarm/test_work_orders.py
similarity index 100%
rename from tests/test_work_orders.py
rename to tests/swarm/test_work_orders.py
diff --git a/tests/timmy/__init__.py b/tests/timmy/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_agent.py b/tests/timmy/test_agent.py
similarity index 100%
rename from tests/test_agent.py
rename to tests/timmy/test_agent.py
diff --git a/tests/test_agent_core.py b/tests/timmy/test_agent_core.py
similarity index 100%
rename from tests/test_agent_core.py
rename to tests/timmy/test_agent_core.py
diff --git a/tests/test_agent_runner.py b/tests/timmy/test_agent_runner.py
similarity index 100%
rename from tests/test_agent_runner.py
rename to tests/timmy/test_agent_runner.py
diff --git a/tests/test_backends.py b/tests/timmy/test_backends.py
similarity index 100%
rename from tests/test_backends.py
rename to tests/timmy/test_backends.py
diff --git a/tests/test_calculator.py b/tests/timmy/test_calculator.py
similarity index 100%
rename from tests/test_calculator.py
rename to tests/timmy/test_calculator.py
diff --git a/tests/test_cli.py b/tests/timmy/test_cli.py
similarity index 100%
rename from tests/test_cli.py
rename to tests/timmy/test_cli.py
diff --git a/tests/test_prompts.py b/tests/timmy/test_prompts.py
similarity index 100%
rename from tests/test_prompts.py
rename to tests/timmy/test_prompts.py
diff --git a/tests/test_reflection.py b/tests/timmy/test_reflection.py
similarity index 100%
rename from tests/test_reflection.py
rename to tests/timmy/test_reflection.py
diff --git a/tests/test_session.py b/tests/timmy/test_session.py
similarity index 100%
rename from tests/test_session.py
rename to tests/timmy/test_session.py
diff --git a/tests/test_timmy_serve_app.py b/tests/timmy/test_timmy_serve_app.py
similarity index 100%
rename from tests/test_timmy_serve_app.py
rename to tests/timmy/test_timmy_serve_app.py
diff --git a/tests/test_timmy_serve_cli.py b/tests/timmy/test_timmy_serve_cli.py
similarity index 100%
rename from tests/test_timmy_serve_cli.py
rename to tests/timmy/test_timmy_serve_cli.py
diff --git a/tests/test_timmy_tools.py b/tests/timmy/test_timmy_tools.py
similarity index 100%
rename from tests/test_timmy_tools.py
rename to tests/timmy/test_timmy_tools.py
diff --git a/tests/test_vector_store.py b/tests/timmy/test_vector_store.py
similarity index 100%
rename from tests/test_vector_store.py
rename to tests/timmy/test_vector_store.py