diff --git a/backend/apps/HaikFix/Agent/Agent.py b/backend/apps/HaikFix/Agent/Agent.py
index 2c1cdb92..69b88042 100644
--- a/backend/apps/HaikFix/Agent/Agent.py
+++ b/backend/apps/HaikFix/Agent/Agent.py
@@ -56,7 +56,6 @@ class Agent(BaseModel):
                 msg=msg,
                 options=self.config,
                 branch_id=self.branch_id,
-                parent_id=self.parent_id,
             ))
 
     @typechecked
diff --git a/backend/apps/HaikFix/Agent/__init__.py b/backend/apps/HaikFix/Agent/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/apps/HaikFix/Agent/run_agent_loop/__init__.py b/backend/apps/HaikFix/Agent/run_agent_loop/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/apps/HaikFix/Agent/run_agent_loop/helpers/__init__.py b/backend/apps/HaikFix/Agent/run_agent_loop/helpers/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/apps/HaikFix/Agent/run_agent_loop/run_agent_loop.py b/backend/apps/HaikFix/Agent/run_agent_loop/run_agent_loop.py
index d579a7ff..61a4be23 100644
--- a/backend/apps/HaikFix/Agent/run_agent_loop/run_agent_loop.py
+++ b/backend/apps/HaikFix/Agent/run_agent_loop/run_agent_loop.py
@@ -5,11 +5,11 @@ from claude_agent_sdk import (
     query, ClaudeAgentOptions, AssistantMessage,
 )
 from claude_agent_sdk.types import StreamEvent
-from backend.apps.agents.manager.HaikFix.run_agent_loop.helpers.handle_stream_event import handle_stream_event
-from backend.apps.agents.manager.HaikFix.run_agent_loop.helpers.handle_assistant_message import handle_assistant_message
+from backend.apps.HaikFix.Agent.run_agent_loop.helpers.handle_stream_event import handle_stream_event
+from backend.apps.HaikFix.Agent.run_agent_loop.helpers.handle_assistant_message import handle_assistant_message
 
 # from backend.apps.agents.manager.HaikFix.shared_structs.Message.sub_types import ImageChunk, TextChunk
-from backend.apps.agents.manager.HaikFix.shared_structs.Message.Message import Message, PromptMsgDict
+from backend.apps.HaikFix.Agent.shared_structs.Message.Message import Message, PromptMsgDict
 from typing import List, Dict, Literal, Union, Optional
 
 @typechecked
diff --git a/backend/apps/HaikFix/Agent/shared_structs/Message/__init__.py b/backend/apps/HaikFix/Agent/shared_structs/Message/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/apps/HaikFix/Agent/shared_structs/MessageLog.py b/backend/apps/HaikFix/Agent/shared_structs/MessageLog.py
index d8902670..7e2d6d06 100644
--- a/backend/apps/HaikFix/Agent/shared_structs/MessageLog.py
+++ b/backend/apps/HaikFix/Agent/shared_structs/MessageLog.py
@@ -37,7 +37,7 @@ class MessageLog(BaseModel):
         """
         for i, m in enumerate[AnyMessage](self.messages):
             if m.id == message_id:
-                return self._messages[:i + 1]
+                return self.messages[:i + 1]
         raise ValueError(f"Message {message_id} not found")
 
     @typechecked
diff --git a/backend/apps/HaikFix/Agent/shared_structs/__init__.py b/backend/apps/HaikFix/Agent/shared_structs/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/apps/HaikFix/tools/__init__.py b/backend/apps/HaikFix/tools/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/apps/HaikFix/tools/make_builtin_toolkit/__init__.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/__init__.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/__init__.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/__init__.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/agents_toolkit/handlers/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/__init__.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/__init__.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/__init__.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_actions_toolkit/handlers/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/__init__.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/__init__.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/__init__.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/open_swarm_toolkits/browser_toolkit/make_browser_delegation_toolkit/handlers/utils/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/__init__.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/apps/HaikFix/tools/shared_structs/Toolkit.py b/backend/apps/HaikFix/tools/shared_structs/Toolkit.py
index 625fba82..cbb973f6 100644
--- a/backend/apps/HaikFix/tools/shared_structs/Toolkit.py
+++ b/backend/apps/HaikFix/tools/shared_structs/Toolkit.py
@@ -24,7 +24,7 @@ class Toolkit(BaseModel):
             tools=tools, 
             nested_toolkits=nested_toolkits
         )
-        self.validate_structure(tools, nested_toolkits)
+        self.validate_structure()
 
     @typechecked
     def validate_structure(self) -> None:
diff --git a/backend/apps/HaikFix/tools/shared_structs/__init__.py b/backend/apps/HaikFix/tools/shared_structs/__init__.py
new file mode 100644
index 00000000..e69de29b