diff --git a/home/bat.nix b/home/bat/default.nix
similarity index 100%
rename from home/bat.nix
rename to home/bat/default.nix
diff --git a/home/bluetooth.nix b/home/bluetooth/default.nix
similarity index 100%
rename from home/bluetooth.nix
rename to home/bluetooth/default.nix
diff --git a/home/comma.nix b/home/comma/default.nix
similarity index 100%
rename from home/comma.nix
rename to home/comma/default.nix
diff --git a/home/default.nix b/home/default.nix
index fee7a8b..e68c53b 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,37 +1,37 @@
 { ... }:
 {
   imports = [
-    ./bat.nix
-    ./bluetooth.nix
-    ./comma.nix
-    ./direnv.nix
-    ./documentation.nix
-    ./feh.nix
+    ./bat
+    ./bluetooth
+    ./comma
+    ./direnv
+    ./documentation
+    ./feh
     ./firefox
-    ./flameshot.nix
-    ./gammastep.nix
+    ./flameshot
+    ./gammastep
     ./gdb
     ./git
-    ./gpg.nix
-    ./gtk.nix
-    ./htop.nix
-    ./jq.nix
+    ./gpg
+    ./gtk
+    ./htop
+    ./jq
     ./mail
-    ./mpv.nix
-    ./nix-index.nix
-    ./nm-applet.nix
-    ./packages.nix
-    ./pager.nix
-    ./power-alert.nix
-    ./ssh.nix
+    ./mpv
+    ./nix-index
+    ./nm-applet
+    ./packages
+    ./pager
+    ./power-alert
+    ./ssh
     ./terminal
-    ./tmux.nix
-    ./udiskie.nix
+    ./tmux
+    ./udiskie
     ./vim
     ./wm
     ./x
-    ./xdg.nix
-    ./zathura.nix
+    ./xdg
+    ./zathura
     ./zsh
   ];
 
diff --git a/home/direnv.nix b/home/direnv/default.nix
similarity index 100%
rename from home/direnv.nix
rename to home/direnv/default.nix
diff --git a/home/documentation.nix b/home/documentation/default.nix
similarity index 100%
rename from home/documentation.nix
rename to home/documentation/default.nix
diff --git a/home/feh.nix b/home/feh/default.nix
similarity index 100%
rename from home/feh.nix
rename to home/feh/default.nix
diff --git a/home/flameshot.nix b/home/flameshot/default.nix
similarity index 100%
rename from home/flameshot.nix
rename to home/flameshot/default.nix
diff --git a/home/gammastep.nix b/home/gammastep/default.nix
similarity index 100%
rename from home/gammastep.nix
rename to home/gammastep/default.nix
diff --git a/home/gpg.nix b/home/gpg/default.nix
similarity index 100%
rename from home/gpg.nix
rename to home/gpg/default.nix
diff --git a/home/gtk.nix b/home/gtk/default.nix
similarity index 100%
rename from home/gtk.nix
rename to home/gtk/default.nix
diff --git a/home/htop.nix b/home/htop/default.nix
similarity index 100%
rename from home/htop.nix
rename to home/htop/default.nix
diff --git a/home/jq.nix b/home/jq/default.nix
similarity index 100%
rename from home/jq.nix
rename to home/jq/default.nix
diff --git a/home/mpv.nix b/home/mpv/default.nix
similarity index 100%
rename from home/mpv.nix
rename to home/mpv/default.nix
diff --git a/home/nix-index.nix b/home/nix-index/default.nix
similarity index 100%
rename from home/nix-index.nix
rename to home/nix-index/default.nix
diff --git a/home/nm-applet.nix b/home/nm-applet/default.nix
similarity index 100%
rename from home/nm-applet.nix
rename to home/nm-applet/default.nix
diff --git a/home/packages.nix b/home/packages/default.nix
similarity index 100%
rename from home/packages.nix
rename to home/packages/default.nix
diff --git a/home/pager.nix b/home/pager/default.nix
similarity index 100%
rename from home/pager.nix
rename to home/pager/default.nix
diff --git a/home/power-alert.nix b/home/power-alert/default.nix
similarity index 100%
rename from home/power-alert.nix
rename to home/power-alert/default.nix
diff --git a/home/ssh.nix b/home/ssh/default.nix
similarity index 100%
rename from home/ssh.nix
rename to home/ssh/default.nix
diff --git a/home/tmux.nix b/home/tmux/default.nix
similarity index 100%
rename from home/tmux.nix
rename to home/tmux/default.nix
diff --git a/home/udiskie.nix b/home/udiskie/default.nix
similarity index 100%
rename from home/udiskie.nix
rename to home/udiskie/default.nix
diff --git a/home/xdg.nix b/home/xdg/default.nix
similarity index 100%
rename from home/xdg.nix
rename to home/xdg/default.nix
diff --git a/home/zathura.nix b/home/zathura/default.nix
similarity index 100%
rename from home/zathura.nix
rename to home/zathura/default.nix