diff --git a/src/aipass/memory/__init__.py b/src/aipass/citizenship/__init__.py
similarity index 100%
rename from src/aipass/memory/__init__.py
rename to src/aipass/citizenship/__init__.py
diff --git a/src/aipass/memory/handlers/__init__.py b/src/aipass/citizenship/handlers/__init__.py
similarity index 100%
rename from src/aipass/memory/handlers/__init__.py
rename to src/aipass/citizenship/handlers/__init__.py
diff --git a/src/aipass/memory/modules/__init__.py b/src/aipass/citizenship/modules/__init__.py
similarity index 100%
rename from src/aipass/memory/modules/__init__.py
rename to src/aipass/citizenship/modules/__init__.py
diff --git a/src/aipass/memory/modules/agents.py b/src/aipass/citizenship/modules/agents.py
similarity index 100%
rename from src/aipass/memory/modules/agents.py
rename to src/aipass/citizenship/modules/agents.py
diff --git a/src/aipass/memory/modules/bank.py b/src/aipass/citizenship/modules/bank.py
similarity index 100%
rename from src/aipass/memory/modules/bank.py
rename to src/aipass/citizenship/modules/bank.py
diff --git a/src/aipass/memory/modules/trinity.py b/src/aipass/citizenship/modules/trinity.py
similarity index 100%
rename from src/aipass/memory/modules/trinity.py
rename to src/aipass/citizenship/modules/trinity.py
diff --git a/src/aipass/memory/plugins/__init__.py b/src/aipass/citizenship/plugins/__init__.py
similarity index 100%
rename from src/aipass/memory/plugins/__init__.py
rename to src/aipass/citizenship/plugins/__init__.py
diff --git a/src/aipass/templates/agents/branch_template/.cotrex/.backup_ignore.json b/src/aipass/templates/agents/branch_template/.agents/.backup_ignore.json
similarity index 100%
rename from src/aipass/templates/agents/branch_template/.cotrex/.backup_ignore.json
rename to src/aipass/templates/agents/branch_template/.agents/.backup_ignore.json
diff --git a/src/aipass/templates/agents/branch_template/.cotrex/.migrations.json b/src/aipass/templates/agents/branch_template/.agents/.migrations.json
similarity index 100%
rename from src/aipass/templates/agents/branch_template/.cotrex/.migrations.json
rename to src/aipass/templates/agents/branch_template/.agents/.migrations.json
diff --git a/src/aipass/templates/agents/branch_template/.cotrex/.registry_ignore.json b/src/aipass/templates/agents/branch_template/.agents/.registry_ignore.json
similarity index 100%
rename from src/aipass/templates/agents/branch_template/.cotrex/.registry_ignore.json
rename to src/aipass/templates/agents/branch_template/.agents/.registry_ignore.json
diff --git a/src/aipass/templates/agents/branch_template/.cotrex/.template_registry.json b/src/aipass/templates/agents/branch_template/.agents/.template_registry.json
similarity index 100%
rename from src/aipass/templates/agents/branch_template/.cotrex/.template_registry.json
rename to src/aipass/templates/agents/branch_template/.agents/.template_registry.json