diff --git a/modules/services/media/arr.nix b/modules/services/media/arr.nix
index 75bf56e..94e4a8b 100644
--- a/modules/services/media/arr.nix
+++ b/modules/services/media/arr.nix
@@ -3,7 +3,8 @@
 {
   users.groups.media = {};
 
-  # Finding/Requesting downloading
+  #
+  # Downloading movies
   services.radarr = {
     enable = true;
     openFirewall = false;
@@ -11,41 +12,6 @@
     group = "media";
   };
 
-  services.sonarr = {
-    enable = true;
-    openFirewall = false;
-    dataDir = "/var/lib/sonarr";
-    group = "media";
-  };
-
-  services.prowlarr = {
-    enable = true;
-    openFirewall = false;
-  };
-
-  services.bazarr = {
-    enable = true;
-    openFirewall = false;
-    group = "media";
-  };
-
-  # Downloading files
-  services.deluge = {
-    enable = true;
-    web.enable = true;
-    web.openFirewall = false;
-    group = "media";
-  };
-
-
-  # Requesting Frontend
-  services.jellyseerr = {
-    enable = true;
-    port = 5055;
-    openFirewall = false;
-    package = pkgs.jellyseerr;
-  };
-
   services.caddy.virtualHosts."radarr.${config.homelab.domain}" = {
     useACMEHost = config.homelab.domain;
     extraConfig = ''
@@ -53,6 +19,16 @@
       import block_non_private_ips
     '';
   };
+
+  #
+  # Downloading shows
+  services.sonarr = {
+    enable = true;
+    openFirewall = false;
+    dataDir = "/var/lib/sonarr";
+    group = "media";
+  };
+
   services.caddy.virtualHosts."sonarr.${config.homelab.domain}" = {
     useACMEHost = config.homelab.domain;
     extraConfig = ''
@@ -60,6 +36,14 @@
       import block_non_private_ips
     '';
   };
+
+  #
+  # Managing Torrent sources
+  services.prowlarr = {
+    enable = true;
+    openFirewall = false;
+  };
+
   services.caddy.virtualHosts."prowlarr.${config.homelab.domain}" = {
     useACMEHost = config.homelab.domain;
     extraConfig = ''
@@ -67,6 +51,15 @@
       import block_non_private_ips
     '';
   };
+
+  #
+  # Finding subtitles
+  services.bazarr = {
+    enable = true;
+    openFirewall = false;
+    group = "media";
+  };
+
   services.caddy.virtualHosts."bazarr.${config.homelab.domain}" = {
     useACMEHost = config.homelab.domain;
     extraConfig = ''
@@ -74,6 +67,16 @@
       import block_non_private_ips
     '';
   };
+
+  #
+  # Downloading torrents
+  services.deluge = {
+    enable = true;
+    web.enable = true;
+    web.openFirewall = false;
+    group = "media";
+  };
+
   services.caddy.virtualHosts."deluge.${config.homelab.domain}" = {
     useACMEHost = config.homelab.domain;
     extraConfig = ''
@@ -81,6 +84,16 @@
       import block_non_private_ips
     '';
   };
+
+  #
+  # Requesting Frontend
+  services.jellyseerr = {
+    enable = true;
+    port = 5055;
+    openFirewall = false;
+    package = pkgs.jellyseerr;
+  };
+
   services.caddy.virtualHosts."jellyseer.${config.homelab.domain}" = {
     useACMEHost = config.homelab.domain;
     extraConfig = ''