diff --git a/README.md b/README.md
index aeb2ab109..931d252c4 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,7 @@ Captured from this machine to document the local development environment:
 
 ## Key Highlights
 
-- **6-Level Permission System**: Each user level from Public to SuperGod maps to documented routes, policies, and role inheritance so you can reason about features before touching code ([`docs/architecture/5-level-system.md`](./docs/architecture/5-level-system.md)).
+- **5-Level Permission System**: Each user level from Public to SuperGod maps to documented routes, policies, and role inheritance so you can reason about features before touching code ([`docs/architecture/5-level-system.md`](./docs/architecture/5-level-system.md)).
 - **Multi-tenant data platform**: Prisma, tenant-aware storage, and quota management patterns keep all queries scoped by `tenantId` while keeping schema evolution safe ([`docs/architecture/database.md`](./docs/architecture/database.md)).
 - **Declarative packages & Lua logic**: Modular `packages/*/seed` definitions let you ship UI/features via JSON/Lua, while the Lua sandbox protects the runtime ([`docs/architecture/packages.md`](./docs/architecture/packages.md), [`docs/lua/README.md`](./docs/lua/README.md)).
 - **Type-safe + CI-ready workflow**: TypeScript tooling, Act local workflows, and targeted scripts keep linting, testing, and deploy checks consistent with the documentation hub ([`docs/README.md`](./docs/README.md)).
diff --git a/docs/architecture/permissions-levels.md b/docs/architecture/permissions-levels.md
index a764f7251..1bbf294db 100644
--- a/docs/architecture/permissions-levels.md
+++ b/docs/architecture/permissions-levels.md
@@ -1,16 +1,17 @@
 # Permission Levels Reference
 
-MetaBuilder runs on a five-tier permission stack that spans the public surface, authenticated experiences, moderation, system design, and governance.
+MetaBuilder runs on a six-tier permission stack that spans the public surface, authenticated experiences, moderation, governance, system design, and governance.
 
 ## Tier breakdown
 
 | Level | Name | Responsibilities |
 |-------|------|------------------|
-| 1 | Guest | Browse marketing content, view stories, consume public dashboards without any write access.
-| 2 | Regular User | Maintain a profile, tune personal settings, launch saved dashboards, and participate in public workflows.
-| 3 | Moderator | Keep the community healthy by resolving flags, reviewing reports, and adjusting shared spaces.
-| 4 | God | Author blueprints, edit the front page, seed packages, and design workflows for the multiverse.
-| 5 | Super God | Transfer front page ownership, promote gods, run audits, and override safety nets when necessary.
+| 1 | Public | Browse marketing content, view stories, and consume public dashboards without any write access. |
+| 2 | Regular User | Maintain a profile, tune personal settings, launch saved dashboards, and participate in community workflows. |
+| 3 | Moderator | Keep the community healthy by resolving flags, reviewing reports, and guiding shared spaces. |
+| 4 | Admin | Manage tenant policies, approve shared content, and coordinate escalation paths. |
+| 5 | God | Author blueprints, edit the front page, seed packages, and design workflows for the multiverse. |
+| 6 | Super God | Transfer front page ownership, promote gods, run audits, and override safety nets when necessary. |
 
 ## Interactive view
 
diff --git a/docs/todo/0-kickstart.md b/docs/todo/core/0-kickstart.md
similarity index 100%
rename from docs/todo/0-kickstart.md
rename to docs/todo/core/0-kickstart.md
diff --git a/docs/todo/1-TODO.md b/docs/todo/core/1-TODO.md
similarity index 100%
rename from docs/todo/1-TODO.md
rename to docs/todo/core/1-TODO.md
diff --git a/docs/todo/2-TODO.md b/docs/todo/core/2-TODO.md
similarity index 100%
rename from docs/todo/2-TODO.md
rename to docs/todo/core/2-TODO.md
diff --git a/docs/todo/21-SDLC-TODO.md b/docs/todo/core/21-SDLC-TODO.md
similarity index 100%
rename from docs/todo/21-SDLC-TODO.md
rename to docs/todo/core/21-SDLC-TODO.md
diff --git a/docs/todo/3-TODO.md b/docs/todo/core/3-TODO.md
similarity index 100%
rename from docs/todo/3-TODO.md
rename to docs/todo/core/3-TODO.md
diff --git a/docs/todo/12-DOCUMENTATION-TODO.md b/docs/todo/features/12-DOCUMENTATION-TODO.md
similarity index 100%
rename from docs/todo/12-DOCUMENTATION-TODO.md
rename to docs/todo/features/12-DOCUMENTATION-TODO.md
diff --git a/docs/todo/13-DECLARATIVE-UI-TODO.md b/docs/todo/features/13-DECLARATIVE-UI-TODO.md
similarity index 100%
rename from docs/todo/13-DECLARATIVE-UI-TODO.md
rename to docs/todo/features/13-DECLARATIVE-UI-TODO.md
diff --git a/docs/todo/14-MULTI-TENANT-TODO.md b/docs/todo/features/14-MULTI-TENANT-TODO.md
similarity index 100%
rename from docs/todo/14-MULTI-TENANT-TODO.md
rename to docs/todo/features/14-MULTI-TENANT-TODO.md
diff --git a/docs/todo/5-FRONTEND-TODO.md b/docs/todo/features/5-FRONTEND-TODO.md
similarity index 100%
rename from docs/todo/5-FRONTEND-TODO.md
rename to docs/todo/features/5-FRONTEND-TODO.md
diff --git a/docs/todo/6-PACKAGES-TODO.md b/docs/todo/features/6-PACKAGES-TODO.md
similarity index 100%
rename from docs/todo/6-PACKAGES-TODO.md
rename to docs/todo/features/6-PACKAGES-TODO.md
diff --git a/docs/todo/8-TESTING-TODO.md b/docs/todo/features/8-TESTING-TODO.md
similarity index 100%
rename from docs/todo/8-TESTING-TODO.md
rename to docs/todo/features/8-TESTING-TODO.md
diff --git a/docs/todo/9-LUA-SCRIPTING-TODO.md b/docs/todo/features/9-LUA-SCRIPTING-TODO.md
similarity index 100%
rename from docs/todo/9-LUA-SCRIPTING-TODO.md
rename to docs/todo/features/9-LUA-SCRIPTING-TODO.md
diff --git a/docs/todo/10-SECURITY-TODO.md b/docs/todo/infrastructure/10-SECURITY-TODO.md
similarity index 100%
rename from docs/todo/10-SECURITY-TODO.md
rename to docs/todo/infrastructure/10-SECURITY-TODO.md
diff --git a/docs/todo/11-DEPLOYMENT-TODO.md b/docs/todo/infrastructure/11-DEPLOYMENT-TODO.md
similarity index 100%
rename from docs/todo/11-DEPLOYMENT-TODO.md
rename to docs/todo/infrastructure/11-DEPLOYMENT-TODO.md
diff --git a/docs/todo/4-DBAL-TODO.md b/docs/todo/infrastructure/4-DBAL-TODO.md
similarity index 100%
rename from docs/todo/4-DBAL-TODO.md
rename to docs/todo/infrastructure/4-DBAL-TODO.md
diff --git a/docs/todo/7-DATABASE-TODO.md b/docs/todo/infrastructure/7-DATABASE-TODO.md
similarity index 100%
rename from docs/todo/7-DATABASE-TODO.md
rename to docs/todo/infrastructure/7-DATABASE-TODO.md