diff --git a/compose.yaml b/compose.yaml
index fbbbd7d..1ff2c47 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -2,139 +2,87 @@ services:
   jellyfin:
     image: jellyfin/jellyfin
     container_name: jellyfin
-#    user: uid:gid
-    network_mode: 'host'
+    #    user: uid:gid
+    network_mode: host
     volumes:
-      - /home/nick/docker/jellyfin:/config
-      - /home/nick/docker/jellyfin/cache:/cache
-      - /mnt:/media
-    restart: 'unless-stopped'
+      - /srv/arr_stack/jellyfin:/config
+      - /srv/arr_stack/jellyfin/cache:/cache
+      - /mnt/media:/media
+    restart: unless-stopped
     # Optional - alternative address used for autodiscovery
     environment:
       - JELLYFIN_PublishedServerUrl=https://tv.tff.digital.com
     # Optional - may be necessary for docker healthcheck to pass if running in host network mode
-#    extra_hosts:
-#      - "host.docker.internal:host-gateway"
-
----
-version: "3.9"
-services:
+    #    extra_hosts:
+    #      - "host.docker.internal:host-gateway"
   sonarr:
     container_name: sonarr
     image: ghcr.io/hotio/sonarr:v4
     ports:
       - 8989:8989
     environment:
-#      - PUID=1000
-#      - PGID=1000
-#      - UMASK=002
+      #      - PUID=1000
+      #      - PGID=1000
+      #      - UMASK=002
       - TZ=US/Central
     volumes:
-      - /home/nick/docker/sonarr:/config
-      - /mnt:/mnt
+      - /srv/arr_stack/sonarr:/config
+      - /mnt/media:/mnt
     restart: unless-stopped
-    
   radarr:
     container_name: radarr
     image: ghcr.io/hotio/radarr
     ports:
       - 7878:7878
     environment:
-#      - PUID=1000
-#      - PGID=1000
-#      - UMASK=002
+      #      - PUID=1000
+      #      - PGID=1000
+      #      - UMASK=002
       - TZ=US/Central
     volumes:
-      - /home/nick/docker/radarr:/config
-      - /mnt:/mnt
+      - /srv/arr_stack/radarr:/config
+      - /mnt/media:/mnt
     restart: unless-stopped
-
   prowlarr:
     container_name: prowlarr
     image: ghcr.io/hotio/prowlarr
     ports:
       - 9696:9696
     environment:
-#      - PUID=1000
-#      - PGID=1000
-#      - UMASK=002
+      #      - PUID=1000
+      #      - PGID=1000
+      #      - UMASK=002
       - TZ=US/Central
     volumes:
-      - /home/nick/docker/prowlarr:/config
-
-
-## This Bazarr is only used w/ Whisparr
+      - /srv/arr_stack/prowlarr:/config
+  ## This Bazarr is only used w/ Whisparr
   bazarr:
     container_name: bazarr
     image: ghcr.io/hotio/bazarr
     ports:
       - 6767:6767
     environment:
-#     - PUID=1000
-#     - PGID=1000
-#      - UMASK=002
+      #     - PUID=1000
+      #     - PGID=1000
+      #      - UMASK=002
       - TZ=US/Central
     volumes:
-      - /home/nick/docker/bazarr:/config
-      - /mnt:/mnt
- 
- ## Web Based Providers
+      - /srv/arr_stack/bazarr:/config
+      - /mnt/media:/mnt
+  ## Web Based Providers
   bazarr2:
     container_name: bazarr2
     image: ghcr.io/hotio/bazarr
     ports:
       - 6868:6767
     environment:
-#     - PUID=1000
-#     - PGID=1000
-#      - UMASK=002
+      #     - PUID=1000
+      #     - PGID=1000
+      #      - UMASK=002
       - TZ=US/Central
     volumes:
-      - /home/nick/docker/bazarr2:/config
-      - /mnt:/mnt
-
-
-
-## Not currently using, Single commented lines were in use, doubles were not in use 
-#  tdarr:
-#    container_name: tdarr
-#    image: ghcr.io/haveagitgat/tdarr:latest
-#    restart: unless-stopped
-#    network_mode: bridge
-#    ports:
-#      - 8265:8265 # webUI port
-#      - 8266:8266 # server port
-#      - 8267:8267 # Internal node port
-#    environment:
-#      - TZ=US/Central
-##      - PUID=${PUID}
-##      - PGID=${PGID}
-##      - UMASK_SET=002
-#      - serverIP=0.0.0.0
-#      - serverPort=8266
-#      - webUIPort=8265
-#      - internalNode=true
-#      - inContainer=true
-#      - nodeName=TdarrNode1U
-#    volumes:
-#
-##     - /home/nick/docker/tdarr/server:/app/server
-##      - /home/nick/docker/tdarr/configs:/app/configs
-##      - /home/nick/docker/tdarr/logs:/app/logs
-#      - /home/nick/docker/tdarr/server:/app/server
-#      - /home/nick/docker/tdarr/configs:/app/configs
-#      - /home/nick/docker/tdarr/logs:/app/logs
-#      - /mnt:/media
-#      - /home/nick/docker/tdarr/transcode_cache:/temp
-##    labels:
-##      - homepage.group=Media
-##      - homepage.name=tdarr
-##      - homepage.icon=tdarr.png
-##      - homepage.description=Check and Transcode
-##      - homepage.widget.type=tdarr
-##      - homepage.widget.url=http://192.168.1.195:8265
-##      - homepage.widget.fields=["queue", "processed", "errored", "saved"].
-
+      - /srv/arr_stack/bazarr2:/config
+      - /mnt/media:/media
   overseerr:
     image: sctx/overseerr:latest
     container_name: overseerr
@@ -143,54 +91,58 @@ services:
     ports:
       - 5055:5055
     volumes:
-      - /home/nick/docker/overseerr/:/app/config
+      - /srv/arr_stack/overseerr/:/app/config
     restart: unless-stopped
-
-
   tautulli:
     image: ghcr.io/tautulli/tautulli
     container_name: tautulli
     restart: unless-stopped
     volumes:
-      - /home/nick/docker/tautulli/data:/config
+      - /srv/arr_stack/tautulli/data:/config
     environment:
       - TZ=US/Central
     ports:
       - 8181:8181
-
-  whisperasr:
-    image: onerahmet/openai-whisper-asr-webservice:latest
-    container_name: whisper
-    restart: unless-stopped
-    environment:
-      - ASR_MODEL=large
-    ports:
-      - 9010:9000
-
-  recyclarr:
-    image: ghcr.io/recyclarr/recyclarr:latest
-    container_name: recyclarr
-    volumes:
-      - /home/nick/docker/recyclarr/config:/config
-    environment:
-      - TZ=US/Central
-      - RECYCLARR_CREATE_CONFIG=true
-
-      ---
-version: "3.9"
-services:
-  qbittorrent:
-    image: qbittorrentofficial/qbittorrent-nox
-    container_name: qbittorrent
-    network_mode: "container:gluetun"
-    environment:
-  #    - PUID=${PUID}
-  #    - PGID=${PGID}
-      - QBT_WEBUI_PORT=8080
-      - QBT_EULA=accept
-#    ports:
-#    - 8080:8080
-    volumes:
-      - /home/nick/docker/qbittorrent/config/:/config
-      - /mnt/qbit/:/downloads
-    restart: unless-stopped
\ No newline at end of file
+      #  whisperasr:
+      #    image: onerahmet/openai-whisper-asr-webservice:latest
+      #    container_name: whisper
+      #    restart: unless-stopped
+      #    environment:
+      #      - ASR_MODEL=large
+      #    ports:
+      #      - 9010:9000
+      #  recyclarr:
+      #    image: ghcr.io/recyclarr/recyclarr:latest
+      #    container_name: recyclarr
+      #    volumes:
+      #      - /srv/arr_stack/recyclarr/config:/config
+      #    environment:
+      #      - TZ=US/Central
+      #      - RECYCLARR_CREATE_CONFIG=true
+      #  gluetun:
+      #    image: qmcgaw/gluetun
+      #    cap_add:
+      #      - NET_ADMIN
+      #    environment:
+      #      - VPN_SERVICE_PROVIDER=nordvpn
+      #      - VPN_TYPE=openvpn # or wireguard
+      #      - OPENVPN_USER=abc
+      #      - OPENVPN_PASSWORD=abc
+      #      - SERVER_COUNTRIES=Netherlands
+      #  qbittorrent:
+      #    image: qbittorrentofficial/qbittorrent-nox
+      #    container_name: qbittorrent
+      #    network_mode: container:gluetun
+      #    environment:
+      #    - PUID=${PUID}
+      #    - PGID=${PGID}
+      #      - QBT_WEBUI_PORT=8080
+      #      - QBT_EULA=accept
+      #    ports:
+      #    - 8080:8080
+      #   volumes:
+      #     - /srv/arr_stack/qbittorrent/config/:/config
+      #     - /mnt/media:/media
+      #   restart: unless-stopped
+      #networks: {}
+networks: {}