diff --git a/modules/default.nix b/modules/default.nix
index 8cc120ce..3cfd0142 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,7 +1,3 @@
-{ config, pkgs, lib, ...}:
 {
-  imports = [
-    ./media/mpd
-    ./hardware
-  ];
+  desktop = import ./desktop;
 }
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
new file mode 100644
index 00000000..246221f5
--- /dev/null
+++ b/modules/desktop/default.nix
@@ -0,0 +1,5 @@
+{
+  bspwm = ./bspwm.nix;
+  kitty = ./kitty.nix;
+  web = ./web;
+}
diff --git a/modules/desktop/web/default.nix b/modules/desktop/web/default.nix
new file mode 100644
index 00000000..f0ea9ebe
--- /dev/null
+++ b/modules/desktop/web/default.nix
@@ -0,0 +1,3 @@
+{
+  qutebrowser = ./qutebrowser.nix;
+}