diff --git a/services/.gitignore b/services/.gitignore
new file mode 100644
index 0000000..4fa5bbb
--- /dev/null
+++ b/services/.gitignore
@@ -0,0 +1,4 @@
+*/secrets/*
+!*/secrets/.gitkeep
+*/volumes/*/*
+!*/volumes/*/.gitkeep
diff --git a/authentication/configs/access.yml b/services/authentication/configs/access.yml
similarity index 100%
rename from authentication/configs/access.yml
rename to services/authentication/configs/access.yml
diff --git a/authentication/configs/authentication.yml b/services/authentication/configs/authentication.yml
similarity index 100%
rename from authentication/configs/authentication.yml
rename to services/authentication/configs/authentication.yml
diff --git a/authentication/configs/configuration.yml b/services/authentication/configs/configuration.yml
similarity index 100%
rename from authentication/configs/configuration.yml
rename to services/authentication/configs/configuration.yml
diff --git a/authentication/docker-compose.yml b/services/authentication/docker-compose.yml
similarity index 100%
rename from authentication/docker-compose.yml
rename to services/authentication/docker-compose.yml
diff --git a/authentication/secrets/.gitkeep b/services/authentication/secrets/.gitkeep
similarity index 100%
rename from authentication/secrets/.gitkeep
rename to services/authentication/secrets/.gitkeep
diff --git a/bootstrap/README.md b/services/bootstrap/README.md
similarity index 100%
rename from bootstrap/README.md
rename to services/bootstrap/README.md
diff --git a/bootstrap/docker-compose.local.yml b/services/bootstrap/docker-compose.local.yml
similarity index 100%
rename from bootstrap/docker-compose.local.yml
rename to services/bootstrap/docker-compose.local.yml
diff --git a/bootstrap/docker-compose.macvlan.yml b/services/bootstrap/docker-compose.macvlan.yml
similarity index 100%
rename from bootstrap/docker-compose.macvlan.yml
rename to services/bootstrap/docker-compose.macvlan.yml
diff --git a/bootstrap/docker-compose.yml b/services/bootstrap/docker-compose.yml
similarity index 100%
rename from bootstrap/docker-compose.yml
rename to services/bootstrap/docker-compose.yml
diff --git a/bootstrap/secrets/.gitkeep b/services/bootstrap/secrets/.gitkeep
similarity index 100%
rename from bootstrap/secrets/.gitkeep
rename to services/bootstrap/secrets/.gitkeep
diff --git a/bootstrap/volumes/portainer_data/.gitkeep b/services/bootstrap/volumes/portainer_data/.gitkeep
similarity index 100%
rename from bootstrap/volumes/portainer_data/.gitkeep
rename to services/bootstrap/volumes/portainer_data/.gitkeep
diff --git a/docker-monitoring/docker-compose.yml b/services/docker-monitoring/docker-compose.yml
similarity index 100%
rename from docker-monitoring/docker-compose.yml
rename to services/docker-monitoring/docker-compose.yml
diff --git a/docker-monitoring/secrets/.gitkeep b/services/docker-monitoring/secrets/.gitkeep
similarity index 100%
rename from docker-monitoring/secrets/.gitkeep
rename to services/docker-monitoring/secrets/.gitkeep
diff --git a/dynamic-dns/docker-compose.yml b/services/dynamic-dns/docker-compose.yml
similarity index 100%
rename from dynamic-dns/docker-compose.yml
rename to services/dynamic-dns/docker-compose.yml
diff --git a/dynamic-dns/secrets/.gitkeep b/services/dynamic-dns/secrets/.gitkeep
similarity index 100%
rename from dynamic-dns/secrets/.gitkeep
rename to services/dynamic-dns/secrets/.gitkeep
diff --git a/indexer/docker-compose.yml b/services/indexer/docker-compose.yml
similarity index 100%
rename from indexer/docker-compose.yml
rename to services/indexer/docker-compose.yml
diff --git a/indexer/volumes/prowlarr_config/.gitkeep b/services/indexer/volumes/prowlarr_config/.gitkeep
similarity index 100%
rename from indexer/volumes/prowlarr_config/.gitkeep
rename to services/indexer/volumes/prowlarr_config/.gitkeep
diff --git a/media-player/docker-compose.hwaccl.yml b/services/media-player/docker-compose.hwaccl.yml
similarity index 100%
rename from media-player/docker-compose.hwaccl.yml
rename to services/media-player/docker-compose.hwaccl.yml
diff --git a/media-player/docker-compose.local.yml b/services/media-player/docker-compose.local.yml
similarity index 100%
rename from media-player/docker-compose.local.yml
rename to services/media-player/docker-compose.local.yml
diff --git a/media-player/docker-compose.macvlan.yml b/services/media-player/docker-compose.macvlan.yml
similarity index 100%
rename from media-player/docker-compose.macvlan.yml
rename to services/media-player/docker-compose.macvlan.yml
diff --git a/media-player/docker-compose.yml b/services/media-player/docker-compose.yml
similarity index 100%
rename from media-player/docker-compose.yml
rename to services/media-player/docker-compose.yml
diff --git a/media-player/volumes/plex_config/.gitkeep b/services/media-player/volumes/plex_config/.gitkeep
similarity index 100%
rename from media-player/volumes/plex_config/.gitkeep
rename to services/media-player/volumes/plex_config/.gitkeep
diff --git a/network-monitoring/docker-compose.yml b/services/network-monitoring/docker-compose.yml
similarity index 100%
rename from network-monitoring/docker-compose.yml
rename to services/network-monitoring/docker-compose.yml
diff --git a/network-monitoring/volumes/smokeping_config/.gitkeep b/services/network-monitoring/volumes/smokeping_config/.gitkeep
similarity index 100%
rename from network-monitoring/volumes/smokeping_config/.gitkeep
rename to services/network-monitoring/volumes/smokeping_config/.gitkeep
diff --git a/network-monitoring/volumes/smokeping_data/.gitkeep b/services/network-monitoring/volumes/smokeping_data/.gitkeep
similarity index 100%
rename from network-monitoring/volumes/smokeping_data/.gitkeep
rename to services/network-monitoring/volumes/smokeping_data/.gitkeep
diff --git a/portal/docker-compose.yml b/services/portal/docker-compose.yml
similarity index 100%
rename from portal/docker-compose.yml
rename to services/portal/docker-compose.yml
diff --git a/portal/volumes/heimdall_config/.gitkeep b/services/portal/volumes/heimdall_config/.gitkeep
similarity index 100%
rename from portal/volumes/heimdall_config/.gitkeep
rename to services/portal/volumes/heimdall_config/.gitkeep
diff --git a/reverse-proxy/configs/dynamic/authelia.yml b/services/reverse-proxy/configs/dynamic/authelia.yml
similarity index 100%
rename from reverse-proxy/configs/dynamic/authelia.yml
rename to services/reverse-proxy/configs/dynamic/authelia.yml
diff --git a/reverse-proxy/configs/dynamic/hsts.yml b/services/reverse-proxy/configs/dynamic/hsts.yml
similarity index 100%
rename from reverse-proxy/configs/dynamic/hsts.yml
rename to services/reverse-proxy/configs/dynamic/hsts.yml
diff --git a/reverse-proxy/configs/dynamic/portainer.yml b/services/reverse-proxy/configs/dynamic/portainer.yml
similarity index 100%
rename from reverse-proxy/configs/dynamic/portainer.yml
rename to services/reverse-proxy/configs/dynamic/portainer.yml
diff --git a/reverse-proxy/configs/dynamic/synology.yml b/services/reverse-proxy/configs/dynamic/synology.yml
similarity index 100%
rename from reverse-proxy/configs/dynamic/synology.yml
rename to services/reverse-proxy/configs/dynamic/synology.yml
diff --git a/reverse-proxy/configs/dynamic/tls.yml b/services/reverse-proxy/configs/dynamic/tls.yml
similarity index 100%
rename from reverse-proxy/configs/dynamic/tls.yml
rename to services/reverse-proxy/configs/dynamic/tls.yml
diff --git a/reverse-proxy/configs/dynamic/traefik.yml b/services/reverse-proxy/configs/dynamic/traefik.yml
similarity index 100%
rename from reverse-proxy/configs/dynamic/traefik.yml
rename to services/reverse-proxy/configs/dynamic/traefik.yml
diff --git a/reverse-proxy/configs/dynamic/transmission-api.yml b/services/reverse-proxy/configs/dynamic/transmission-api.yml
similarity index 100%
rename from reverse-proxy/configs/dynamic/transmission-api.yml
rename to services/reverse-proxy/configs/dynamic/transmission-api.yml
diff --git a/reverse-proxy/configs/traefik.yml b/services/reverse-proxy/configs/traefik.yml
similarity index 100%
rename from reverse-proxy/configs/traefik.yml
rename to services/reverse-proxy/configs/traefik.yml
diff --git a/reverse-proxy/docker-compose.local.yml b/services/reverse-proxy/docker-compose.local.yml
similarity index 100%
rename from reverse-proxy/docker-compose.local.yml
rename to services/reverse-proxy/docker-compose.local.yml
diff --git a/reverse-proxy/docker-compose.macvlan.yml b/services/reverse-proxy/docker-compose.macvlan.yml
similarity index 100%
rename from reverse-proxy/docker-compose.macvlan.yml
rename to services/reverse-proxy/docker-compose.macvlan.yml
diff --git a/reverse-proxy/docker-compose.yml b/services/reverse-proxy/docker-compose.yml
similarity index 100%
rename from reverse-proxy/docker-compose.yml
rename to services/reverse-proxy/docker-compose.yml
diff --git a/reverse-proxy/secrets/.gitkeep b/services/reverse-proxy/secrets/.gitkeep
similarity index 100%
rename from reverse-proxy/secrets/.gitkeep
rename to services/reverse-proxy/secrets/.gitkeep
diff --git a/scrobbler/docker-compose.yml b/services/scrobbler/docker-compose.yml
similarity index 100%
rename from scrobbler/docker-compose.yml
rename to services/scrobbler/docker-compose.yml
diff --git a/scrobbler/secrets/.gitkeep b/services/scrobbler/secrets/.gitkeep
similarity index 100%
rename from scrobbler/secrets/.gitkeep
rename to services/scrobbler/secrets/.gitkeep
diff --git a/scrobbler/volumes/plaxt_keystore/.gitkeep b/services/scrobbler/volumes/plaxt_keystore/.gitkeep
similarity index 100%
rename from scrobbler/volumes/plaxt_keystore/.gitkeep
rename to services/scrobbler/volumes/plaxt_keystore/.gitkeep
diff --git a/torrents/docker-compose.yml b/services/torrents/docker-compose.yml
similarity index 100%
rename from torrents/docker-compose.yml
rename to services/torrents/docker-compose.yml
diff --git a/torrents/secrets/.gitkeep b/services/torrents/secrets/.gitkeep
similarity index 100%
rename from torrents/secrets/.gitkeep
rename to services/torrents/secrets/.gitkeep
diff --git a/torrents/volumes/transmission_config/.gitkeep b/services/torrents/volumes/transmission_config/.gitkeep
similarity index 100%
rename from torrents/volumes/transmission_config/.gitkeep
rename to services/torrents/volumes/transmission_config/.gitkeep
diff --git a/usenet/docker-compose.yml b/services/usenet/docker-compose.yml
similarity index 100%
rename from usenet/docker-compose.yml
rename to services/usenet/docker-compose.yml
diff --git a/usenet/volumes/sabnzbd_config/.gitkeep b/services/usenet/volumes/sabnzbd_config/.gitkeep
similarity index 100%
rename from usenet/volumes/sabnzbd_config/.gitkeep
rename to services/usenet/volumes/sabnzbd_config/.gitkeep
diff --git a/youtube-dl/docker-compose.yml b/services/youtube-dl/docker-compose.yml
similarity index 100%
rename from youtube-dl/docker-compose.yml
rename to services/youtube-dl/docker-compose.yml