diff --git a/modules/home-manager/cli/default.nix b/modules/home-manager/cli/default.nix
deleted file mode 100644
index 710b0faa..00000000
--- a/modules/home-manager/cli/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  imports = [
-    ./bluetuith.nix
-    ./bookmarkthis.nix
-    ./dev-commit.nix
-    ./direnv.nix
-    ./fzf.nix
-    ./git.nix
-    ./node.nix
-    ./notes.nix
-    ./ranger.nix
-    ./scripts
-    ./starship.nix
-    ./sxhkd.nix
-    ./todos.nix
-    ./tmux.nix
-    ./tmux-sessionizer.nix
-    ./zsh
-  ];
-}
diff --git a/modules/home-manager/coding/default.nix b/modules/home-manager/coding/default.nix
deleted file mode 100644
index a8d773c7..00000000
--- a/modules/home-manager/coding/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./neovim
-    ./phpactor
-  ];
-}
diff --git a/modules/home-manager/core/default.nix b/modules/home-manager/core/default.nix
deleted file mode 100644
index e885317f..00000000
--- a/modules/home-manager/core/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./gnupg.nix
-  ];
-}
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 523b8156..1909244a 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -1,8 +1,31 @@
 {
   imports = [
-    ./cli
-    ./coding
-    ./core
-    ./desktop
+    ./cli/bluetuith.nix
+    ./cli/bookmarkthis.nix
+    ./cli/dev-commit.nix
+    ./cli/direnv.nix
+    ./cli/fzf.nix
+    ./cli/git.nix
+    ./cli/node.nix
+    ./cli/notes.nix
+    ./cli/ranger.nix
+    ./cli/scripts
+    ./cli/starship.nix
+    ./cli/sxhkd.nix
+    ./cli/todos.nix
+    ./cli/tmux.nix
+    ./cli/tmux-sessionizer.nix
+    ./cli/zsh
+
+    ./coding/neovim
+    ./coding/phpactor
+
+    ./core/gnupg.nix
+
+    ./desktop/browsers
+    ./desktop/flameshot.nix
+    ./desktop/gtk.nix
+    ./desktop/media
+    ./desktop/screenkey.nix
   ];
 }
diff --git a/modules/home-manager/desktop/default.nix b/modules/home-manager/desktop/default.nix
deleted file mode 100644
index 6cabdeb9..00000000
--- a/modules/home-manager/desktop/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  imports = [
-    ./browsers
-    ./flameshot.nix
-    ./gtk.nix
-    ./media
-    ./screenkey.nix
-  ];
-}
diff --git a/modules/nixos/cli/default.nix b/modules/nixos/cli/default.nix
deleted file mode 100644
index 1814980f..00000000
--- a/modules/nixos/cli/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  imports = [
-    ./docker.nix
-    ./kanata.nix
-    ./podman.nix
-    ./password-store.nix
-  ];
-}
diff --git a/modules/nixos/core/default.nix b/modules/nixos/core/default.nix
deleted file mode 100644
index 560f1b75..00000000
--- a/modules/nixos/core/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  imports = [
-    ./avahi.nix
-    ./bluetooth.nix
-    ./gnupg.nix
-    ./openssh.nix
-    ./pipewire.nix
-    ./xbanish.nix
-    ./zram.nix
-  ];
-}
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index e75d5dfd..47599e64 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -1,9 +1,27 @@
 {
   imports = [
-    ./cli
-    ./core
-    ./desktop
-    ./homelab
+    ./cli/docker.nix
+    ./cli/kanata.nix
+    ./cli/podman.nix
+    ./cli/password-store.nix
+
+    ./core/avahi.nix
+    ./core/bluetooth.nix
+    ./core/gnupg.nix
+    ./core/openssh.nix
+    ./core/pipewire.nix
+    ./core/xbanish.nix
+    ./core/zram.nix
+
+    ./desktop/dconf.nix
+    ./desktop/dwm
+    ./desktop/fonts.nix
+    ./desktop/media
+    ./desktop/st.nix
+    ./desktop/thunar.nix
+
+    ./homelab/gitea-actions-runner.nix
+
     ./nixpad
   ];
 }
diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix
deleted file mode 100644
index d031fbb2..00000000
--- a/modules/nixos/desktop/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  imports = [
-    ./dconf.nix
-    ./dwm
-    ./fonts.nix
-    ./media
-    ./st.nix
-    ./thunar.nix
-  ];
-}
diff --git a/modules/nixos/homelab/default.nix b/modules/nixos/homelab/default.nix
deleted file mode 100644
index fe3a7066..00000000
--- a/modules/nixos/homelab/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./gitea-actions-runner.nix
-  ];
-}