diff --git a/services/authentication/configs/access.yml b/authentication/configs/access.yml
similarity index 100%
rename from services/authentication/configs/access.yml
rename to authentication/configs/access.yml
diff --git a/services/authentication/configs/authentication.yml b/authentication/configs/authentication.yml
similarity index 100%
rename from services/authentication/configs/authentication.yml
rename to authentication/configs/authentication.yml
diff --git a/services/authentication/configs/configuration.yml b/authentication/configs/configuration.yml
similarity index 100%
rename from services/authentication/configs/configuration.yml
rename to authentication/configs/configuration.yml
diff --git a/services/authentication/docker-compose.yml b/authentication/docker-compose.yml
similarity index 100%
rename from services/authentication/docker-compose.yml
rename to authentication/docker-compose.yml
diff --git a/services/book-collector/docker-compose.yml b/book-collector/docker-compose.yml
similarity index 100%
rename from services/book-collector/docker-compose.yml
rename to book-collector/docker-compose.yml
diff --git a/services/bootstrap/README.md b/bootstrap/README.md
similarity index 100%
rename from services/bootstrap/README.md
rename to bootstrap/README.md
diff --git a/services/bootstrap/docker-compose.macvlan.yml b/bootstrap/docker-compose.macvlan.yml
similarity index 100%
rename from services/bootstrap/docker-compose.macvlan.yml
rename to bootstrap/docker-compose.macvlan.yml
diff --git a/services/bootstrap/docker-compose.yml b/bootstrap/docker-compose.yml
similarity index 100%
rename from services/bootstrap/docker-compose.yml
rename to bootstrap/docker-compose.yml
diff --git a/services/comic-collector/docker-compose.yml b/comic-collector/docker-compose.yml
similarity index 100%
rename from services/comic-collector/docker-compose.yml
rename to comic-collector/docker-compose.yml
diff --git a/services/docker-monitoring/docker-compose.yml b/docker-monitoring/docker-compose.yml
similarity index 100%
rename from services/docker-monitoring/docker-compose.yml
rename to docker-monitoring/docker-compose.yml
diff --git a/docs/utilities.md b/docs/utilities.md
deleted file mode 100644
index 2aa8221..0000000
--- a/docs/utilities.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Bootstrap
-
-### Environment variables
-- `NASCOMPOSE_SERVICES`: Absolute path to the `services` folder
diff --git a/services/dynamic-dns/docker-compose.yml b/dynamic-dns/docker-compose.yml
similarity index 100%
rename from services/dynamic-dns/docker-compose.yml
rename to dynamic-dns/docker-compose.yml
diff --git a/services/ebook-reader/docker-compose.yml b/ebook-reader/docker-compose.yml
similarity index 100%
rename from services/ebook-reader/docker-compose.yml
rename to ebook-reader/docker-compose.yml
diff --git a/services/indexer/docker-compose.yml b/indexer/docker-compose.yml
similarity index 100%
rename from services/indexer/docker-compose.yml
rename to indexer/docker-compose.yml
diff --git a/services/irc/docker-compose.yml b/irc/docker-compose.yml
similarity index 100%
rename from services/irc/docker-compose.yml
rename to irc/docker-compose.yml
diff --git a/services/media-player/docker-compose.hwaccl.yml b/media-player/docker-compose.hwaccl.yml
similarity index 100%
rename from services/media-player/docker-compose.hwaccl.yml
rename to media-player/docker-compose.hwaccl.yml
diff --git a/services/media-player/docker-compose.macvlan.yml b/media-player/docker-compose.macvlan.yml
similarity index 100%
rename from services/media-player/docker-compose.macvlan.yml
rename to media-player/docker-compose.macvlan.yml
diff --git a/services/media-player/docker-compose.yml b/media-player/docker-compose.yml
similarity index 100%
rename from services/media-player/docker-compose.yml
rename to media-player/docker-compose.yml
diff --git a/services/media-requester/docker-compose.yml b/media-requester/docker-compose.yml
similarity index 100%
rename from services/media-requester/docker-compose.yml
rename to media-requester/docker-compose.yml
diff --git a/services/movie-collector/docker-compose.yml b/movie-collector/docker-compose.yml
similarity index 100%
rename from services/movie-collector/docker-compose.yml
rename to movie-collector/docker-compose.yml
diff --git a/services/network-monitoring/docker-compose.yml b/network-monitoring/docker-compose.yml
similarity index 100%
rename from services/network-monitoring/docker-compose.yml
rename to network-monitoring/docker-compose.yml
diff --git a/services/notifiarr/docker-compose.yml b/notifiarr/docker-compose.yml
similarity index 100%
rename from services/notifiarr/docker-compose.yml
rename to notifiarr/docker-compose.yml
diff --git a/services/portal/docker-compose.yml b/portal/docker-compose.yml
similarity index 100%
rename from services/portal/docker-compose.yml
rename to portal/docker-compose.yml
diff --git a/services/reverse-proxy/README.md b/reverse-proxy/README.md
similarity index 100%
rename from services/reverse-proxy/README.md
rename to reverse-proxy/README.md
diff --git a/services/reverse-proxy/configs/dynamic/authelia.yml b/reverse-proxy/configs/dynamic/authelia.yml
similarity index 100%
rename from services/reverse-proxy/configs/dynamic/authelia.yml
rename to reverse-proxy/configs/dynamic/authelia.yml
diff --git a/services/reverse-proxy/configs/dynamic/hsts.yml b/reverse-proxy/configs/dynamic/hsts.yml
similarity index 100%
rename from services/reverse-proxy/configs/dynamic/hsts.yml
rename to reverse-proxy/configs/dynamic/hsts.yml
diff --git a/services/reverse-proxy/configs/dynamic/portainer.yml b/reverse-proxy/configs/dynamic/portainer.yml
similarity index 100%
rename from services/reverse-proxy/configs/dynamic/portainer.yml
rename to reverse-proxy/configs/dynamic/portainer.yml
diff --git a/services/reverse-proxy/configs/dynamic/qbittorrent-api.yml b/reverse-proxy/configs/dynamic/qbittorrent-api.yml
similarity index 100%
rename from services/reverse-proxy/configs/dynamic/qbittorrent-api.yml
rename to reverse-proxy/configs/dynamic/qbittorrent-api.yml
diff --git a/services/reverse-proxy/configs/dynamic/synology.yml b/reverse-proxy/configs/dynamic/synology.yml
similarity index 100%
rename from services/reverse-proxy/configs/dynamic/synology.yml
rename to reverse-proxy/configs/dynamic/synology.yml
diff --git a/services/reverse-proxy/configs/dynamic/traefik.yml b/reverse-proxy/configs/dynamic/traefik.yml
similarity index 100%
rename from services/reverse-proxy/configs/dynamic/traefik.yml
rename to reverse-proxy/configs/dynamic/traefik.yml
diff --git a/services/reverse-proxy/configs/traefik.yml b/reverse-proxy/configs/traefik.yml
similarity index 100%
rename from services/reverse-proxy/configs/traefik.yml
rename to reverse-proxy/configs/traefik.yml
diff --git a/services/reverse-proxy/docker-compose.macvlan.yml b/reverse-proxy/docker-compose.macvlan.yml
similarity index 100%
rename from services/reverse-proxy/docker-compose.macvlan.yml
rename to reverse-proxy/docker-compose.macvlan.yml
diff --git a/services/reverse-proxy/docker-compose.yml b/reverse-proxy/docker-compose.yml
similarity index 100%
rename from services/reverse-proxy/docker-compose.yml
rename to reverse-proxy/docker-compose.yml
diff --git a/services/.gitignore b/services/.gitignore
deleted file mode 100644
index 4fa5bbb..0000000
--- a/services/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*/secrets/*
-!*/secrets/.gitkeep
-*/volumes/*/*
-!*/volumes/*/.gitkeep
diff --git a/services/ssh-protection/docker-compose.yml b/ssh-protection/docker-compose.yml
similarity index 100%
rename from services/ssh-protection/docker-compose.yml
rename to ssh-protection/docker-compose.yml
diff --git a/services/subtitle-collector/docker-compose.yml b/subtitle-collector/docker-compose.yml
similarity index 100%
rename from services/subtitle-collector/docker-compose.yml
rename to subtitle-collector/docker-compose.yml
diff --git a/services/torrents/config/01-natpmp-install b/torrents/config/01-natpmp-install
similarity index 100%
rename from services/torrents/config/01-natpmp-install
rename to torrents/config/01-natpmp-install
diff --git a/services/torrents/config/98-gateway-setup b/torrents/config/98-gateway-setup
similarity index 100%
rename from services/torrents/config/98-gateway-setup
rename to torrents/config/98-gateway-setup
diff --git a/services/torrents/config/99-cron-start b/torrents/config/99-cron-start
similarity index 100%
rename from services/torrents/config/99-cron-start
rename to torrents/config/99-cron-start
diff --git a/services/torrents/config/setPortForward b/torrents/config/setPortForward
similarity index 100%
rename from services/torrents/config/setPortForward
rename to torrents/config/setPortForward
diff --git a/services/torrents/config/updateMaMIP b/torrents/config/updateMaMIP
similarity index 100%
rename from services/torrents/config/updateMaMIP
rename to torrents/config/updateMaMIP
diff --git a/services/torrents/docker-compose.yml b/torrents/docker-compose.yml
similarity index 100%
rename from services/torrents/docker-compose.yml
rename to torrents/docker-compose.yml
diff --git a/services/tv-collector/docker-compose.yml b/tv-collector/docker-compose.yml
similarity index 100%
rename from services/tv-collector/docker-compose.yml
rename to tv-collector/docker-compose.yml
diff --git a/services/usenet/docker-compose.yml b/usenet/docker-compose.yml
similarity index 100%
rename from services/usenet/docker-compose.yml
rename to usenet/docker-compose.yml
diff --git a/services/youtube-dl/config/ytdl_options.json b/youtube-dl/config/ytdl_options.json
similarity index 100%
rename from services/youtube-dl/config/ytdl_options.json
rename to youtube-dl/config/ytdl_options.json
diff --git a/services/youtube-dl/docker-compose.yml b/youtube-dl/docker-compose.yml
similarity index 100%
rename from services/youtube-dl/docker-compose.yml
rename to youtube-dl/docker-compose.yml