diff --git a/adr/core-abstractions/main_context_prompt.md b/adr/003-abstractions/main_context_prompt.md
similarity index 100%
rename from adr/core-abstractions/main_context_prompt.md
rename to adr/003-abstractions/main_context_prompt.md
diff --git a/adr/core-abstractions/topology/Cargo.toml b/adr/003-abstractions/topology/Cargo.toml
similarity index 100%
rename from adr/core-abstractions/topology/Cargo.toml
rename to adr/003-abstractions/topology/Cargo.toml
diff --git a/adr/core-abstractions/topology/src/main.rs b/adr/003-abstractions/topology/src/main.rs
similarity index 100%
rename from adr/core-abstractions/topology/src/main.rs
rename to adr/003-abstractions/topology/src/main.rs
diff --git a/adr/core-abstractions/topology/src/main_claude37_2.rs b/adr/003-abstractions/topology/src/main_claude37_2.rs
similarity index 100%
rename from adr/core-abstractions/topology/src/main_claude37_2.rs
rename to adr/003-abstractions/topology/src/main_claude37_2.rs
diff --git a/adr/core-abstractions/topology/src/main_claudev1.rs b/adr/003-abstractions/topology/src/main_claudev1.rs
similarity index 100%
rename from adr/core-abstractions/topology/src/main_claudev1.rs
rename to adr/003-abstractions/topology/src/main_claudev1.rs
diff --git a/adr/core-abstractions/topology/src/main_gemini25pro.rs b/adr/003-abstractions/topology/src/main_gemini25pro.rs
similarity index 100%
rename from adr/core-abstractions/topology/src/main_gemini25pro.rs
rename to adr/003-abstractions/topology/src/main_gemini25pro.rs
diff --git a/adr/core-abstractions/topology/src/main_geminifail.rs b/adr/003-abstractions/topology/src/main_geminifail.rs
similarity index 100%
rename from adr/core-abstractions/topology/src/main_geminifail.rs
rename to adr/003-abstractions/topology/src/main_geminifail.rs
diff --git a/adr/core-abstractions/topology/src/main_right.rs b/adr/003-abstractions/topology/src/main_right.rs
similarity index 100%
rename from adr/core-abstractions/topology/src/main_right.rs
rename to adr/003-abstractions/topology/src/main_right.rs
diff --git a/adr/core-abstractions/topology/src/main_v1.rs b/adr/003-abstractions/topology/src/main_v1.rs
similarity index 100%
rename from adr/core-abstractions/topology/src/main_v1.rs
rename to adr/003-abstractions/topology/src/main_v1.rs
diff --git a/adr/core-abstractions/topology2/Cargo.toml b/adr/003-abstractions/topology2/Cargo.toml
similarity index 100%
rename from adr/core-abstractions/topology2/Cargo.toml
rename to adr/003-abstractions/topology2/Cargo.toml
diff --git a/adr/core-abstractions/topology2/src/main.rs b/adr/003-abstractions/topology2/src/main.rs
similarity index 100%
rename from adr/core-abstractions/topology2/src/main.rs
rename to adr/003-abstractions/topology2/src/main.rs
diff --git a/adr/core-abstractions/topology2/src/main_capabilities.rs b/adr/003-abstractions/topology2/src/main_capabilities.rs
similarity index 100%
rename from adr/core-abstractions/topology2/src/main_capabilities.rs
rename to adr/003-abstractions/topology2/src/main_capabilities.rs
diff --git a/adr/core-abstractions/topology2/src/main_v1.rs b/adr/003-abstractions/topology2/src/main_v1.rs
similarity index 100%
rename from adr/core-abstractions/topology2/src/main_v1.rs
rename to adr/003-abstractions/topology2/src/main_v1.rs
diff --git a/adr/core-abstractions/topology2/src/main_v2.rs b/adr/003-abstractions/topology2/src/main_v2.rs
similarity index 100%
rename from adr/core-abstractions/topology2/src/main_v2.rs
rename to adr/003-abstractions/topology2/src/main_v2.rs
diff --git a/adr/core-abstractions/topology2/src/main_v4.rs b/adr/003-abstractions/topology2/src/main_v4.rs
similarity index 100%
rename from adr/core-abstractions/topology2/src/main_v4.rs
rename to adr/003-abstractions/topology2/src/main_v4.rs
diff --git a/adr/tenant/NetworkPolicy.yaml b/adr/011-tenant/NetworkPolicy.yaml
similarity index 100%
rename from adr/tenant/NetworkPolicy.yaml
rename to adr/011-tenant/NetworkPolicy.yaml
diff --git a/adr/tenant/TestDeployment.yaml b/adr/011-tenant/TestDeployment.yaml
similarity index 100%
rename from adr/tenant/TestDeployment.yaml
rename to adr/011-tenant/TestDeployment.yaml