diff --git a/modules/default.nix b/modules/default.nix
index 2793bdc8..8cc120ce 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,7 +1,7 @@
 { config, pkgs, lib, ...}:
 {
   imports = [
-    ./mpd
+    ./media/mpd
     ./hardware
   ];
 }
diff --git a/modules/mopidy/default.nix b/modules/media/mopidy/default.nix
similarity index 100%
rename from modules/mopidy/default.nix
rename to modules/media/mopidy/default.nix
diff --git a/modules/mpd/default.nix b/modules/media/mpd/default.nix
similarity index 100%
rename from modules/mpd/default.nix
rename to modules/media/mpd/default.nix