diff --git a/naspi/all-start.sh b/all-start.sh
similarity index 100%
rename from naspi/all-start.sh
rename to all-start.sh
diff --git a/naspi/all-stop.sh b/all-stop.sh
similarity index 100%
rename from naspi/all-stop.sh
rename to all-stop.sh
diff --git a/thinkcentre/dragonfly/docker-compose.yml b/dragonfly/docker-compose.yml
similarity index 100%
rename from thinkcentre/dragonfly/docker-compose.yml
rename to dragonfly/docker-compose.yml
diff --git a/naspi/homeassistant/docker-compose.yml b/homeassistant/docker-compose.yml
similarity index 100%
rename from naspi/homeassistant/docker-compose.yml
rename to homeassistant/docker-compose.yml
diff --git a/naspi/homepage/docker-compose.yml b/homepage/docker-compose.yml
similarity index 100%
rename from naspi/homepage/docker-compose.yml
rename to homepage/docker-compose.yml
diff --git a/thinkcentre/jellyfin/docker-compose.yml b/jellyfin/docker-compose.yml
similarity index 100%
rename from thinkcentre/jellyfin/docker-compose.yml
rename to jellyfin/docker-compose.yml
diff --git a/thinkcentre/mariadb/docker-compose.yml b/mariadb/docker-compose.yml
similarity index 100%
rename from thinkcentre/mariadb/docker-compose.yml
rename to mariadb/docker-compose.yml
diff --git a/thinkcentre/minecraft/docker-compose.yml b/minecraft/docker-compose.yml
similarity index 100%
rename from thinkcentre/minecraft/docker-compose.yml
rename to minecraft/docker-compose.yml
diff --git a/thinkcentre/nextcloud/NOTES.md b/nextcloud/NOTES.md
similarity index 100%
rename from thinkcentre/nextcloud/NOTES.md
rename to nextcloud/NOTES.md
diff --git a/thinkcentre/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
similarity index 100%
rename from thinkcentre/nextcloud/docker-compose.yml
rename to nextcloud/docker-compose.yml
diff --git a/naspi/nginx-proxy/docker-compose.yml b/nginx-proxy/docker-compose.yml
similarity index 100%
rename from naspi/nginx-proxy/docker-compose.yml
rename to nginx-proxy/docker-compose.yml
diff --git a/naspi/owncast/docker-compose.yml b/owncast/docker-compose.yml
similarity index 100%
rename from naspi/owncast/docker-compose.yml
rename to owncast/docker-compose.yml
diff --git a/thinkcentre/paperless-ngx/docker-compose.yml b/paperless-ngx/docker-compose.yml
similarity index 100%
rename from thinkcentre/paperless-ngx/docker-compose.yml
rename to paperless-ngx/docker-compose.yml
diff --git a/naspi/pihole/docker-compose.yml b/pihole/docker-compose.yml
similarity index 100%
rename from naspi/pihole/docker-compose.yml
rename to pihole/docker-compose.yml
diff --git a/naspi/pingvin-share/docker-compose.yml b/pingvin-share/docker-compose.yml
similarity index 100%
rename from naspi/pingvin-share/docker-compose.yml
rename to pingvin-share/docker-compose.yml
diff --git a/naspi/redis/docker-compose.yml b/redis/docker-compose.yml
similarity index 100%
rename from naspi/redis/docker-compose.yml
rename to redis/docker-compose.yml
diff --git a/thinkcentre/startall.sh b/startall.sh
similarity index 100%
rename from thinkcentre/startall.sh
rename to startall.sh
diff --git a/thinkcentre/stash/docker-compose.yml b/stash/docker-compose.yml
similarity index 100%
rename from thinkcentre/stash/docker-compose.yml
rename to stash/docker-compose.yml
diff --git a/naspi/static-server/docker-compose.yml b/static-server-pi/docker-compose.yml
similarity index 100%
rename from naspi/static-server/docker-compose.yml
rename to static-server-pi/docker-compose.yml
diff --git a/thinkcentre/static-server/default.conf b/static-server/default.conf
similarity index 100%
rename from thinkcentre/static-server/default.conf
rename to static-server/default.conf
diff --git a/thinkcentre/static-server/docker-compose.yml b/static-server/docker-compose.yml
similarity index 100%
rename from thinkcentre/static-server/docker-compose.yml
rename to static-server/docker-compose.yml
diff --git a/naspi/syncthing/docker-compose.yml b/syncthing/docker-compose.yml
similarity index 100%
rename from naspi/syncthing/docker-compose.yml
rename to syncthing/docker-compose.yml
diff --git a/thinkcentre/update.sh b/thinkcentre/update.sh
deleted file mode 100755
index a231576..0000000
--- a/thinkcentre/update.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-docker pull containrrr/watchtower
-docker run -v /var/run/docker.sock:/var/run/docker.sock containrrr/watchtower --run-once
diff --git a/naspi/transmission/docker-compose.yml b/transmission/docker-compose.yml
similarity index 100%
rename from naspi/transmission/docker-compose.yml
rename to transmission/docker-compose.yml
diff --git a/naspi/update.sh b/update.sh
similarity index 100%
rename from naspi/update.sh
rename to update.sh
diff --git a/naspi/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml
similarity index 100%
rename from naspi/vaultwarden/docker-compose.yml
rename to vaultwarden/docker-compose.yml