diff --git a/hmModules/apps/terminal-emulators/alacritty/default.nix b/hmModules/apps/alacritty/app.nix
similarity index 96%
rename from hmModules/apps/terminal-emulators/alacritty/default.nix
rename to hmModules/apps/alacritty/app.nix
index c172d63..9677b84 100644
--- a/hmModules/apps/terminal-emulators/alacritty/default.nix
+++ b/hmModules/apps/alacritty/app.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 {
   options.alacritty = {
diff --git a/hmModules/apps/chat/beeper/default.nix b/hmModules/apps/beeper/app.nix
similarity index 100%
rename from hmModules/apps/chat/beeper/default.nix
rename to hmModules/apps/beeper/app.nix
diff --git a/hmModules/apps/chat/default.nix b/hmModules/apps/chat/default.nix
deleted file mode 100644
index 84ad4e5..0000000
--- a/hmModules/apps/chat/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  imports = [
-    ./discord
-    ./beeper
-  ];
-}
diff --git a/hmModules/apps/default.nix b/hmModules/apps/default.nix
index ef1c1b2..cb0c66b 100644
--- a/hmModules/apps/default.nix
+++ b/hmModules/apps/default.nix
@@ -1,20 +1,6 @@
-{ config, pkgs, ... }:
-
-{
-  imports = [
-    ./chat
-    ./file-browsers
-    ./gimp
-    ./git
-    ./hypr
-    ./librewolf
-    ./lutris
-    ./media-viewers
-    ./neovim
-    ./obs
-    ./rofi
-    ./shells
-    ./terminal-emulators
-    ./zoxide
-  ];
+{ lib, ... }: let
+  fs = lib.fileset;
+  appFilter = {name, ...}: name == "app.nix";
+in {
+  imports = fs.toList (fs.fileFilter appFilter ./.);
 }
diff --git a/hmModules/apps/chat/discord/default.nix b/hmModules/apps/discord/app.nix
similarity index 100%
rename from hmModules/apps/chat/discord/default.nix
rename to hmModules/apps/discord/app.nix
diff --git a/hmModules/apps/media-viewers/feh/default.nix b/hmModules/apps/feh/app.nix
similarity index 85%
rename from hmModules/apps/media-viewers/feh/default.nix
rename to hmModules/apps/feh/app.nix
index c1c4462..d109fe2 100644
--- a/hmModules/apps/media-viewers/feh/default.nix
+++ b/hmModules/apps/feh/app.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 {
   options.feh = {
diff --git a/hmModules/apps/file-browsers/default.nix b/hmModules/apps/file-browsers/default.nix
deleted file mode 100644
index 118e357..0000000
--- a/hmModules/apps/file-browsers/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [
-    ./lf
-    ./nnn
-  ];
-}
diff --git a/hmModules/apps/shells/fish/default.nix b/hmModules/apps/fish/app.nix
similarity index 97%
rename from hmModules/apps/shells/fish/default.nix
rename to hmModules/apps/fish/app.nix
index 0fc1e53..0b00897 100644
--- a/hmModules/apps/shells/fish/default.nix
+++ b/hmModules/apps/fish/app.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 let
   functionModule = with lib.types; submodule {
     options = {
diff --git a/hmModules/apps/shells/fish/functions/git_prompt.fish b/hmModules/apps/fish/functions/git_prompt.fish
similarity index 100%
rename from hmModules/apps/shells/fish/functions/git_prompt.fish
rename to hmModules/apps/fish/functions/git_prompt.fish
diff --git a/hmModules/apps/shells/fish/functions/ssh.fish b/hmModules/apps/fish/functions/ssh.fish
similarity index 100%
rename from hmModules/apps/shells/fish/functions/ssh.fish
rename to hmModules/apps/fish/functions/ssh.fish
diff --git a/hmModules/apps/gimp/default.nix b/hmModules/apps/gimp/app.nix
similarity index 100%
rename from hmModules/apps/gimp/default.nix
rename to hmModules/apps/gimp/app.nix
diff --git a/hmModules/apps/git/default.nix b/hmModules/apps/git/app.nix
similarity index 95%
rename from hmModules/apps/git/default.nix
rename to hmModules/apps/git/app.nix
index e164daa..569ee14 100644
--- a/hmModules/apps/git/default.nix
+++ b/hmModules/apps/git/app.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 {
   options.git = {
diff --git a/hmModules/apps/hypr/default.nix b/hmModules/apps/hypr/app.nix
similarity index 100%
rename from hmModules/apps/hypr/default.nix
rename to hmModules/apps/hypr/app.nix
diff --git a/hmModules/apps/terminal-emulators/kitty/default.nix b/hmModules/apps/kitty/app.nix
similarity index 95%
rename from hmModules/apps/terminal-emulators/kitty/default.nix
rename to hmModules/apps/kitty/app.nix
index 23b8161..9d177b0 100644
--- a/hmModules/apps/terminal-emulators/kitty/default.nix
+++ b/hmModules/apps/kitty/app.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 {
   options.kitty = {
diff --git a/hmModules/apps/file-browsers/lf/default.nix b/hmModules/apps/lf/app.nix
similarity index 100%
rename from hmModules/apps/file-browsers/lf/default.nix
rename to hmModules/apps/lf/app.nix
diff --git a/hmModules/apps/file-browsers/lf/icons b/hmModules/apps/lf/icons
similarity index 100%
rename from hmModules/apps/file-browsers/lf/icons
rename to hmModules/apps/lf/icons
diff --git a/hmModules/apps/librewolf/default.nix b/hmModules/apps/librewolf/app.nix
similarity index 100%
rename from hmModules/apps/librewolf/default.nix
rename to hmModules/apps/librewolf/app.nix
diff --git a/hmModules/apps/lutris/default.nix b/hmModules/apps/lutris/app.nix
similarity index 100%
rename from hmModules/apps/lutris/default.nix
rename to hmModules/apps/lutris/app.nix
diff --git a/hmModules/apps/media-viewers/default.nix b/hmModules/apps/media-viewers/default.nix
deleted file mode 100644
index 5b26119..0000000
--- a/hmModules/apps/media-viewers/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  imports = [
-    ./feh
-    ./mpv
-    ./zathura
-  ];
-}
diff --git a/hmModules/apps/media-viewers/mpv/default.nix b/hmModules/apps/mpv/app.nix
similarity index 100%
rename from hmModules/apps/media-viewers/mpv/default.nix
rename to hmModules/apps/mpv/app.nix
diff --git a/hmModules/apps/neovim/default.nix b/hmModules/apps/neovim/app.nix
similarity index 100%
rename from hmModules/apps/neovim/default.nix
rename to hmModules/apps/neovim/app.nix
diff --git a/hmModules/apps/file-browsers/nnn/default.nix b/hmModules/apps/nnn/app.nix
similarity index 94%
rename from hmModules/apps/file-browsers/nnn/default.nix
rename to hmModules/apps/nnn/app.nix
index 8900ee7..604c3f9 100644
--- a/hmModules/apps/file-browsers/nnn/default.nix
+++ b/hmModules/apps/nnn/app.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 {
   options.nnn = {
diff --git a/hmModules/apps/file-browsers/nnn/nnn_fish_function.fish b/hmModules/apps/nnn/nnn_fish_function.fish
similarity index 100%
rename from hmModules/apps/file-browsers/nnn/nnn_fish_function.fish
rename to hmModules/apps/nnn/nnn_fish_function.fish
diff --git a/hmModules/apps/obs/default.nix b/hmModules/apps/obs/app.nix
similarity index 100%
rename from hmModules/apps/obs/default.nix
rename to hmModules/apps/obs/app.nix
diff --git a/hmModules/apps/rofi/default.nix b/hmModules/apps/rofi/app.nix
similarity index 100%
rename from hmModules/apps/rofi/default.nix
rename to hmModules/apps/rofi/app.nix
diff --git a/hmModules/apps/shells/default.nix b/hmModules/apps/shells/default.nix
deleted file mode 100644
index 03ae484..0000000
--- a/hmModules/apps/shells/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [
-    ./fish
-    ./xonsh
-    ./zsh
-  ];
-}
diff --git a/hmModules/apps/terminal-emulators/default.nix b/hmModules/apps/terminal-emulators/default.nix
deleted file mode 100644
index ceb550b..0000000
--- a/hmModules/apps/terminal-emulators/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [
-    ./kitty
-    ./alacritty
-  ];
-}
diff --git a/hmModules/apps/shells/xonsh/default.nix b/hmModules/apps/xonsh/app.nix
similarity index 100%
rename from hmModules/apps/shells/xonsh/default.nix
rename to hmModules/apps/xonsh/app.nix
diff --git a/hmModules/apps/shells/xonsh/rc.xsh b/hmModules/apps/xonsh/rc.xsh
similarity index 100%
rename from hmModules/apps/shells/xonsh/rc.xsh
rename to hmModules/apps/xonsh/rc.xsh
diff --git a/hmModules/apps/media-viewers/zathura/default.nix b/hmModules/apps/zathura/app.nix
similarity index 86%
rename from hmModules/apps/media-viewers/zathura/default.nix
rename to hmModules/apps/zathura/app.nix
index 005c2b6..e4297aa 100644
--- a/hmModules/apps/media-viewers/zathura/default.nix
+++ b/hmModules/apps/zathura/app.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 {
   options.zathura = {
diff --git a/hmModules/apps/zoxide/default.nix b/hmModules/apps/zoxide/app.nix
similarity index 89%
rename from hmModules/apps/zoxide/default.nix
rename to hmModules/apps/zoxide/app.nix
index 859c69b..df50441 100644
--- a/hmModules/apps/zoxide/default.nix
+++ b/hmModules/apps/zoxide/app.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 {
   options.zoxide = {
diff --git a/hmModules/apps/shells/zsh/default.nix b/hmModules/apps/zsh/app.nix
similarity index 100%
rename from hmModules/apps/shells/zsh/default.nix
rename to hmModules/apps/zsh/app.nix