diff --git a/containers/docker/audiobookshelf/compose.yaml b/docker/audiobookshelf/compose.yaml
similarity index 100%
rename from containers/docker/audiobookshelf/compose.yaml
rename to docker/audiobookshelf/compose.yaml
diff --git a/containers/docker/forgejo/compose.yaml b/docker/forgejo/compose.yaml
similarity index 100%
rename from containers/docker/forgejo/compose.yaml
rename to docker/forgejo/compose.yaml
diff --git a/containers/docker/httpd/compose.yaml b/docker/httpd/compose.yaml
similarity index 100%
rename from containers/docker/httpd/compose.yaml
rename to docker/httpd/compose.yaml
diff --git a/containers/docker/httpd/www/index.html b/docker/httpd/www/index.html
similarity index 100%
rename from containers/docker/httpd/www/index.html
rename to docker/httpd/www/index.html
diff --git a/containers/docker/immich/compose.yaml b/docker/immich/compose.yaml
similarity index 100%
rename from containers/docker/immich/compose.yaml
rename to docker/immich/compose.yaml
diff --git a/containers/docker/immich/hwaccel.transcoding.yml b/docker/immich/hwaccel.transcoding.yml
similarity index 100%
rename from containers/docker/immich/hwaccel.transcoding.yml
rename to docker/immich/hwaccel.transcoding.yml
diff --git a/containers/docker/jellyfin/compose.yaml b/docker/jellyfin/compose.yaml
similarity index 100%
rename from containers/docker/jellyfin/compose.yaml
rename to docker/jellyfin/compose.yaml
diff --git a/containers/docker/multitenant/.gitignore b/docker/multitenant/.gitignore
similarity index 100%
rename from containers/docker/multitenant/.gitignore
rename to docker/multitenant/.gitignore
diff --git a/containers/docker/multitenant/README.md b/docker/multitenant/README.md
similarity index 100%
rename from containers/docker/multitenant/README.md
rename to docker/multitenant/README.md
diff --git a/containers/docker/multitenant/infra/docker-compose.yml b/docker/multitenant/infra/docker-compose.yml
similarity index 100%
rename from containers/docker/multitenant/infra/docker-compose.yml
rename to docker/multitenant/infra/docker-compose.yml
diff --git a/containers/docker/multitenant/jellyfin/run_with_podman.sh b/docker/multitenant/jellyfin/run_with_podman.sh
similarity index 100%
rename from containers/docker/multitenant/jellyfin/run_with_podman.sh
rename to docker/multitenant/jellyfin/run_with_podman.sh
diff --git a/containers/docker/multitenant/lemmy/customPostgresql.conf b/docker/multitenant/lemmy/customPostgresql.conf
similarity index 100%
rename from containers/docker/multitenant/lemmy/customPostgresql.conf
rename to docker/multitenant/lemmy/customPostgresql.conf
diff --git a/containers/docker/multitenant/lemmy/docker-compose.yml b/docker/multitenant/lemmy/docker-compose.yml
similarity index 100%
rename from containers/docker/multitenant/lemmy/docker-compose.yml
rename to docker/multitenant/lemmy/docker-compose.yml
diff --git a/containers/docker/multitenant/lemmy/lemmy.hjson b/docker/multitenant/lemmy/lemmy.hjson
similarity index 100%
rename from containers/docker/multitenant/lemmy/lemmy.hjson
rename to docker/multitenant/lemmy/lemmy.hjson
diff --git a/containers/docker/multitenant/lemmy/nginx_internal.conf b/docker/multitenant/lemmy/nginx_internal.conf
similarity index 100%
rename from containers/docker/multitenant/lemmy/nginx_internal.conf
rename to docker/multitenant/lemmy/nginx_internal.conf
diff --git a/containers/docker/multitenant/mastodon/.env.production b/docker/multitenant/mastodon/.env.production
similarity index 100%
rename from containers/docker/multitenant/mastodon/.env.production
rename to docker/multitenant/mastodon/.env.production
diff --git a/containers/docker/multitenant/mastodon/docker-compose.yml b/docker/multitenant/mastodon/docker-compose.yml
similarity index 100%
rename from containers/docker/multitenant/mastodon/docker-compose.yml
rename to docker/multitenant/mastodon/docker-compose.yml
diff --git a/containers/docker/multitenant/moni0_proxy_host.png b/docker/multitenant/moni0_proxy_host.png
similarity index 100%
rename from containers/docker/multitenant/moni0_proxy_host.png
rename to docker/multitenant/moni0_proxy_host.png
diff --git a/containers/docker/multitenant/moni1_proxy_host.png b/docker/multitenant/moni1_proxy_host.png
similarity index 100%
rename from containers/docker/multitenant/moni1_proxy_host.png
rename to docker/multitenant/moni1_proxy_host.png
diff --git a/containers/docker/multitenant/nextcloud/REAME.md b/docker/multitenant/nextcloud/REAME.md
similarity index 100%
rename from containers/docker/multitenant/nextcloud/REAME.md
rename to docker/multitenant/nextcloud/REAME.md
diff --git a/containers/docker/multitenant/nextcloud/docker-compose.yml b/docker/multitenant/nextcloud/docker-compose.yml
similarity index 100%
rename from containers/docker/multitenant/nextcloud/docker-compose.yml
rename to docker/multitenant/nextcloud/docker-compose.yml
diff --git a/containers/docker/multitenant/sites/moni8080/docker-compose.yml b/docker/multitenant/sites/moni8080/docker-compose.yml
similarity index 100%
rename from containers/docker/multitenant/sites/moni8080/docker-compose.yml
rename to docker/multitenant/sites/moni8080/docker-compose.yml
diff --git a/containers/docker/multitenant/sites/moni8080/index.html b/docker/multitenant/sites/moni8080/index.html
similarity index 100%
rename from containers/docker/multitenant/sites/moni8080/index.html
rename to docker/multitenant/sites/moni8080/index.html
diff --git a/containers/docker/multitenant/sites/moni8081/docker-compose.yml b/docker/multitenant/sites/moni8081/docker-compose.yml
similarity index 100%
rename from containers/docker/multitenant/sites/moni8081/docker-compose.yml
rename to docker/multitenant/sites/moni8081/docker-compose.yml
diff --git a/containers/docker/multitenant/sites/moni8081/index.html b/docker/multitenant/sites/moni8081/index.html
similarity index 100%
rename from containers/docker/multitenant/sites/moni8081/index.html
rename to docker/multitenant/sites/moni8081/index.html
diff --git a/containers/docker/multitenant/sites/moni8082/index.html b/docker/multitenant/sites/moni8082/index.html
similarity index 100%
rename from containers/docker/multitenant/sites/moni8082/index.html
rename to docker/multitenant/sites/moni8082/index.html
diff --git a/containers/docker/multitenant/wordpress/Dockerfile b/docker/multitenant/wordpress/Dockerfile
similarity index 100%
rename from containers/docker/multitenant/wordpress/Dockerfile
rename to docker/multitenant/wordpress/Dockerfile
diff --git a/containers/docker/multitenant/wordpress/docker-compose.yml b/docker/multitenant/wordpress/docker-compose.yml
similarity index 100%
rename from containers/docker/multitenant/wordpress/docker-compose.yml
rename to docker/multitenant/wordpress/docker-compose.yml
diff --git a/containers/docker/nextcloud/README.md b/docker/nextcloud/README.md
similarity index 100%
rename from containers/docker/nextcloud/README.md
rename to docker/nextcloud/README.md
diff --git a/containers/docker/nextcloud/compose.yaml b/docker/nextcloud/compose.yaml
similarity index 100%
rename from containers/docker/nextcloud/compose.yaml
rename to docker/nextcloud/compose.yaml
diff --git a/containers/docker/nextcloud/restart.sh b/docker/nextcloud/restart.sh
similarity index 100%
rename from containers/docker/nextcloud/restart.sh
rename to docker/nextcloud/restart.sh
diff --git a/containers/docker/nextcloud/stop.sh b/docker/nextcloud/stop.sh
similarity index 100%
rename from containers/docker/nextcloud/stop.sh
rename to docker/nextcloud/stop.sh
diff --git a/containers/docker/photoprism/README.md b/docker/photoprism/README.md
similarity index 100%
rename from containers/docker/photoprism/README.md
rename to docker/photoprism/README.md
diff --git a/containers/docker/photoprism/docker-compose.yml b/docker/photoprism/docker-compose.yml
similarity index 100%
rename from containers/docker/photoprism/docker-compose.yml
rename to docker/photoprism/docker-compose.yml
diff --git a/containers/docker/pinepods/compose.yaml b/docker/pinepods/compose.yaml
similarity index 100%
rename from containers/docker/pinepods/compose.yaml
rename to docker/pinepods/compose.yaml
diff --git a/containers/docker/qbittorrent/docker-compose.yml b/docker/qbittorrent/docker-compose.yml
similarity index 100%
rename from containers/docker/qbittorrent/docker-compose.yml
rename to docker/qbittorrent/docker-compose.yml
diff --git a/containers/docker/webtop/compose.yaml b/docker/webtop/compose.yaml
similarity index 100%
rename from containers/docker/webtop/compose.yaml
rename to docker/webtop/compose.yaml
diff --git a/containers/docker/windows/compose.yaml b/docker/windows/compose.yaml
similarity index 100%
rename from containers/docker/windows/compose.yaml
rename to docker/windows/compose.yaml
diff --git a/containers/docker/wordpress/docker-compose.yml b/docker/wordpress/docker-compose.yml
similarity index 100%
rename from containers/docker/wordpress/docker-compose.yml
rename to docker/wordpress/docker-compose.yml
diff --git a/containers/Bastille/Bastille.md b/os/FreeBSD/Bastille/Bastille.md
similarity index 100%
rename from containers/Bastille/Bastille.md
rename to os/FreeBSD/Bastille/Bastille.md
diff --git a/containers/Bastille/Caddy.md b/os/FreeBSD/Bastille/Caddy.md
similarity index 100%
rename from containers/Bastille/Caddy.md
rename to os/FreeBSD/Bastille/Caddy.md
diff --git a/containers/Bastille/MariaDB.md b/os/FreeBSD/Bastille/MariaDB.md
similarity index 100%
rename from containers/Bastille/MariaDB.md
rename to os/FreeBSD/Bastille/MariaDB.md
diff --git a/containers/Bastille/Nextcloud/Nextcloud.md b/os/FreeBSD/Bastille/Nextcloud/Nextcloud.md
similarity index 100%
rename from containers/Bastille/Nextcloud/Nextcloud.md
rename to os/FreeBSD/Bastille/Nextcloud/Nextcloud.md
diff --git a/containers/Bastille/Nextcloud/nginx.conf b/os/FreeBSD/Bastille/Nextcloud/nginx.conf
similarity index 100%
rename from containers/Bastille/Nextcloud/nginx.conf
rename to os/FreeBSD/Bastille/Nextcloud/nginx.conf
diff --git a/containers/Bastille/Postgres.md b/os/FreeBSD/Bastille/Postgres.md
similarity index 100%
rename from containers/Bastille/Postgres.md
rename to os/FreeBSD/Bastille/Postgres.md
diff --git a/containers/Bastille/nginx.md b/os/FreeBSD/Bastille/nginx.md
similarity index 100%
rename from containers/Bastille/nginx.md
rename to os/FreeBSD/Bastille/nginx.md