diff --git a/modules/services/default.nix b/modules/services/default.nix
index c3a430b..2113d38 100644
--- a/modules/services/default.nix
+++ b/modules/services/default.nix
@@ -5,7 +5,6 @@
     ./alertmanager
     ./aria2
     ./backup
-    ./bazarr
     ./blackbox
     ./blocky
     ./dyndns
@@ -20,26 +19,20 @@
     ./homepage
     ./homer
     ./initrd-ssh
-    ./jellyfin
-    ./jellyseerr
     ./loki
-    ./minecraft-server
     ./matrix-bot
+    ./media
+    ./minecraft-server
     ./mumble-server
-    ./navidrome
     ./nextcloud
     ./node-exporter
     ./octoprint
     ./paperless
     ./passworts
-    ./photos
     ./prometheus
     ./promtail
-    ./prowlarr
-    ./radarr
     ./remote-build
     ./rss-bridge
-    ./sonarr
     ./ssh-server
     ./tandoor-recipes
     ./vpn
diff --git a/modules/services/bazarr/default.nix b/modules/services/media/bazarr/default.nix
similarity index 100%
rename from modules/services/bazarr/default.nix
rename to modules/services/media/bazarr/default.nix
diff --git a/modules/services/media/default.nix b/modules/services/media/default.nix
new file mode 100644
index 0000000..ebb96ad
--- /dev/null
+++ b/modules/services/media/default.nix
@@ -0,0 +1,13 @@
+{ ... }:
+{
+  imports = [
+    ./bazarr
+    ./jellyfin
+    ./jellyseerr
+    ./navidrome
+    ./photos
+    ./prowlarr
+    ./radarr
+    ./sonarr
+  ];
+}
diff --git a/modules/services/jellyfin/default.nix b/modules/services/media/jellyfin/default.nix
similarity index 100%
rename from modules/services/jellyfin/default.nix
rename to modules/services/media/jellyfin/default.nix
diff --git a/modules/services/jellyfin/enable-metrics.patch b/modules/services/media/jellyfin/enable-metrics.patch
similarity index 100%
rename from modules/services/jellyfin/enable-metrics.patch
rename to modules/services/media/jellyfin/enable-metrics.patch
diff --git a/modules/services/jellyseerr/default.nix b/modules/services/media/jellyseerr/default.nix
similarity index 100%
rename from modules/services/jellyseerr/default.nix
rename to modules/services/media/jellyseerr/default.nix
diff --git a/modules/services/navidrome/default.nix b/modules/services/media/navidrome/default.nix
similarity index 100%
rename from modules/services/navidrome/default.nix
rename to modules/services/media/navidrome/default.nix
diff --git a/modules/services/photos/default.nix b/modules/services/media/photos/default.nix
similarity index 100%
rename from modules/services/photos/default.nix
rename to modules/services/media/photos/default.nix
diff --git a/modules/services/prowlarr/default.nix b/modules/services/media/prowlarr/default.nix
similarity index 100%
rename from modules/services/prowlarr/default.nix
rename to modules/services/media/prowlarr/default.nix
diff --git a/modules/services/radarr/default.nix b/modules/services/media/radarr/default.nix
similarity index 100%
rename from modules/services/radarr/default.nix
rename to modules/services/media/radarr/default.nix
diff --git a/modules/services/sonarr/default.nix b/modules/services/media/sonarr/default.nix
similarity index 100%
rename from modules/services/sonarr/default.nix
rename to modules/services/media/sonarr/default.nix