diff --git a/backend/apps/HaikFix/tools/make_builtin_toolkit/make_builtin_toolkit.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/make_builtin_toolkit.py
index 98b435e9..e83595ff 100644
--- a/backend/apps/HaikFix/tools/make_builtin_toolkit/make_builtin_toolkit.py
+++ b/backend/apps/HaikFix/tools/make_builtin_toolkit/make_builtin_toolkit.py
@@ -6,12 +6,12 @@ from backend.apps.HaikFix.tools.shared_structs.Toolkit import Toolkit
 from backend.apps.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.agents_toolkit.make_agents_toolkit import make_agents_toolkit
 from backend.apps.HaikFix.tools.make_builtin_toolkit.open_swarm_toolkits.browser_toolkit.make_browser_toolkit import make_browser_toolkit
 
-from backend.apps.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.FILESYSTEM_TOOLKIT import FILESYSTEM_TOOLKIT
-from backend.apps.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.INTERACTION_TOOLKIT import INTERACTION_TOOLKIT
-from backend.apps.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.PLANNING_TOOLKIT import PLANNING_TOOLKIT
-from backend.apps.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.SCHEDULING_TOOLKIT import SCHEDULING_TOOLKIT
-from backend.apps.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.SEARCH_TOOLKIT import SEARCH_TOOLKIT
-from backend.apps.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.SYSTEM_TOOLKIT import SYSTEM_TOOLKIT
+from backend.apps.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.basic_toolkits.FILESYSTEM_TOOLKIT import FILESYSTEM_TOOLKIT
+from backend.apps.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.meta_toolkits.INTERACTION_TOOLKIT import INTERACTION_TOOLKIT
+from backend.apps.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.meta_toolkits.PLANNING_TOOLKIT import PLANNING_TOOLKIT
+from backend.apps.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.meta_toolkits.SCHEDULING_TOOLKIT import SCHEDULING_TOOLKIT
+from backend.apps.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.basic_toolkits.SEARCH_TOOLKIT import SEARCH_TOOLKIT
+from backend.apps.HaikFix.tools.make_builtin_toolkit.pre_existing_toolkits.basic_toolkits.SYSTEM_TOOLKIT import SYSTEM_TOOLKIT
 from backend.apps.HaikFix.Agent.Agent import Agent
 
 @typechecked
diff --git a/backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/FILESYSTEM_TOOLKIT.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/FILESYSTEM_TOOLKIT.py
similarity index 100%
rename from backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/FILESYSTEM_TOOLKIT.py
rename to backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/FILESYSTEM_TOOLKIT.py
diff --git a/backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SEARCH_TOOLKIT.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/SEARCH_TOOLKIT.py
similarity index 100%
rename from backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SEARCH_TOOLKIT.py
rename to backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/SEARCH_TOOLKIT.py
diff --git a/backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SYSTEM_TOOLKIT.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/SYSTEM_TOOLKIT.py
similarity index 100%
rename from backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SYSTEM_TOOLKIT.py
rename to backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/basic_toolkits/SYSTEM_TOOLKIT.py
diff --git a/backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/INTERACTION_TOOLKIT.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/INTERACTION_TOOLKIT.py
similarity index 100%
rename from backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/INTERACTION_TOOLKIT.py
rename to backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/INTERACTION_TOOLKIT.py
diff --git a/backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/PLANNING_TOOLKIT.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/PLANNING_TOOLKIT.py
similarity index 100%
rename from backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/PLANNING_TOOLKIT.py
rename to backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/PLANNING_TOOLKIT.py
diff --git a/backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SCHEDULING_TOOLKIT.py b/backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/SCHEDULING_TOOLKIT.py
similarity index 100%
rename from backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/SCHEDULING_TOOLKIT.py
rename to backend/apps/HaikFix/tools/make_builtin_toolkit/pre_existing_toolkits/meta_toolkits/SCHEDULING_TOOLKIT.py