diff --git a/modules/home/application/bitwarden/default.nix b/modules/home/application/bitwarden.nix
similarity index 100%
rename from modules/home/application/bitwarden/default.nix
rename to modules/home/application/bitwarden.nix
diff --git a/modules/home/application/chrome/default.nix b/modules/home/application/chrome.nix
similarity index 100%
rename from modules/home/application/chrome/default.nix
rename to modules/home/application/chrome.nix
diff --git a/modules/home/application/default.nix b/modules/home/application/default.nix
deleted file mode 100644
index a8eb524..0000000
--- a/modules/home/application/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  imports = [
-    ./bitwarden
-    ./chrome
-    ./discord
-    ./ladybird
-    ./matrix
-    ./obs
-    ./onlyoffice
-    ./signal
-    ./steam
-    ./studio
-    ./teamspeak
-    ./thunderbird
-    ./zen
-  ];
-}
diff --git a/modules/home/application/discord/default.nix b/modules/home/application/discord.nix
similarity index 100%
rename from modules/home/application/discord/default.nix
rename to modules/home/application/discord.nix
diff --git a/modules/home/application/ladybird/default.nix b/modules/home/application/ladybird.nix
similarity index 100%
rename from modules/home/application/ladybird/default.nix
rename to modules/home/application/ladybird.nix
diff --git a/modules/home/application/matrix/default.nix b/modules/home/application/matix.nix
similarity index 100%
rename from modules/home/application/matrix/default.nix
rename to modules/home/application/matix.nix
diff --git a/modules/home/application/obs/default.nix b/modules/home/application/obs.nix
similarity index 100%
rename from modules/home/application/obs/default.nix
rename to modules/home/application/obs.nix
diff --git a/modules/home/application/onlyoffice/default.nix b/modules/home/application/onlyoffice.nix
similarity index 100%
rename from modules/home/application/onlyoffice/default.nix
rename to modules/home/application/onlyoffice.nix
diff --git a/modules/home/application/signal/default.nix b/modules/home/application/signal.nix
similarity index 100%
rename from modules/home/application/signal/default.nix
rename to modules/home/application/signal.nix
diff --git a/modules/home/application/steam/default.nix b/modules/home/application/steam.nix
similarity index 100%
rename from modules/home/application/steam/default.nix
rename to modules/home/application/steam.nix
diff --git a/modules/home/application/studio/default.nix b/modules/home/application/studio.nix
similarity index 100%
rename from modules/home/application/studio/default.nix
rename to modules/home/application/studio.nix
diff --git a/modules/home/application/teamspeak/default.nix b/modules/home/application/teamspeak.nix
similarity index 100%
rename from modules/home/application/teamspeak/default.nix
rename to modules/home/application/teamspeak.nix
diff --git a/modules/home/application/thunderbird/default.nix b/modules/home/application/thunderbird.nix
similarity index 100%
rename from modules/home/application/thunderbird/default.nix
rename to modules/home/application/thunderbird.nix
diff --git a/modules/home/application/zen/default.nix b/modules/home/application/zen.nix
similarity index 100%
rename from modules/home/application/zen/default.nix
rename to modules/home/application/zen.nix
diff --git a/modules/home/default.nix b/modules/home/default.nix
index 1adaef0..8140c1b 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -9,18 +9,6 @@
 
   cfg = config.sneeuwvlok.defaults;
 in {
-  imports = [
-    ./application
-    ./desktop
-    ./development
-    ./editor
-    ./game
-    ./home-manager
-    ./shell
-    ./terminal
-    ./themes
-  ];
-
   options.sneeuwvlok.defaults = {
     editor = mkOption {
       type = enum ["nano" "nvim" "zed"];
diff --git a/modules/home/desktop/default.nix b/modules/home/desktop/default.nix
deleted file mode 100644
index 3498999..0000000
--- a/modules/home/desktop/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./plasma
-  ];
-}
diff --git a/modules/home/development/default.nix b/modules/home/development/default.nix
deleted file mode 100644
index d3e528a..0000000
--- a/modules/home/development/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  imports = [
-    ./dotnet
-    ./javascript
-    ./rust
-  ];
-}
diff --git a/modules/home/development/dotnet/default.nix b/modules/home/development/dotnet.nix
similarity index 100%
rename from modules/home/development/dotnet/default.nix
rename to modules/home/development/dotnet.nix
diff --git a/modules/home/development/javascript/default.nix b/modules/home/development/javascript.nix
similarity index 100%
rename from modules/home/development/javascript/default.nix
rename to modules/home/development/javascript.nix
diff --git a/modules/home/development/rust/default.nix b/modules/home/development/rust.nix
similarity index 100%
rename from modules/home/development/rust/default.nix
rename to modules/home/development/rust.nix
diff --git a/modules/home/editor/default.nix b/modules/home/editor/default.nix
deleted file mode 100644
index b0cd9f4..0000000
--- a/modules/home/editor/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  imports = [
-    ./nano
-    ./nvim
-    ./zed
-  ];
-}
diff --git a/modules/home/editor/nano/default.nix b/modules/home/editor/nano.nix
similarity index 100%
rename from modules/home/editor/nano/default.nix
rename to modules/home/editor/nano.nix
diff --git a/modules/home/editor/nvim/default.nix b/modules/home/editor/nvim.nix
similarity index 100%
rename from modules/home/editor/nvim/default.nix
rename to modules/home/editor/nvim.nix
diff --git a/modules/home/editor/zed/default.nix b/modules/home/editor/zed.nix
similarity index 100%
rename from modules/home/editor/zed/default.nix
rename to modules/home/editor/zed.nix
diff --git a/modules/home/game/default.nix b/modules/home/game/default.nix
deleted file mode 100644
index 639ea68..0000000
--- a/modules/home/game/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./minecraft
-  ];
-}
diff --git a/modules/home/game/minecraft/default.nix b/modules/home/game/minescraft.nix
similarity index 100%
rename from modules/home/game/minecraft/default.nix
rename to modules/home/game/minescraft.nix
diff --git a/modules/home/shell/default.nix b/modules/home/shell/default.nix
index 5639286..98a2054 100644
--- a/modules/home/shell/default.nix
+++ b/modules/home/shell/default.nix
@@ -8,11 +8,6 @@
 
   cfg = config.sneeuwvlok.shell;
 in {
-  imports = [
-    ./toolset
-    ./zsh
-  ];
-
   options.sneeuwvlok.shell = {
     corePkgs.enable = mkEnableOption "core shell packages";
   };
diff --git a/modules/home/shell/toolset/bat/default.nix b/modules/home/shell/toolset/bat.nix
similarity index 100%
rename from modules/home/shell/toolset/bat/default.nix
rename to modules/home/shell/toolset/bat.nix
diff --git a/modules/home/shell/toolset/btop/default.nix b/modules/home/shell/toolset/btop.nix
similarity index 100%
rename from modules/home/shell/toolset/btop/default.nix
rename to modules/home/shell/toolset/btop.nix
diff --git a/modules/home/shell/toolset/default.nix b/modules/home/shell/toolset/default.nix
deleted file mode 100644
index edc8c03..0000000
--- a/modules/home/shell/toolset/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  imports = [
-    ./bat
-    ./btop
-    ./eza
-    ./fzf
-    ./git
-    ./gnugpg
-    ./just
-    ./starship
-    ./tmux
-    ./yazi
-    ./zellij
-    ./zoxide
-  ];
-}
diff --git a/modules/home/shell/toolset/eza/default.nix b/modules/home/shell/toolset/eza.nix
similarity index 100%
rename from modules/home/shell/toolset/eza/default.nix
rename to modules/home/shell/toolset/eza.nix
diff --git a/modules/home/shell/toolset/fzf/default.nix b/modules/home/shell/toolset/fzf.nix
similarity index 100%
rename from modules/home/shell/toolset/fzf/default.nix
rename to modules/home/shell/toolset/fzf.nix
diff --git a/modules/home/shell/toolset/git/default.nix b/modules/home/shell/toolset/git.nix
similarity index 100%
rename from modules/home/shell/toolset/git/default.nix
rename to modules/home/shell/toolset/git.nix
diff --git a/modules/home/shell/toolset/gnugpg/default.nix b/modules/home/shell/toolset/gnupgp.nix
similarity index 100%
rename from modules/home/shell/toolset/gnugpg/default.nix
rename to modules/home/shell/toolset/gnupgp.nix
diff --git a/modules/home/shell/toolset/just/default.nix b/modules/home/shell/toolset/just.nix
similarity index 100%
rename from modules/home/shell/toolset/just/default.nix
rename to modules/home/shell/toolset/just.nix
diff --git a/modules/home/shell/toolset/starship/default.nix b/modules/home/shell/toolset/starship.nix
similarity index 100%
rename from modules/home/shell/toolset/starship/default.nix
rename to modules/home/shell/toolset/starship.nix
diff --git a/modules/home/shell/toolset/tmux/default.nix b/modules/home/shell/toolset/tmux.nix
similarity index 100%
rename from modules/home/shell/toolset/tmux/default.nix
rename to modules/home/shell/toolset/tmux.nix
diff --git a/modules/home/shell/toolset/yazi/default.nix b/modules/home/shell/toolset/yazi.nix
similarity index 100%
rename from modules/home/shell/toolset/yazi/default.nix
rename to modules/home/shell/toolset/yazi.nix
diff --git a/modules/home/shell/toolset/zellij/default.nix b/modules/home/shell/toolset/zellij.nix
similarity index 100%
rename from modules/home/shell/toolset/zellij/default.nix
rename to modules/home/shell/toolset/zellij.nix
diff --git a/modules/home/shell/toolset/zoxide/default.nix b/modules/home/shell/toolset/zoxide.nix
similarity index 100%
rename from modules/home/shell/toolset/zoxide/default.nix
rename to modules/home/shell/toolset/zoxide.nix
diff --git a/modules/home/shell/zsh/default.nix b/modules/home/shell/zsh.nix
similarity index 100%
rename from modules/home/shell/zsh/default.nix
rename to modules/home/shell/zsh.nix
diff --git a/modules/home/terminal/alacritty/default.nix b/modules/home/terminal/alacritty.nix
similarity index 100%
rename from modules/home/terminal/alacritty/default.nix
rename to modules/home/terminal/alacritty.nix
diff --git a/modules/home/terminal/default.nix b/modules/home/terminal/default.nix
deleted file mode 100644
index 97d44fa..0000000
--- a/modules/home/terminal/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./alacritty
-    ./ghostty
-  ];
-}
diff --git a/modules/home/terminal/ghostty/default.nix b/modules/home/terminal/ghostty.nix
similarity index 100%
rename from modules/home/terminal/ghostty/default.nix
rename to modules/home/terminal/ghostty.nix