diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/binaries/.env b/deployment/deployment/old/legacy-migration/maintenance-worker/binaries/.env
deleted file mode 100644
index 773918095..000000000
--- a/deployment/deployment/old/legacy-migration/maintenance-worker/binaries/.env
+++ /dev/null
@@ -1,6 +0,0 @@
-# SSH Access
-# SSH_USERNAME='username'
-# SSH_HOST='example.org'
-
-# UPLOADS_DIRECTORY=/var/www/api/uploads
-OUTPUT_DIRECTORY='/uploads/'
\ No newline at end of file
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/mongo/.env b/deployment/deployment/old/legacy-migration/maintenance-worker/migration/mongo/.env
deleted file mode 100644
index 376cb56d0..000000000
--- a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/mongo/.env
+++ /dev/null
@@ -1,17 +0,0 @@
-# SSH Access
-# SSH_USERNAME='username'
-# SSH_HOST='example.org'
-
-# Mongo DB on Remote Maschine
-# MONGODB_USERNAME='mongouser'
-# MONGODB_PASSWORD='mongopassword'
-# MONGODB_DATABASE='mongodatabase'
-# MONGODB_AUTH_DB='admin'
-
-# Export Settings
-# On Windows this resolves to C:\Users\dornhoeschen\AppData\Local\Temp\mongo-export (MinGW)
-EXPORT_PATH='/tmp/mongo-export/'
-EXPORT_MONGOEXPORT_BIN='mongoexport'
-MONGO_EXPORT_SPLIT_SIZE=6000
-# On Windows use something like this
-# EXPORT_MONGOEXPORT_BIN='C:\Program Files\MongoDB\Server\3.6\bin\mongoexport.exe'
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/.env b/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/.env
deleted file mode 100644
index 16220f3e6..000000000
--- a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/.env
+++ /dev/null
@@ -1,16 +0,0 @@
-# Neo4J Settings
-# NEO4J_USERNAME='neo4j'
-# NEO4J_PASSWORD='letmein'
-
-# Import Settings
-# On Windows this resolves to C:\Users\dornhoeschen\AppData\Local\Temp\mongo-export (MinGW)
-IMPORT_PATH='/tmp/mongo-export/'
-IMPORT_CHUNK_PATH='/tmp/mongo-export/splits/'
-
-IMPORT_CHUNK_PATH_CQL='/tmp/mongo-export/splits/'
-# On Windows this path needs to be windows style since the cypher-shell runs native - note the forward slash
-# IMPORT_CHUNK_PATH_CQL='C:/Users/dornhoeschen/AppData/Local/Temp/mongo-export/splits/'
-
-IMPORT_CYPHERSHELL_BIN='cypher-shell'
-# On Windows use something like this
-# IMPORT_CYPHERSHELL_BIN='C:\Program Files\neo4j-community\bin\cypher-shell.bat'
\ No newline at end of file
diff --git a/deployment/deployment/kubernetes/.gitignore b/deployment/kubernetes/.gitignore
similarity index 100%
rename from deployment/deployment/kubernetes/.gitignore
rename to deployment/kubernetes/.gitignore
diff --git a/deployment/deployment/kubernetes/Backup.md b/deployment/kubernetes/Backup.md
similarity index 100%
rename from deployment/deployment/kubernetes/Backup.md
rename to deployment/kubernetes/Backup.md
diff --git a/deployment/deployment/kubernetes/Chart.yaml b/deployment/kubernetes/Chart.yaml
similarity index 100%
rename from deployment/deployment/kubernetes/Chart.yaml
rename to deployment/kubernetes/Chart.yaml
diff --git a/deployment/deployment/kubernetes/DigitalOcean.md b/deployment/kubernetes/DigitalOcean.md
similarity index 100%
rename from deployment/deployment/kubernetes/DigitalOcean.md
rename to deployment/kubernetes/DigitalOcean.md
diff --git a/deployment/deployment/kubernetes/README.md b/deployment/kubernetes/README.md
similarity index 100%
rename from deployment/deployment/kubernetes/README.md
rename to deployment/kubernetes/README.md
diff --git a/deployment/deployment/kubernetes/charts/.gitkeep b/deployment/kubernetes/charts/.gitkeep
similarity index 100%
rename from deployment/deployment/kubernetes/charts/.gitkeep
rename to deployment/kubernetes/charts/.gitkeep
diff --git a/deployment/deployment/kubernetes/crds/.gitkeep b/deployment/kubernetes/crds/.gitkeep
similarity index 100%
rename from deployment/deployment/kubernetes/crds/.gitkeep
rename to deployment/kubernetes/crds/.gitkeep
diff --git a/deployment/deployment/kubernetes/dns.values.template.yaml b/deployment/kubernetes/dns.values.template.yaml
similarity index 100%
rename from deployment/deployment/kubernetes/dns.values.template.yaml
rename to deployment/kubernetes/dns.values.template.yaml
diff --git a/deployment/deployment/kubernetes/nginx.values.template.yaml b/deployment/kubernetes/nginx.values.template.yaml
similarity index 100%
rename from deployment/deployment/kubernetes/nginx.values.template.yaml
rename to deployment/kubernetes/nginx.values.template.yaml
diff --git a/deployment/deployment/kubernetes/templates/NOTES.txt b/deployment/kubernetes/templates/NOTES.txt
similarity index 100%
rename from deployment/deployment/kubernetes/templates/NOTES.txt
rename to deployment/kubernetes/templates/NOTES.txt
diff --git a/deployment/deployment/kubernetes/templates/backend/ConfigMap.yml b/deployment/kubernetes/templates/backend/ConfigMap.yml
similarity index 100%
rename from deployment/deployment/kubernetes/templates/backend/ConfigMap.yml
rename to deployment/kubernetes/templates/backend/ConfigMap.yml
diff --git a/deployment/deployment/kubernetes/templates/backend/Deployment.yaml b/deployment/kubernetes/templates/backend/Deployment.yaml
similarity index 100%
rename from deployment/deployment/kubernetes/templates/backend/Deployment.yaml
rename to deployment/kubernetes/templates/backend/Deployment.yaml
diff --git a/deployment/deployment/kubernetes/templates/backend/PersistentVolumeClaim.yaml b/deployment/kubernetes/templates/backend/PersistentVolumeClaim.yaml
similarity index 100%
rename from deployment/deployment/kubernetes/templates/backend/PersistentVolumeClaim.yaml
rename to deployment/kubernetes/templates/backend/PersistentVolumeClaim.yaml
diff --git a/deployment/deployment/kubernetes/templates/backend/Secret.yaml b/deployment/kubernetes/templates/backend/Secret.yaml
similarity index 100%
rename from deployment/deployment/kubernetes/templates/backend/Secret.yaml
rename to deployment/kubernetes/templates/backend/Secret.yaml
diff --git a/deployment/deployment/kubernetes/templates/backend/Service.yaml b/deployment/kubernetes/templates/backend/Service.yaml
similarity index 100%
rename from deployment/deployment/kubernetes/templates/backend/Service.yaml
rename to deployment/kubernetes/templates/backend/Service.yaml
diff --git a/deployment/deployment/kubernetes/templates/issuer/letsencrypt-production.yaml b/deployment/kubernetes/templates/issuer/letsencrypt-production.yaml
similarity index 100%
rename from deployment/deployment/kubernetes/templates/issuer/letsencrypt-production.yaml
rename to deployment/kubernetes/templates/issuer/letsencrypt-production.yaml
diff --git a/deployment/deployment/kubernetes/templates/issuer/letsencrypt-staging.yaml b/deployment/kubernetes/templates/issuer/letsencrypt-staging.yaml
similarity index 100%
rename from deployment/deployment/kubernetes/templates/issuer/letsencrypt-staging.yaml
rename to deployment/kubernetes/templates/issuer/letsencrypt-staging.yaml
diff --git a/deployment/deployment/kubernetes/templates/jobs/job-db-init.yaml b/deployment/kubernetes/templates/jobs/job-db-init.yaml
similarity index 100%
rename from deployment/deployment/kubernetes/templates/jobs/job-db-init.yaml
rename to deployment/kubernetes/templates/jobs/job-db-init.yaml
diff --git a/deployment/deployment/kubernetes/templates/jobs/job-db-migrate.yaml b/deployment/kubernetes/templates/jobs/job-db-migrate.yaml
similarity index 100%
rename from deployment/deployment/kubernetes/templates/jobs/job-db-migrate.yaml
rename to deployment/kubernetes/templates/jobs/job-db-migrate.yaml
diff --git a/deployment/deployment/kubernetes/templates/maintenance/ConfigMap.yml b/deployment/kubernetes/templates/maintenance/ConfigMap.yml
similarity index 100%
rename from deployment/deployment/kubernetes/templates/maintenance/ConfigMap.yml
rename to deployment/kubernetes/templates/maintenance/ConfigMap.yml
diff --git a/deployment/deployment/kubernetes/templates/maintenance/Deployment.yaml b/deployment/kubernetes/templates/maintenance/Deployment.yaml
similarity index 100%
rename from deployment/deployment/kubernetes/templates/maintenance/Deployment.yaml
rename to deployment/kubernetes/templates/maintenance/Deployment.yaml
diff --git a/deployment/deployment/kubernetes/templates/maintenance/Secret.yaml b/deployment/kubernetes/templates/maintenance/Secret.yaml
similarity index 100%
rename from deployment/deployment/kubernetes/templates/maintenance/Secret.yaml
rename to deployment/kubernetes/templates/maintenance/Secret.yaml
diff --git a/deployment/deployment/kubernetes/templates/maintenance/Service.yaml b/deployment/kubernetes/templates/maintenance/Service.yaml
similarity index 100%
rename from deployment/deployment/kubernetes/templates/maintenance/Service.yaml
rename to deployment/kubernetes/templates/maintenance/Service.yaml
diff --git a/deployment/deployment/kubernetes/templates/neo4j/ConfigMap.yml b/deployment/kubernetes/templates/neo4j/ConfigMap.yml
similarity index 100%
rename from deployment/deployment/kubernetes/templates/neo4j/ConfigMap.yml
rename to deployment/kubernetes/templates/neo4j/ConfigMap.yml
diff --git a/deployment/deployment/kubernetes/templates/neo4j/Deployment.yaml b/deployment/kubernetes/templates/neo4j/Deployment.yaml
similarity index 100%
rename from deployment/deployment/kubernetes/templates/neo4j/Deployment.yaml
rename to deployment/kubernetes/templates/neo4j/Deployment.yaml
diff --git a/deployment/deployment/kubernetes/templates/neo4j/PersistentVolumeClaim.yaml b/deployment/kubernetes/templates/neo4j/PersistentVolumeClaim.yaml
similarity index 100%
rename from deployment/deployment/kubernetes/templates/neo4j/PersistentVolumeClaim.yaml
rename to deployment/kubernetes/templates/neo4j/PersistentVolumeClaim.yaml
diff --git a/deployment/deployment/kubernetes/templates/neo4j/Secret.yaml b/deployment/kubernetes/templates/neo4j/Secret.yaml
similarity index 100%
rename from deployment/deployment/kubernetes/templates/neo4j/Secret.yaml
rename to deployment/kubernetes/templates/neo4j/Secret.yaml
diff --git a/deployment/deployment/kubernetes/templates/neo4j/Service.yaml b/deployment/kubernetes/templates/neo4j/Service.yaml
similarity index 100%
rename from deployment/deployment/kubernetes/templates/neo4j/Service.yaml
rename to deployment/kubernetes/templates/neo4j/Service.yaml
diff --git a/deployment/deployment/kubernetes/templates/storage/persistent.yml b/deployment/kubernetes/templates/storage/persistent.yml
similarity index 100%
rename from deployment/deployment/kubernetes/templates/storage/persistent.yml
rename to deployment/kubernetes/templates/storage/persistent.yml
diff --git a/deployment/deployment/kubernetes/templates/webapp/ConfigMap.yml b/deployment/kubernetes/templates/webapp/ConfigMap.yml
similarity index 100%
rename from deployment/deployment/kubernetes/templates/webapp/ConfigMap.yml
rename to deployment/kubernetes/templates/webapp/ConfigMap.yml
diff --git a/deployment/deployment/kubernetes/templates/webapp/Deployment.yaml b/deployment/kubernetes/templates/webapp/Deployment.yaml
similarity index 100%
rename from deployment/deployment/kubernetes/templates/webapp/Deployment.yaml
rename to deployment/kubernetes/templates/webapp/Deployment.yaml
diff --git a/deployment/deployment/kubernetes/templates/webapp/Ingress.yaml b/deployment/kubernetes/templates/webapp/Ingress.yaml
similarity index 100%
rename from deployment/deployment/kubernetes/templates/webapp/Ingress.yaml
rename to deployment/kubernetes/templates/webapp/Ingress.yaml
diff --git a/deployment/deployment/kubernetes/templates/webapp/Secret.yaml b/deployment/kubernetes/templates/webapp/Secret.yaml
similarity index 100%
rename from deployment/deployment/kubernetes/templates/webapp/Secret.yaml
rename to deployment/kubernetes/templates/webapp/Secret.yaml
diff --git a/deployment/deployment/kubernetes/templates/webapp/Service.yaml b/deployment/kubernetes/templates/webapp/Service.yaml
similarity index 100%
rename from deployment/deployment/kubernetes/templates/webapp/Service.yaml
rename to deployment/kubernetes/templates/webapp/Service.yaml
diff --git a/deployment/deployment/kubernetes/values.template.yaml b/deployment/kubernetes/values.template.yaml
similarity index 100%
rename from deployment/deployment/kubernetes/values.template.yaml
rename to deployment/kubernetes/values.template.yaml
diff --git a/deployment/deployment/old/Maintenance.md b/deployment/old/Maintenance.md
similarity index 100%
rename from deployment/deployment/old/Maintenance.md
rename to deployment/old/Maintenance.md
diff --git a/deployment/deployment/old/digital-ocean/README.md b/deployment/old/digital-ocean/README.md
similarity index 100%
rename from deployment/deployment/old/digital-ocean/README.md
rename to deployment/old/digital-ocean/README.md
diff --git a/deployment/deployment/old/digital-ocean/dashboard/README.md b/deployment/old/digital-ocean/dashboard/README.md
similarity index 100%
rename from deployment/deployment/old/digital-ocean/dashboard/README.md
rename to deployment/old/digital-ocean/dashboard/README.md
diff --git a/deployment/deployment/old/digital-ocean/dashboard/admin-user.yaml b/deployment/old/digital-ocean/dashboard/admin-user.yaml
similarity index 100%
rename from deployment/deployment/old/digital-ocean/dashboard/admin-user.yaml
rename to deployment/old/digital-ocean/dashboard/admin-user.yaml
diff --git a/deployment/deployment/old/digital-ocean/dashboard/dashboard-screenshot.png b/deployment/old/digital-ocean/dashboard/dashboard-screenshot.png
similarity index 100%
rename from deployment/deployment/old/digital-ocean/dashboard/dashboard-screenshot.png
rename to deployment/old/digital-ocean/dashboard/dashboard-screenshot.png
diff --git a/deployment/deployment/old/digital-ocean/dashboard/role-binding.yaml b/deployment/old/digital-ocean/dashboard/role-binding.yaml
similarity index 100%
rename from deployment/deployment/old/digital-ocean/dashboard/role-binding.yaml
rename to deployment/old/digital-ocean/dashboard/role-binding.yaml
diff --git a/deployment/deployment/old/digital-ocean/https/README.md b/deployment/old/digital-ocean/https/README.md
similarity index 100%
rename from deployment/deployment/old/digital-ocean/https/README.md
rename to deployment/old/digital-ocean/https/README.md
diff --git a/deployment/deployment/old/digital-ocean/https/ip-address.png b/deployment/old/digital-ocean/https/ip-address.png
similarity index 100%
rename from deployment/deployment/old/digital-ocean/https/ip-address.png
rename to deployment/old/digital-ocean/https/ip-address.png
diff --git a/deployment/deployment/old/legacy-migration/README.md b/deployment/old/legacy-migration/README.md
similarity index 100%
rename from deployment/deployment/old/legacy-migration/README.md
rename to deployment/old/legacy-migration/README.md
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker.yaml b/deployment/old/legacy-migration/maintenance-worker.yaml
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker.yaml
rename to deployment/old/legacy-migration/maintenance-worker.yaml
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/.dockerignore b/deployment/old/legacy-migration/maintenance-worker/.dockerignore
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/.dockerignore
rename to deployment/old/legacy-migration/maintenance-worker/.dockerignore
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/.gitignore b/deployment/old/legacy-migration/maintenance-worker/.gitignore
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/.gitignore
rename to deployment/old/legacy-migration/maintenance-worker/.gitignore
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/Dockerfile b/deployment/old/legacy-migration/maintenance-worker/Dockerfile
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/Dockerfile
rename to deployment/old/legacy-migration/maintenance-worker/Dockerfile
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/binaries/idle b/deployment/old/legacy-migration/maintenance-worker/binaries/idle
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/binaries/idle
rename to deployment/old/legacy-migration/maintenance-worker/binaries/idle
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/binaries/import_legacy_db b/deployment/old/legacy-migration/maintenance-worker/binaries/import_legacy_db
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/binaries/import_legacy_db
rename to deployment/old/legacy-migration/maintenance-worker/binaries/import_legacy_db
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/binaries/import_legacy_uploads b/deployment/old/legacy-migration/maintenance-worker/binaries/import_legacy_uploads
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/binaries/import_legacy_uploads
rename to deployment/old/legacy-migration/maintenance-worker/binaries/import_legacy_uploads
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/known_hosts b/deployment/old/legacy-migration/maintenance-worker/known_hosts
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/known_hosts
rename to deployment/old/legacy-migration/maintenance-worker/known_hosts
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/mongo/export.sh b/deployment/old/legacy-migration/maintenance-worker/migration/mongo/export.sh
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/mongo/export.sh
rename to deployment/old/legacy-migration/maintenance-worker/migration/mongo/export.sh
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/badges/badges.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/badges/badges.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/badges/badges.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/badges/badges.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/badges/delete.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/badges/delete.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/badges/delete.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/badges/delete.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/categories/categories.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/categories/categories.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/categories/categories.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/categories/categories.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/categories/delete.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/categories/delete.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/categories/delete.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/categories/delete.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/comments/comments.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/comments/comments.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/comments/comments.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/comments/comments.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/comments/delete.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/comments/delete.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/comments/delete.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/comments/delete.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/contributions/contributions.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/contributions/contributions.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/contributions/contributions.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/contributions/contributions.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/contributions/delete.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/contributions/delete.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/contributions/delete.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/contributions/delete.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/delete_all.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/delete_all.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/delete_all.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/delete_all.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/emotions/delete.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/emotions/delete.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/emotions/delete.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/emotions/delete.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/emotions/emotions.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/emotions/emotions.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/emotions/emotions.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/emotions/emotions.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/follows/delete.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/follows/delete.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/follows/delete.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/follows/delete.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/follows/follows.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/follows/follows.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/follows/follows.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/follows/follows.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/import.sh b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/import.sh
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/import.sh
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/import.sh
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/invites/delete.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/invites/delete.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/invites/delete.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/invites/delete.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/invites/invites.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/invites/invites.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/invites/invites.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/invites/invites.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/notifications/delete.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/notifications/delete.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/notifications/delete.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/notifications/delete.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/notifications/notifications.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/notifications/notifications.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/notifications/notifications.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/notifications/notifications.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/organizations/delete.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/organizations/delete.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/organizations/delete.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/organizations/delete.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/organizations/organizations.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/organizations/organizations.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/organizations/organizations.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/organizations/organizations.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/pages/delete.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/pages/delete.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/pages/delete.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/pages/delete.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/pages/pages.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/pages/pages.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/pages/pages.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/pages/pages.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/projects/delete.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/projects/delete.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/projects/delete.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/projects/delete.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/projects/projects.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/projects/projects.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/projects/projects.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/projects/projects.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/settings/delete.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/settings/delete.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/settings/delete.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/settings/delete.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/settings/settings.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/settings/settings.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/settings/settings.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/settings/settings.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/shouts/delete.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/shouts/delete.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/shouts/delete.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/shouts/delete.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/shouts/shouts.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/shouts/shouts.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/shouts/shouts.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/shouts/shouts.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/status/delete.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/status/delete.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/status/delete.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/status/delete.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/status/status.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/status/status.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/status/status.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/status/status.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/systemnotifications/delete.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/systemnotifications/delete.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/systemnotifications/delete.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/systemnotifications/delete.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/systemnotifications/systemnotifications.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/systemnotifications/systemnotifications.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/systemnotifications/systemnotifications.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/systemnotifications/systemnotifications.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/users/delete.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/users/delete.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/users/delete.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/users/delete.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/users/users.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/users/users.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/users/users.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/users/users.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/userscandos/delete.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/userscandos/delete.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/userscandos/delete.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/userscandos/delete.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/userscandos/userscandos.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/userscandos/userscandos.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/userscandos/userscandos.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/userscandos/userscandos.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/usersettings/delete.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/usersettings/delete.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/usersettings/delete.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/usersettings/delete.cql
diff --git a/deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/usersettings/usersettings.cql b/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/usersettings/usersettings.cql
similarity index 100%
rename from deployment/deployment/old/legacy-migration/maintenance-worker/migration/neo4j/usersettings/usersettings.cql
rename to deployment/old/legacy-migration/maintenance-worker/migration/neo4j/usersettings/usersettings.cql
diff --git a/deployment/deployment/old/mailserver/Deployment.yaml b/deployment/old/mailserver/Deployment.yaml
similarity index 100%
rename from deployment/deployment/old/mailserver/Deployment.yaml
rename to deployment/old/mailserver/Deployment.yaml
diff --git a/deployment/deployment/old/mailserver/README.md b/deployment/old/mailserver/README.md
similarity index 100%
rename from deployment/deployment/old/mailserver/README.md
rename to deployment/old/mailserver/README.md
diff --git a/deployment/deployment/old/mailserver/Service.yaml b/deployment/old/mailserver/Service.yaml
similarity index 100%
rename from deployment/deployment/old/mailserver/Service.yaml
rename to deployment/old/mailserver/Service.yaml
diff --git a/deployment/deployment/old/mailserver/ingress.yaml b/deployment/old/mailserver/ingress.yaml
similarity index 100%
rename from deployment/deployment/old/mailserver/ingress.yaml
rename to deployment/old/mailserver/ingress.yaml
diff --git a/deployment/deployment/old/monitoring/README.md b/deployment/old/monitoring/README.md
similarity index 100%
rename from deployment/deployment/old/monitoring/README.md
rename to deployment/old/monitoring/README.md
diff --git a/deployment/deployment/old/monitoring/grafana/config.yml b/deployment/old/monitoring/grafana/config.yml
similarity index 100%
rename from deployment/deployment/old/monitoring/grafana/config.yml
rename to deployment/old/monitoring/grafana/config.yml
diff --git a/deployment/deployment/old/monitoring/grafana/metrics.png b/deployment/old/monitoring/grafana/metrics.png
similarity index 100%
rename from deployment/deployment/old/monitoring/grafana/metrics.png
rename to deployment/old/monitoring/grafana/metrics.png
diff --git a/deployment/deployment/old/monitoring/grafana/values.yml b/deployment/old/monitoring/grafana/values.yml
similarity index 100%
rename from deployment/deployment/old/monitoring/grafana/values.yml
rename to deployment/old/monitoring/grafana/values.yml
diff --git a/deployment/deployment/old/volumes/README.md b/deployment/old/volumes/README.md
similarity index 100%
rename from deployment/deployment/old/volumes/README.md
rename to deployment/old/volumes/README.md
diff --git a/deployment/deployment/old/volumes/neo4j-offline-backup/README.md b/deployment/old/volumes/neo4j-offline-backup/README.md
similarity index 100%
rename from deployment/deployment/old/volumes/neo4j-offline-backup/README.md
rename to deployment/old/volumes/neo4j-offline-backup/README.md
diff --git a/deployment/deployment/old/volumes/neo4j-online-backup/README.md b/deployment/old/volumes/neo4j-online-backup/README.md
similarity index 100%
rename from deployment/deployment/old/volumes/neo4j-online-backup/README.md
rename to deployment/old/volumes/neo4j-online-backup/README.md
diff --git a/deployment/deployment/old/volumes/uploads.yaml b/deployment/old/volumes/uploads.yaml
similarity index 100%
rename from deployment/deployment/old/volumes/uploads.yaml
rename to deployment/old/volumes/uploads.yaml
diff --git a/deployment/deployment/old/volumes/velero/README.md b/deployment/old/volumes/velero/README.md
similarity index 100%
rename from deployment/deployment/old/volumes/velero/README.md
rename to deployment/old/volumes/velero/README.md
diff --git a/deployment/deployment/old/volumes/volume-snapshots/README.md b/deployment/old/volumes/volume-snapshots/README.md
similarity index 100%
rename from deployment/deployment/old/volumes/volume-snapshots/README.md
rename to deployment/old/volumes/volume-snapshots/README.md
diff --git a/deployment/deployment/old/volumes/volume-snapshots/backen-uploads-snapshot.yaml b/deployment/old/volumes/volume-snapshots/backen-uploads-snapshot.yaml
similarity index 100%
rename from deployment/deployment/old/volumes/volume-snapshots/backen-uploads-snapshot.yaml
rename to deployment/old/volumes/volume-snapshots/backen-uploads-snapshot.yaml
diff --git a/deployment/deployment/old/volumes/volume-snapshots/digital-ocean-volume-snapshots.png b/deployment/old/volumes/volume-snapshots/digital-ocean-volume-snapshots.png
similarity index 100%
rename from deployment/deployment/old/volumes/volume-snapshots/digital-ocean-volume-snapshots.png
rename to deployment/old/volumes/volume-snapshots/digital-ocean-volume-snapshots.png
diff --git a/deployment/deployment/old/volumes/volume-snapshots/neo4j-data-provision-snapshot.yaml b/deployment/old/volumes/volume-snapshots/neo4j-data-provision-snapshot.yaml
similarity index 100%
rename from deployment/deployment/old/volumes/volume-snapshots/neo4j-data-provision-snapshot.yaml
rename to deployment/old/volumes/volume-snapshots/neo4j-data-provision-snapshot.yaml
diff --git a/deployment/deployment/old/volumes/volume-snapshots/neo4j-data-snapshot.yaml  b/deployment/old/volumes/volume-snapshots/neo4j-data-snapshot.yaml 
similarity index 100%
rename from deployment/deployment/old/volumes/volume-snapshots/neo4j-data-snapshot.yaml 
rename to deployment/old/volumes/volume-snapshots/neo4j-data-snapshot.yaml