diff --git a/docker-compose.d/Bookstack/bookstack-stack.yml b/docker-compose.d/Documentation/bookstack-stack.yml
similarity index 100%
rename from docker-compose.d/Bookstack/bookstack-stack.yml
rename to docker-compose.d/Documentation/bookstack-stack.yml
diff --git a/docker-compose.d/Gitea/gitea-stack.yml b/docker-compose.d/Documentation/gitea-stack.yml
similarity index 100%
rename from docker-compose.d/Gitea/gitea-stack.yml
rename to docker-compose.d/Documentation/gitea-stack.yml
diff --git a/docker-compose.d/Vaultwarden/vaultwarden-stack.yml b/docker-compose.d/Documentation/vaultwarden-stack.yml
similarity index 100%
rename from docker-compose.d/Vaultwarden/vaultwarden-stack.yml
rename to docker-compose.d/Documentation/vaultwarden-stack.yml
diff --git a/docker-compose.d/Media/jellyfin-stack.yml b/docker-compose.d/Media/jellyfin-stack.yml
new file mode 100644
index 0000000..3d4fd98
--- /dev/null
+++ b/docker-compose.d/Media/jellyfin-stack.yml
@@ -0,0 +1,27 @@
+services:
+  jellyfin:
+    image: lscr.io/linuxserver/jellyfin:latest
+    devices:
+      - /dev/dri:/dev/dri
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=America/Chicago
+    volumes:
+      - jellyfin:/config
+      - /mnt/massdrive/media:/data
+    networks:
+      - caddy
+      - shoko
+
+networks:
+  caddy:
+    name: caddy
+    external: true
+  shoko: 
+    name: shoko
+    external: true
+
+volumes:
+  jellyfin:
+    name: jellyfin
diff --git a/docker-compose.yml b/docker-compose.yml
index 61a40b6..adfc9dd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,10 +6,9 @@ networks:
     name: qbit
   shoko:
     name: shoko
+    external: true
   arr:
     name: arr
-    #bookstack:
-    #name: bookstack
 
 services:
   anki:
@@ -26,46 +25,6 @@ services:
     networks:
       - caddy
 
-      #bookstack:
-      #  image: lscr.io/linuxserver/bookstack
-      #  container_name: bookstack
-      #  environment:
-      #    - PUID=1000
-      #    - PGID=1000
-      #    - TZ=America/Chicago
-      #    - APP_URL=https://bookstack.mintyserver.net
-      #    - DB_HOST=bookstack_db
-      #    - DB_PORT=3306
-      #    - DB_USER=bookstack
-      #    - DB_PASS=${PASS}
-      #    - DB_DATABASE=bookstackapp
-      #  volumes:
-      #    - bookstack:/config
-      #  restart: unless-stopped
-      #  depends_on:
-      #    - bookstack_db
-      #  networks:
-      #    - caddy
-      #    - bookstack
-      #
-      #bookstack_db:
-      #  image: lscr.io/linuxserver/mariadb
-      #  container_name: bookstack_db
-      #  environment:
-      #    - PUID=1000
-      #    - PGID=1000
-      #    - TZ=America/Chicago
-      #    - MYSQL_ROOT_PASSWORD=${PASS}
-      #    - MYSQL_DATABASE=bookstackapp
-      #    - MYSQL_USER=bookstack
-      #    - MYSQL_PASSWORD=${PASS}
-      #  volumes:
-      #    - bookstack_db:/config
-      #  restart: unless-stopped
-      #  networks:
-      #    - bookstack
-
-
   gluetun:
     image: ghcr.io/qdm12/gluetun
     cap_add:
@@ -184,24 +143,6 @@ services:
     networks: 
       - shoko
 
-
-      #vaultwarden:
-      #  image: vaultwarden/server:latest
-      #  container_name: vaultwarden
-      #  restart: unless-stopped
-      #  environment: 
-      #    DOMAIN: "https://vault.mintyserver.net"
-      #    WEBSOCKET_ENABLED: true
-      #    SIGNUPS_ALLOWED: false
-      #    ADMIN_TOKEN: ${PASS} 
-      #  volumes:
-      #    - vaultwarden:/data
-      #  networks: 
-      #    - caddy
-      #  ports:
-      #    - 8089:80
-
-
   monerod:
     image: sethsimmons/simple-monerod:latest
     restart: unless-stopped
@@ -260,17 +201,6 @@ services:
     networks:
       - caddy
 
-      #searxng:
-      #  image: searxng/searxng:latest
-      #  container_name: searxng
-      #  environment: 
-      #    - BASE_URL=https://searxng.mintyserver.net
-      #  volumes:
-      #    - searxng:/etc/searxng
-      #  restart: unless-stopped
-      #  networks: 
-      #    - caddy
-
   puffer:
     image: pufferpanel/pufferpanel:latest
     container_name: puffer
@@ -282,42 +212,6 @@ services:
     networks: 
       - caddy
 
-      #gitea:
-      # image: gitea/gitea:latest
-      # container_name: gitea
-      # environment:
-      #   - GITEA__service__DISABLE_REGISTRATION=true
-      #   - USER_UID=1000
-      #   - USER_GID=1000
-      # restart: always
-      # volumes:
-      #   - gitea:/data
-      #   - /etc/timezone:/etc/timezone:ro
-      #   - /etc/localtime:/etc/localtime:ro
-      # ports:
-      #   - "3030:3000"
-      # networks: 
-      #   - caddy
- 
-  jellyfin:
-    image: lscr.io/linuxserver/jellyfin:latest
-    container_name: jellyfin
-    devices: 
-      - /dev/dri:/dev/dri
-    environment: 
-      - PUID=1000
-      - PGID=1000
-      - TZ=America/Chicago
-    volumes:
-      - jellyfin:/config
-      - /mnt/massdrive/media:/data
-    ports:
-      - 8096:8096
-    restart: unless-stopped
-    networks:
-      - caddy
-      - shoko
-
   nextcloud:
     container_name: nextcloud-aio-mastercontainer
     init: true
@@ -352,9 +246,6 @@ volumes:
     name: caddy_srv
   caddy_set:
     name: caddy_set
-    #vaultwarden:
-    #name: vaultwarden
-    #external: true
   qbittorrent:
     name: qbittorrent
     external: true
@@ -365,13 +256,6 @@ volumes:
     name: ariang
   puffer-config:
     name: puffer-config
-    #searxng:
-    #name: searxng
-    #external: true
-  jellyfin: 
-    name: jellyfin
-    #gitea:
-    #name: gitea
   technitium:
     name: technitium
     external: true
@@ -388,7 +272,3 @@ volumes:
     name: p2pool-data
   gluetun:
     name: gluetun
-    # bookstack:
-    #   name: bookstack
-    # bookstack_db:
-    #   name: bookstack_db