diff --git a/.github/scripts/check_test_isolation.py b/.github/scripts/check_test_isolation.py
index 5f320dcbf9..2dc552c293 100644
--- a/.github/scripts/check_test_isolation.py
+++ b/.github/scripts/check_test_isolation.py
@@ -12,7 +12,7 @@
 `beforeAll()`, `afterEach()`, or `afterAll()` — blocks that run at test-execution
 time, not class-instantiation time.
 
-See TEST_ISOLATION_ADVISE.md at the repo root.
+See docs/testing/TEST_ISOLATION_ADVISE.md.
 
 Run from the repo root:
     python3 .github/scripts/check_test_isolation.py
@@ -219,7 +219,7 @@ def main() -> int:
             f"\n{total} test-isolation violation(s) found.\n"
             "Wrap setPropsValues inside scenario {{ ... }} or "
             "beforeEach()/beforeAll()/afterEach()/afterAll().\n"
-            "See TEST_ISOLATION_ADVISE.md.",
+            "See docs/testing/TEST_ISOLATION_ADVISE.md.",
             file=sys.stderr,
         )
         return 1
diff --git a/cheat_sheet.md b/docs/cheat_sheet.md
similarity index 100%
rename from cheat_sheet.md
rename to docs/cheat_sheet.md
diff --git a/completed_developments.md b/docs/completed_developments.md
similarity index 100%
rename from completed_developments.md
rename to docs/completed_developments.md
diff --git a/credits.md b/docs/credits.md
similarity index 100%
rename from credits.md
rename to docs/credits.md
diff --git a/roadmap.md b/docs/roadmap.md
similarity index 100%
rename from roadmap.md
rename to docs/roadmap.md
diff --git a/temp_docs/OBP_OIDC_Configuration_Guide.md b/docs/temp_docs/IdP/OBP_OIDC_Configuration_Guide.md
similarity index 100%
rename from temp_docs/OBP_OIDC_Configuration_Guide.md
rename to docs/temp_docs/IdP/OBP_OIDC_Configuration_Guide.md
diff --git a/temp_docs/FINAL_SUMMARY.md b/docs/temp_docs/caching/CACHE_NAMESPACE_ENDPOINT_FINAL_SUMMARY.md
similarity index 97%
rename from temp_docs/FINAL_SUMMARY.md
rename to docs/temp_docs/caching/CACHE_NAMESPACE_ENDPOINT_FINAL_SUMMARY.md
index 7bcb73cc26..cbf7c122d7 100644
--- a/temp_docs/FINAL_SUMMARY.md
+++ b/docs/temp_docs/caching/CACHE_NAMESPACE_ENDPOINT_FINAL_SUMMARY.md
@@ -111,7 +111,7 @@ curl -X GET https://your-api/obp/v6.0.0/system/cache/namespaces \
 ## Documentation
 
 - **Full Plan**: `ideas/CACHE_NAMESPACE_STANDARDIZATION.md`
-- **Implementation Details**: `IMPLEMENTATION_SUMMARY.md`
+- **Implementation Details**: `CACHE_NAMESPACE_IMPLEMENTATION_SUMMARY.md`
 
 ## Summary
 
diff --git a/temp_docs/IMPLEMENTATION_SUMMARY.md b/docs/temp_docs/caching/CACHE_NAMESPACE_IMPLEMENTATION_SUMMARY.md
similarity index 100%
rename from temp_docs/IMPLEMENTATION_SUMMARY.md
rename to docs/temp_docs/caching/CACHE_NAMESPACE_IMPLEMENTATION_SUMMARY.md
diff --git a/temp_docs/RATE_LIMITING_BUG_FIX.md b/docs/temp_docs/rate-limiting/RATE_LIMITING_BUG_FIX.md
similarity index 100%
rename from temp_docs/RATE_LIMITING_BUG_FIX.md
rename to docs/temp_docs/rate-limiting/RATE_LIMITING_BUG_FIX.md
diff --git a/temp_docs/CHANGES_SUMMARY.md b/docs/temp_docs/rate-limiting/RATE_LIMITING_CHANGES_SUMMARY.md
similarity index 100%
rename from temp_docs/CHANGES_SUMMARY.md
rename to docs/temp_docs/rate-limiting/RATE_LIMITING_CHANGES_SUMMARY.md
diff --git a/temp_docs/_NEXT_STEPS.md b/docs/temp_docs/rate-limiting/RATE_LIMITING_NEXT_STEPS.md
similarity index 100%
rename from temp_docs/_NEXT_STEPS.md
rename to docs/temp_docs/rate-limiting/RATE_LIMITING_NEXT_STEPS.md
diff --git a/temp_docs/REDIS_RATE_LIMITING_DOCUMENTATION.md b/docs/temp_docs/rate-limiting/REDIS_RATE_LIMITING_DOCUMENTATION.md
similarity index 100%
rename from temp_docs/REDIS_RATE_LIMITING_DOCUMENTATION.md
rename to docs/temp_docs/rate-limiting/REDIS_RATE_LIMITING_DOCUMENTATION.md
diff --git a/temp_docs/REDIS_READ_ACCESS_FUNCTIONS.md b/docs/temp_docs/rate-limiting/REDIS_READ_ACCESS_FUNCTIONS.md
similarity index 100%
rename from temp_docs/REDIS_READ_ACCESS_FUNCTIONS.md
rename to docs/temp_docs/rate-limiting/REDIS_READ_ACCESS_FUNCTIONS.md
diff --git a/EXTRA_TESTS_TODO.md b/docs/testing/EXTRA_TESTS_TODO.md
similarity index 100%
rename from EXTRA_TESTS_TODO.md
rename to docs/testing/EXTRA_TESTS_TODO.md
diff --git a/TEST_ISOLATION_ADVISE.md b/docs/testing/TEST_ISOLATION_ADVISE.md
similarity index 100%
rename from TEST_ISOLATION_ADVISE.md
rename to docs/testing/TEST_ISOLATION_ADVISE.md
diff --git a/todo_shared_ensure_json_content_type.md b/docs/testing/todo_shared_ensure_json_content_type.md
similarity index 100%
rename from todo_shared_ensure_json_content_type.md
rename to docs/testing/todo_shared_ensure_json_content_type.md