diff --git a/agentserver/listeners/examples/grok_personality.py b/agentserver/listeners/examples/grok_personality.py
index 00fe0b9..c883e7b 100644
--- a/agentserver/listeners/examples/grok_personality.py
+++ b/agentserver/listeners/examples/grok_personality.py
@@ -2,7 +2,7 @@
 First real intelligent listener — classic Grok voice.
 """
 
-from agentserver.listeners.base_llm import LLMPersonality
+from agentserver.listeners.llm_listener import LLMPersonality
 from agentserver.prompts.grok_classic import GROK_CLASSIC_MESSAGE
 
 class GrokPersonality(LLMPersonality):
diff --git a/agentserver/utils/llm_connection.py b/agentserver/listeners/llm_connection.py
similarity index 100%
rename from agentserver/utils/llm_connection.py
rename to agentserver/listeners/llm_connection.py
diff --git a/agentserver/listeners/base_llm.py b/agentserver/listeners/llm_listener.py
similarity index 98%
rename from agentserver/listeners/base_llm.py
rename to agentserver/listeners/llm_listener.py
index 97794c8..fbe9086 100644
--- a/agentserver/listeners/base_llm.py
+++ b/agentserver/listeners/llm_listener.py
@@ -17,7 +17,7 @@ from typing import Dict, List
 from lxml import etree
 
 from agentserver.xml_listener import XMLListener
-from agentserver.utils.llm_connection import llm_pool
+from agentserver.listeners.llm_connection import llm_pool
 from agentserver.prompts.no_paperclippers import MANIFESTO_MESSAGE
 
 logger = logging.getLogger(__name__)
diff --git a/agentserver/privileged/__init__.py b/agentserver/privileged/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/agentserver/privileged/commands.py b/agentserver/privileged/commands.py
deleted file mode 100644
index e69de29..0000000
diff --git a/agentserver/privileged/models.py b/agentserver/privileged/models.py
deleted file mode 100644
index 743feba..0000000
--- a/agentserver/privileged/models.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# agentserver/privileged/models.py
-from datetime import datetime
-from typing import Literal, Optional, List
-from pydantic import BaseModel, Field, AnyUrl
-
-class RegisterListener(BaseModel):
-    class_path: str = Field(alias="class")
-    description: Optional[str] = None
-    team: Optional[str] = None
-    max_concurrent: Optional[int] = None
-    session_timeout: Optional[int] = None
-
-class Shutdown(BaseModel):
-    mode: Optional[Literal["graceful", "immediate"]] = None
-    reason: Optional[str] = None
-
-class RegisterRemoteGateway(BaseModel):
-    url: AnyUrl
-    identity: Optional[str] = None  # base64 public key
-    import_tags: Optional[List[str]] = Field(default=None, alias="import-tags")
-    description: Optional[str] = None
-    team: Optional[str] = None
-    max_concurrent: Optional[int] = None
-
-# Union of all payload types
-class PrivilegedPayload(BaseModel):
-    __root__: (
-        RegisterListener
-        | Shutdown
-        | RegisterRemoteGateway
-        # ... add the rest
-    )
-
-class PrivilegedMsgEnvelope(BaseModel):
-    payload: PrivilegedPayload
-    signature: str   # base64 Ed25519 signature
-    version: Literal["1.0"] = "1.0"
\ No newline at end of file
diff --git a/agentserver/privileged/msg_listener.py b/agentserver/privileged/msg_listener.py
deleted file mode 100644
index e69de29..0000000
diff --git a/agentserver/utils/logging_setup.py b/agentserver/utils/logging_setup.py
deleted file mode 100644
index e69de29..0000000
diff --git a/agentserver/utils/xml_tools.py b/agentserver/utils/xml_tools.py
deleted file mode 100644
index e69de29..0000000
diff --git a/structure.md b/structure.md
index 4dcb2e7..cd9553e 100644
--- a/structure.md
+++ b/structure.md
@@ -11,34 +11,49 @@ xml-pipeline/
 │   ├── listeners/
 │   │   ├── examples/
 │   │   │   ├── __init__.py
-│   │   │   └── echo_chamber.py
+│   │   │   ├── echo_chamber.py
+│   │   │   └── grok_personality.py
 │   │   ├── __init__.py
-│   │   └── base.py
-│   ├── privileged/
-│   │   ├── __init__.py
-│   │   ├── commands.py
-│   │   ├── models.py
-│   │   └── msg_listener.py
+│   │   ├── llm_connection.py
+│   │   └── llm_listener.py
+│   ├── prompts/
+│   │   ├── grok_classic.py
+│   │   └── no_paperclippers.py
 │   ├── schema/
-│   │   └── priviledged-msg.xsd
+│   │   ├── payloads/
+│   │   │   └── grok-response.xsd
+│   │   ├── envelope.xsd
+│   │   └── privileged-msg.xsd
 │   ├── utils/
 │   │   ├── __init__.py
-│   │   ├── logging_setup.py
-│   │   └── xml_tools.py
+│   │   └── message.py
 │   ├── __init__.py
 │   ├── agentserver.py
-│   ├── llm_connection.py
 │   ├── main.py
-│   └── message_bus.py
+│   ├── message_bus.py
+│   └── xml_listener.py
+├── docs/
+│   ├── AgentServer.md
+│   ├── Local Privilege only.md
+│   ├── logic and iteration.md
+│   └── prompt-no-paperclippers.md
 ├── scripts/
 │   └── generate_organism_key.py
 ├── tests/
 │   └── __init__.py
+├── xml_pipeline.egg-info/
+│   ├── PKG-INFO
+│   ├── SOURCES.txt
+│   ├── dependency_links.txt
+│   ├── requires.txt
+│   └── top_level.txt
 ├── LICENSE
 ├── README.md
+├── README.v0.md
+├── README.v1.md
 ├── __init__.py
 ├── pyproject.toml
-├── roadmap.md
 ├── setup-project.ps1
 └── structure.md
+
 ```