diff --git a/.cursorrules b/.cursorrules
index d0f1a094..7053db58 100644
--- a/.cursorrules
+++ b/.cursorrules
@@ -29,19 +29,19 @@ The we wash rinse and repeat for each project. When we are done we have a fully
 The API Specifications are in inbox/spec_packagename
 The Concrete Implementations are in inbox/src_packagename
 
-The directory structure that matters most is as follows: RITIGITIRR
+The directory structure for the project is as follows:
 
-archieved/ = old versions of the codebase
 config/ = configuration files
-core/   = core packages required for minimal server functionality (Platform Zero Server)
+devops/ = docker and kubernetes configuration
 docs/   = documentation
 examples/ = example applications demonstrating using the Platform API
-inbox/  = packages that are being worked on
-packages/ = packages that are not ready for use (Original Angel3 Packages)
-sandbox/ = packages that are being vetted for forked integration ready for use (Experimental Packages)
-stubs/ = stubs for packages that can be used as starter templates jumpstarting development
-utils/ = utility scripts
-wspace/ = workspace for development
+packages/ = platform packages
+resources = images, icons, and other resources
+scripts/ = utility scripts
+templates/ = starter templates
+tests/ = repository wide integration tests
+tools/ = project wide tools
+utils/ = cli, console, and other utilities
 
 Protevus Platform is a hard-fork of Angel3 that is being refactored and rebranded to be Protevus Platform
 For now all references to Angel3 remain the same, but in the future we will be changing them to Protevus or Platform
diff --git a/stubs/.gitkeep b/devops/README.md
similarity index 100%
rename from stubs/.gitkeep
rename to devops/README.md
diff --git a/docs/deployment/docker/README.md b/devops/docker/README.md
similarity index 100%
rename from docs/deployment/docker/README.md
rename to devops/docker/README.md
diff --git a/docs/deployment/docker/docker-compose-mariadb.yml b/devops/docker/services/docker-compose-mariadb.yml
similarity index 100%
rename from docs/deployment/docker/docker-compose-mariadb.yml
rename to devops/docker/services/docker-compose-mariadb.yml
diff --git a/docs/deployment/docker/docker-compose-mongo.yml b/devops/docker/services/docker-compose-mongo.yml
similarity index 100%
rename from docs/deployment/docker/docker-compose-mongo.yml
rename to devops/docker/services/docker-compose-mongo.yml
diff --git a/docs/deployment/docker/docker-compose-mysql.yml b/devops/docker/services/docker-compose-mysql.yml
similarity index 100%
rename from docs/deployment/docker/docker-compose-mysql.yml
rename to devops/docker/services/docker-compose-mysql.yml
diff --git a/docs/deployment/docker/docker-compose-pg.yml b/devops/docker/services/docker-compose-pg.yml
similarity index 100%
rename from docs/deployment/docker/docker-compose-pg.yml
rename to devops/docker/services/docker-compose-pg.yml
diff --git a/docs/deployment/docker/docker-compose-redis.yml b/devops/docker/services/docker-compose-redis.yml
similarity index 100%
rename from docs/deployment/docker/docker-compose-redis.yml
rename to devops/docker/services/docker-compose-redis.yml
diff --git a/docs/deployment/docker/docker-compose-rethinkdb.yml b/devops/docker/services/docker-compose-rethinkdb.yml
similarity index 100%
rename from docs/deployment/docker/docker-compose-rethinkdb.yml
rename to devops/docker/services/docker-compose-rethinkdb.yml
diff --git a/utilities/.gitkeep b/devops/k8s/.gitkeep
similarity index 100%
rename from utilities/.gitkeep
rename to devops/k8s/.gitkeep
diff --git a/docs/testing/performance/README.md b/docs/Testing.md
similarity index 100%
rename from docs/testing/performance/README.md
rename to docs/Testing.md
diff --git a/resources/.gitkeep b/resources/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/scripts/.gitkeep b/scripts/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/templates/.gitkeep b/templates/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/.gitkeep b/tests/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/tools/.gitkeep b/tools/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/utils/.gitkeep b/utils/.gitkeep
new file mode 100644
index 00000000..e69de29b