diff --git a/src/control_backend/agents/bel_agents/__init__.py b/src/control_backend/agents/bel_agents/__init__.py
new file mode 100644
index 0000000..5f2ce21
--- /dev/null
+++ b/src/control_backend/agents/bel_agents/__init__.py
@@ -0,0 +1,4 @@
+from .bel_collector_agent.bel_collector_agent import BelCollectorAgent as BelCollectorAgent
+from .bel_text_extract_agent.bel_text_extract_agent import (
+    BelTextExtractAgent as BelTextExtractAgent,
+)
diff --git a/src/control_backend/agents/bel_agents/bel_collector_agent/__init__.py b/src/control_backend/agents/bel_agents/bel_collector_agent/__init__.py
deleted file mode 100644
index 3b5a313..0000000
--- a/src/control_backend/agents/bel_agents/bel_collector_agent/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from .bel_collector_agent import BelCollectorAgent as BelCollectorAgent
diff --git a/src/control_backend/core/config.py b/src/control_backend/core/config.py
index 55fd583..955ce16 100644
--- a/src/control_backend/core/config.py
+++ b/src/control_backend/core/config.py
@@ -11,7 +11,7 @@ class AgentSettings(BaseModel):
     host: str = "localhost"
     bdi_core_agent_agent_name: str = "bdi_core_agent"
     bel_collector_agent_name: str = "bel_collector_agent"
-    texbel_text_extractor_agent_name: str = "text_belief_extractor"
+    bel_text_extractor_agent_name: str = "bel_text_extractor_agent"
     per_vad_agent_name: str = "per_vad_agent"
     llm_agent_name: str = "llm_agent"
     test_agent_name: str = "test_agent"
diff --git a/src/control_backend/main.py b/src/control_backend/main.py
index 25e2a7c..be0827e 100644
--- a/src/control_backend/main.py
+++ b/src/control_backend/main.py
@@ -7,13 +7,24 @@ from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 from zmq.asyncio import Context
 
-from control_backend.agents import (
-    BelCollectorAgent,
-    ComRIAgent,
-    LLMAgent,
-    PerVADAgent,
-)
-from control_backend.agents.bdi_agents import BDICoreAgent, BelTextExtractAgent
+# Act agents
+# BDI agents
+from control_backend.agents.bdi_agents import BDICoreAgent
+
+# Believe Agents
+from control_backend.agents.bel_agents import BelCollectorAgent, BelTextExtractAgent
+
+# Communication agents
+from control_backend.agents.com_agents import ComRIAgent
+
+# Emotional Agents
+# LLM Agents
+from control_backend.agents.llm_agents import LLMAgent
+
+# Perceive agents
+from control_backend.agents.per_agents import PerVADAgent
+
+# Other backend imports
 from control_backend.api.v1.router import api_router
 from control_backend.core.config import settings
 from control_backend.logging import setup_logging
@@ -105,10 +116,10 @@ async def lifespan(app: FastAPI):
         "TBeliefExtractor": (
             BelTextExtractAgent,
             {
-                "name": settings.agent_settings.texbel_text_extractor_agent_name,
-                "jid": f"{settings.agent_settings.texbel_text_extractor_agent_name}@"
+                "name": settings.agent_settings.bel_text_extractor_agent_name,
+                "jid": f"{settings.agent_settings.bel_text_extractor_agent_name}@"
                 f"{settings.agent_settings.host}",
-                "password": settings.agent_settings.texbel_text_extractor_agent_name,
+                "password": settings.agent_settings.bel_text_extractor_agent_name,
             },
         ),
         "PerVADAgent": (