diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 9dcd3e88bfe8..55c556bc7a29 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -820,7 +820,6 @@
   ./services/misc/klipper.nix
   ./services/misc/languagetool.nix
   ./services/misc/leaps.nix
-  ./services/misc/lidarr.nix
   ./services/misc/lifecycled.nix
   ./services/misc/llama-cpp.nix
   ./services/misc/logkeys.nix
@@ -860,12 +859,9 @@
   ./services/misc/portunus.nix
   ./services/misc/preload.nix
   ./services/misc/private-gpt.nix
-  ./services/misc/prowlarr.nix
   ./services/misc/pufferpanel.nix
   ./services/misc/pykms.nix
-  ./services/misc/radarr.nix
   ./services/misc/radicle.nix
-  ./services/misc/readarr.nix
   ./services/misc/realmd.nix
   ./services/misc/recyclarr.nix
   ./services/misc/redlib.nix
@@ -876,13 +872,18 @@
   ./services/misc/rshim.nix
   ./services/misc/safeeyes.nix
   ./services/misc/sdrplay.nix
+  ./services/misc/servarr/lidarr.nix
+  ./services/misc/servarr/prowlarr.nix
+  ./services/misc/servarr/radarr.nix
+  ./services/misc/servarr/readarr.nix
+  ./services/misc/servarr/sonarr.nix
+  ./services/misc/servarr/whisparr.nix
   ./services/misc/serviio.nix
   ./services/misc/sickbeard.nix
   ./services/misc/signald.nix
   ./services/misc/siproxd.nix
   ./services/misc/snapper.nix
   ./services/misc/soft-serve.nix
-  ./services/misc/sonarr.nix
   ./services/misc/sourcehut
   ./services/misc/spice-autorandr.nix
   ./services/misc/spice-vdagentd.nix
@@ -908,7 +909,6 @@
   ./services/misc/wastebin.nix
   ./services/misc/weechat.nix
   ./services/misc/workout-tracker.nix
-  ./services/misc/whisparr.nix
   ./services/misc/xmrig.nix
   ./services/misc/ytdl-sub.nix
   ./services/misc/zoneminder.nix
diff --git a/nixos/modules/services/misc/lidarr.nix b/nixos/modules/services/misc/servarr/lidarr.nix
similarity index 96%
rename from nixos/modules/services/misc/lidarr.nix
rename to nixos/modules/services/misc/servarr/lidarr.nix
index dc46f559c5fe..09df550fb2cd 100644
--- a/nixos/modules/services/misc/lidarr.nix
+++ b/nixos/modules/services/misc/servarr/lidarr.nix
@@ -6,7 +6,7 @@
 }:
 let
   cfg = config.services.lidarr;
-  servarr = import ./servarr/settings-options.nix { inherit lib pkgs; };
+  servarr = import ./settings-options.nix { inherit lib pkgs; };
 in
 {
   options = {
diff --git a/nixos/modules/services/misc/prowlarr.nix b/nixos/modules/services/misc/servarr/prowlarr.nix
similarity index 94%
rename from nixos/modules/services/misc/prowlarr.nix
rename to nixos/modules/services/misc/servarr/prowlarr.nix
index d0488241f2d2..dcf5b18005b4 100644
--- a/nixos/modules/services/misc/prowlarr.nix
+++ b/nixos/modules/services/misc/servarr/prowlarr.nix
@@ -6,7 +6,7 @@
 }:
 let
   cfg = config.services.prowlarr;
-  servarr = import ./servarr/settings-options.nix { inherit lib pkgs; };
+  servarr = import ./settings-options.nix { inherit lib pkgs; };
 in
 {
   options = {
diff --git a/nixos/modules/services/misc/radarr.nix b/nixos/modules/services/misc/servarr/radarr.nix
similarity index 96%
rename from nixos/modules/services/misc/radarr.nix
rename to nixos/modules/services/misc/servarr/radarr.nix
index 400287d1ffcf..9ca4b889de63 100644
--- a/nixos/modules/services/misc/radarr.nix
+++ b/nixos/modules/services/misc/servarr/radarr.nix
@@ -6,7 +6,7 @@
 }:
 let
   cfg = config.services.radarr;
-  servarr = import ./servarr/settings-options.nix { inherit lib pkgs; };
+  servarr = import ./settings-options.nix { inherit lib pkgs; };
 in
 {
   options = {
diff --git a/nixos/modules/services/misc/readarr.nix b/nixos/modules/services/misc/servarr/readarr.nix
similarity index 96%
rename from nixos/modules/services/misc/readarr.nix
rename to nixos/modules/services/misc/servarr/readarr.nix
index f10cc8847ab9..3933ec0305f4 100644
--- a/nixos/modules/services/misc/readarr.nix
+++ b/nixos/modules/services/misc/servarr/readarr.nix
@@ -6,7 +6,7 @@
 }:
 let
   cfg = config.services.readarr;
-  servarr = import ./servarr/settings-options.nix { inherit lib pkgs; };
+  servarr = import ./settings-options.nix { inherit lib pkgs; };
 in
 {
   options = {
diff --git a/nixos/modules/services/misc/sonarr.nix b/nixos/modules/services/misc/servarr/sonarr.nix
similarity index 96%
rename from nixos/modules/services/misc/sonarr.nix
rename to nixos/modules/services/misc/servarr/sonarr.nix
index bb79a63df0f8..9918c9da28f5 100644
--- a/nixos/modules/services/misc/sonarr.nix
+++ b/nixos/modules/services/misc/servarr/sonarr.nix
@@ -7,7 +7,7 @@
 }:
 let
   cfg = config.services.sonarr;
-  servarr = import ./servarr/settings-options.nix { inherit lib pkgs; };
+  servarr = import ./settings-options.nix { inherit lib pkgs; };
 in
 {
   options = {
diff --git a/nixos/modules/services/misc/whisparr.nix b/nixos/modules/services/misc/servarr/whisparr.nix
similarity index 96%
rename from nixos/modules/services/misc/whisparr.nix
rename to nixos/modules/services/misc/servarr/whisparr.nix
index 02db788fc3ae..b686c8a76691 100644
--- a/nixos/modules/services/misc/whisparr.nix
+++ b/nixos/modules/services/misc/servarr/whisparr.nix
@@ -7,7 +7,7 @@
 
 let
   cfg = config.services.whisparr;
-  servarr = import ./servarr/settings-options.nix { inherit lib pkgs; };
+  servarr = import ./settings-options.nix { inherit lib pkgs; };
 in
 {
   options = {