diff --git a/README.md b/README.md
index 5169c7a..da75715 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ Starworld is an [Overte](https://overte.org) client that renders virtual world e
 
 ### Build Everything
 ```bash
-./build_and_test.sh
+./scripts/build_and_test.sh
 ```
 
 Or manually:
@@ -213,7 +213,10 @@ Starworld/
 │   ├── src/lib.rs
 │   └── Cargo.toml
 ├── tests/            # Test harness
-└── tools/            # Python utilities
+├── tools/            # Python utilities
+├── scripts/          # Build and utility scripts
+├── docs/             # Documentation files
+└── examples/         # Example configurations and models
 ```
 
 ### Debugging
diff --git a/CHANGELOG.md b/docs/CHANGELOG.md
similarity index 100%
rename from CHANGELOG.md
rename to docs/CHANGELOG.md
diff --git a/CI_SETUP_SUMMARY.md b/docs/CI_SETUP_SUMMARY.md
similarity index 100%
rename from CI_SETUP_SUMMARY.md
rename to docs/CI_SETUP_SUMMARY.md
diff --git a/CODE_CLEANUP_PLAN.md b/docs/CODE_CLEANUP_PLAN.md
similarity index 100%
rename from CODE_CLEANUP_PLAN.md
rename to docs/CODE_CLEANUP_PLAN.md
diff --git a/DEVELOPER_GUIDE.md b/docs/DEVELOPER_GUIDE.md
similarity index 100%
rename from DEVELOPER_GUIDE.md
rename to docs/DEVELOPER_GUIDE.md
diff --git a/ENTITY_RENDERING_ENHANCEMENTS.md b/docs/ENTITY_RENDERING_ENHANCEMENTS.md
similarity index 100%
rename from ENTITY_RENDERING_ENHANCEMENTS.md
rename to docs/ENTITY_RENDERING_ENHANCEMENTS.md
diff --git a/MODELCACHE_IMPLEMENTATION.md b/docs/MODELCACHE_IMPLEMENTATION.md
similarity index 100%
rename from MODELCACHE_IMPLEMENTATION.md
rename to docs/MODELCACHE_IMPLEMENTATION.md
diff --git a/OVERTE_ASSIGNMENT_CLIENT_TASK.md b/docs/OVERTE_ASSIGNMENT_CLIENT_TASK.md
similarity index 100%
rename from OVERTE_ASSIGNMENT_CLIENT_TASK.md
rename to docs/OVERTE_ASSIGNMENT_CLIENT_TASK.md
diff --git a/OVERTE_AUTH.md b/docs/OVERTE_AUTH.md
similarity index 100%
rename from OVERTE_AUTH.md
rename to docs/OVERTE_AUTH.md
diff --git a/primitives/cube.glb b/examples/primitives/cube.glb
similarity index 100%
rename from primitives/cube.glb
rename to examples/primitives/cube.glb
diff --git a/primitives/sphere.glb b/examples/primitives/sphere.glb
similarity index 100%
rename from primitives/sphere.glb
rename to examples/primitives/sphere.glb
diff --git a/test_entities.json b/examples/test_entities.json
similarity index 100%
rename from test_entities.json
rename to examples/test_entities.json
diff --git a/build_and_test.sh b/scripts/build_and_test.sh
similarity index 100%
rename from build_and_test.sh
rename to scripts/build_and_test.sh
diff --git a/ci-test.sh b/scripts/ci-test.sh
similarity index 100%
rename from ci-test.sh
rename to scripts/ci-test.sh
diff --git a/run_with_auth.sh b/scripts/run_with_auth.sh
similarity index 100%
rename from run_with_auth.sh
rename to scripts/run_with_auth.sh