diff --git a/lang_agent/client_tool_manager.py b/lang_agent/components/client_tool_manager.py
similarity index 100%
rename from lang_agent/client_tool_manager.py
rename to lang_agent/components/client_tool_manager.py
diff --git a/lang_agent/tool_manager.py b/lang_agent/components/tool_manager.py
similarity index 97%
rename from lang_agent/tool_manager.py
rename to lang_agent/components/tool_manager.py
index c3dcf7b..5a32d0b 100644
--- a/lang_agent/tool_manager.py
+++ b/lang_agent/components/tool_manager.py
@@ -24,11 +24,11 @@ class ToolManagerConfig(InstantiateConfig):
     client_tool_manager: ClientToolManagerConfig = field(default_factory=ClientToolManagerConfig)
 
     # tool configs here; MUST HAVE 'config' in name and must be dataclass
-    rag_config: SimpleRagConfig = field(default_factory=SimpleRagConfig)
+    # rag_config: SimpleRagConfig = field(default_factory=SimpleRagConfig)
 
     # cart_config: CartToolConfig = field(default_factory=CartToolConfig)
 
-    # calc_config: CalculatorConfig = field(default_factory=CalculatorConfig)
+    calc_config: CalculatorConfig = field(default_factory=CalculatorConfig)
 
 
 def async_to_sync(async_func: Callable) -> Callable: