diff --git a/backend/apps/agents/manager/HaikFix/Agent.py b/backend/apps/agents/HaikFix/Agent/Agent.py
similarity index 100%
rename from backend/apps/agents/manager/HaikFix/Agent.py
rename to backend/apps/agents/HaikFix/Agent/Agent.py
diff --git a/backend/apps/agents/manager/HaikFix/run_agent_loop/helpers/handle_assistant_message.py b/backend/apps/agents/HaikFix/Agent/run_agent_loop/helpers/handle_assistant_message.py
similarity index 100%
rename from backend/apps/agents/manager/HaikFix/run_agent_loop/helpers/handle_assistant_message.py
rename to backend/apps/agents/HaikFix/Agent/run_agent_loop/helpers/handle_assistant_message.py
diff --git a/backend/apps/agents/manager/HaikFix/run_agent_loop/helpers/handle_stream_event.py b/backend/apps/agents/HaikFix/Agent/run_agent_loop/helpers/handle_stream_event.py
similarity index 100%
rename from backend/apps/agents/manager/HaikFix/run_agent_loop/helpers/handle_stream_event.py
rename to backend/apps/agents/HaikFix/Agent/run_agent_loop/helpers/handle_stream_event.py
diff --git a/backend/apps/agents/manager/HaikFix/run_agent_loop/run_agent_loop.py b/backend/apps/agents/HaikFix/Agent/run_agent_loop/run_agent_loop.py
similarity index 100%
rename from backend/apps/agents/manager/HaikFix/run_agent_loop/run_agent_loop.py
rename to backend/apps/agents/HaikFix/Agent/run_agent_loop/run_agent_loop.py
diff --git a/backend/apps/agents/manager/HaikFix/shared_structs/ApprovalRequest.py b/backend/apps/agents/HaikFix/Agent/shared_structs/ApprovalRequest.py
similarity index 100%
rename from backend/apps/agents/manager/HaikFix/shared_structs/ApprovalRequest.py
rename to backend/apps/agents/HaikFix/Agent/shared_structs/ApprovalRequest.py
diff --git a/backend/apps/agents/manager/HaikFix/shared_structs/Message/Message.py b/backend/apps/agents/HaikFix/Agent/shared_structs/Message/Message.py
similarity index 100%
rename from backend/apps/agents/manager/HaikFix/shared_structs/Message/Message.py
rename to backend/apps/agents/HaikFix/Agent/shared_structs/Message/Message.py
diff --git a/backend/apps/agents/manager/HaikFix/shared_structs/Message/sub_types.py b/backend/apps/agents/HaikFix/Agent/shared_structs/Message/sub_types.py
similarity index 100%
rename from backend/apps/agents/manager/HaikFix/shared_structs/Message/sub_types.py
rename to backend/apps/agents/HaikFix/Agent/shared_structs/Message/sub_types.py
diff --git a/backend/apps/agents/manager/HaikFix/shared_structs/MessageLog.py b/backend/apps/agents/HaikFix/Agent/shared_structs/MessageLog.py
similarity index 100%
rename from backend/apps/agents/manager/HaikFix/shared_structs/MessageLog.py
rename to backend/apps/agents/HaikFix/Agent/shared_structs/MessageLog.py
diff --git a/backend/apps/agents/HaikFix/README.md b/backend/apps/agents/HaikFix/README.md
new file mode 100644
index 00000000..36659bef
--- /dev/null
+++ b/backend/apps/agents/HaikFix/README.md
@@ -0,0 +1,3 @@
+New refactored codebase, not integrated with old stuff yet.
+
+NOTE: no backwards compatibility is needed. This is a complete rewrite.
\ No newline at end of file