diff --git a/media.docker-compose.hwaccl.yml b/media-player/docker-compose.hwaccl.yml
similarity index 100%
rename from media.docker-compose.hwaccl.yml
rename to media-player/docker-compose.hwaccl.yml
diff --git a/media.docker-compose.local.yml b/media-player/docker-compose.local.yml
similarity index 100%
rename from media.docker-compose.local.yml
rename to media-player/docker-compose.local.yml
diff --git a/media.docker-compose.macvlan.yml b/media-player/docker-compose.macvlan.yml
similarity index 100%
rename from media.docker-compose.macvlan.yml
rename to media-player/docker-compose.macvlan.yml
diff --git a/media-player/docker-compose.yml b/media-player/docker-compose.yml
new file mode 100644
index 0000000..f21b3f7
--- /dev/null
+++ b/media-player/docker-compose.yml
@@ -0,0 +1,46 @@
+name: Media-Player
+
+services:
+  plex:
+    image: plexinc/pms-docker:plexpass
+    environment:
+      PLEX_UID: ${NASCOMPOSE_UID?}
+      PLEX_GID: ${NASCOMPOSE_GID?}
+    networks:
+      - default
+      - traefik
+    volumes:
+      - plex_transcode:/transcode/
+      - plex_config:/config/
+      - tv:/data/tv/
+      - movies:/data/movies/
+    restart: unless-stopped
+    labels:
+      traefik.enable: true
+      traefik.http.services.plex.loadbalancer.server.port: 32400
+      traefik.http.services.plex.loadbalancer.server.scheme: https
+
+networks:
+  traefik:
+    external: true
+
+volumes:
+  movies:
+    name: movies
+    driver_opts:
+      type: none
+      o: bind
+      device: ${NASCOMPOSE_DATA?}/media/movies/
+  tv:
+    name: tv
+    driver_opts:
+      type: none
+      o: bind
+      device: ${NASCOMPOSE_DATA?}/media/tv/
+
+  plex_transcode:
+  plex_config:
+    driver_opts:
+      type: none
+      o: bind
+      device: ${NASCOMPOSE_SERVICES?}/volumes/plex/config/
diff --git a/docker/volumes/plaxt/keystore/.gitkeep b/media-player/volumes/plex_config/.gitkeep
similarity index 100%
rename from docker/volumes/plaxt/keystore/.gitkeep
rename to media-player/volumes/plex_config/.gitkeep
diff --git a/media.docker-compose.yml b/media.docker-compose.yml
deleted file mode 100644
index cfe3641..0000000
--- a/media.docker-compose.yml
+++ /dev/null
@@ -1,93 +0,0 @@
-name: Collectors
-
-services:
-  plex:
-    image: plexinc/pms-docker:plexpass
-    environment:
-      PLEX_UID: ${NASCOMPOSE_UID?}
-      PLEX_GID: ${NASCOMPOSE_GID?}
-    networks:
-      - default
-      - traefik
-    volumes:
-      - plex_transcode:/transcode/
-      - plex_config:/config/
-      - tv:/data/tv/
-      - movies:/data/movies/
-    restart: unless-stopped
-    labels:
-      traefik.enable: true
-      traefik.http.services.plex.loadbalancer.server.port: 32400
-      traefik.http.services.plex.loadbalancer.server.scheme: https
-
-  plaxt:
-    image: xanderstrike/goplaxt
-    profiles: [plaxt]
-    user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
-    environment:
-      TRAKT_ID_FILE: /run/secrets/trakt_id
-      TRAKT_SECRET_FILE: /run/secrets/trakt_secret
-    networks:
-      - default
-      - traefik
-    volumes:
-      - plaxt_keystore:/app/keystore/
-    secrets:
-      - trakt_id
-      - trakt_secret
-    restart: unless-stopped
-    labels:
-      traefik.enable: true
-      traefik.http.routers.plaxt.middlewares: authelia@file
-
-  # TODO:
-  # Calibre-web
-  # Komga/Kavita
-
-networks:
-  traefik:
-    external: true
-
-volumes:
-  books:
-    name: books
-    driver_opts:
-      type: none
-      o: bind
-      device: ${NASCOMPOSE_DATA?}/media/books/
-  comics:
-    name: comics
-    driver_opts:
-      type: none
-      o: bind
-      device: ${NASCOMPOSE_DATA?}/media/comics/
-  movies:
-    name: movies
-    driver_opts:
-      type: none
-      o: bind
-      device: ${NASCOMPOSE_DATA?}/media/movies/
-  tv:
-    name: tv
-    driver_opts:
-      type: none
-      o: bind
-      device: ${NASCOMPOSE_DATA?}/media/tv/
-
-  plex_transcode:
-  plex_config:
-    driver_opts:
-      type: none
-      o: bind
-      device: ${NASCOMPOSE_SERVICES?}/volumes/plex/config/
-  plaxt_keystore:
-    driver_opts:
-      type: none
-      o: bind
-      device: ${NASCOMPOSE_SERVICES?}/volumes/plaxt/keystore/
-
-secrets:
-  trakt_id:
-    file: ${NASCOMPOSE_SERVICES?}/secrets/plaxt/trakt_id
-  trakt_secret:
-    file: ${NASCOMPOSE_SERVICES?}/secrets/plaxt/trakt_secret
diff --git a/scrobbler/docker-compose.yml b/scrobbler/docker-compose.yml
new file mode 100644
index 0000000..ef13b42
--- /dev/null
+++ b/scrobbler/docker-compose.yml
@@ -0,0 +1,41 @@
+name: Scrobbler
+
+services:
+  plaxt:
+    image: xanderstrike/goplaxt
+    profiles: [plaxt]
+    user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
+    environment:
+      TRAKT_ID_FILE: /run/secrets/trakt_id
+      TRAKT_SECRET_FILE: /run/secrets/trakt_secret
+    networks:
+      - traefik
+      - media-player
+    volumes:
+      - plaxt_keystore:/app/keystore/
+    secrets:
+      - trakt_id
+      - trakt_secret
+    restart: unless-stopped
+    labels:
+      traefik.enable: true
+      traefik.http.routers.plaxt.middlewares: authelia@file
+
+networks:
+  traefik:
+    external: true
+  media-player:
+    external: true
+
+volumes:
+  plaxt_keystore:
+    driver_opts:
+      type: none
+      o: bind
+      device: ${NASCOMPOSE_SERVICES?}/scrobbler/volumes/plaxt_keystore/
+
+secrets:
+  trakt_id:
+    file: ${NASCOMPOSE_SERVICES?}/scrobbler/secrets/trakt_id
+  trakt_secret:
+    file: ${NASCOMPOSE_SERVICES?}/scrobbler/secrets/trakt_secret
diff --git a/docker/volumes/plex/config/.gitkeep b/scrobbler/secrets/.gitkeep
similarity index 100%
rename from docker/volumes/plex/config/.gitkeep
rename to scrobbler/secrets/.gitkeep
diff --git a/scrobbler/volumes/plaxt_keystore/.gitkeep b/scrobbler/volumes/plaxt_keystore/.gitkeep
new file mode 100644
index 0000000..e69de29