diff --git a/modules/home/apps/chromium/default.nix b/modules/home/apps/chromium.nix
similarity index 100%
rename from modules/home/apps/chromium/default.nix
rename to modules/home/apps/chromium.nix
diff --git a/modules/home/apps/default.nix b/modules/home/apps/default.nix
index 5f6f130..1959117 100644
--- a/modules/home/apps/default.nix
+++ b/modules/home/apps/default.nix
@@ -2,10 +2,10 @@
 
 {
   imports = [
-    ./chromium
-    ./firefox
-    ./flatpak
-    ./jetbrainsToolbox
-    ./kitty
+    ./chromium.nix
+    ./firefox.nix
+    ./flatpak.nix
+    ./jetbrains-toolbox.nix
+    ./kitty.nix
   ];
 }
diff --git a/modules/home/apps/firefox/default.nix b/modules/home/apps/firefox.nix
similarity index 100%
rename from modules/home/apps/firefox/default.nix
rename to modules/home/apps/firefox.nix
diff --git a/modules/home/apps/flatpak/default.nix b/modules/home/apps/flatpak.nix
similarity index 100%
rename from modules/home/apps/flatpak/default.nix
rename to modules/home/apps/flatpak.nix
diff --git a/modules/home/apps/jetbrainsToolbox/default.nix b/modules/home/apps/jetbrains-toolbox.nix
similarity index 100%
rename from modules/home/apps/jetbrainsToolbox/default.nix
rename to modules/home/apps/jetbrains-toolbox.nix
diff --git a/modules/home/apps/kitty/default.nix b/modules/home/apps/kitty.nix
similarity index 100%
rename from modules/home/apps/kitty/default.nix
rename to modules/home/apps/kitty.nix
diff --git a/modules/home/desktop/default.nix b/modules/home/desktop/default.nix
index 5740f85..67ead8f 100644
--- a/modules/home/desktop/default.nix
+++ b/modules/home/desktop/default.nix
@@ -2,6 +2,6 @@
 
 {
   imports = [
-    ./hyprland
+    ./hyprland.nix
   ];
 }
\ No newline at end of file
diff --git a/modules/home/desktop/hyprland/default.nix b/modules/home/desktop/hyprland.nix
similarity index 100%
rename from modules/home/desktop/hyprland/default.nix
rename to modules/home/desktop/hyprland.nix
diff --git a/modules/home/editors/default.nix b/modules/home/editors/default.nix
index 275abd6..9cfb813 100644
--- a/modules/home/editors/default.nix
+++ b/modules/home/editors/default.nix
@@ -3,6 +3,6 @@
 {
   imports = [
     ./emacs
-    ./vscode
+    ./vscode.nix
   ];
 }
\ No newline at end of file
diff --git a/modules/home/editors/vscode/default.nix b/modules/home/editors/vscode.nix
similarity index 100%
rename from modules/home/editors/vscode/default.nix
rename to modules/home/editors/vscode.nix
diff --git a/modules/home/shell/atuin/default.nix b/modules/home/shell/atuin.nix
similarity index 100%
rename from modules/home/shell/atuin/default.nix
rename to modules/home/shell/atuin.nix
diff --git a/modules/home/shell/default.nix b/modules/home/shell/default.nix
index ab7dd19..96c297d 100644
--- a/modules/home/shell/default.nix
+++ b/modules/home/shell/default.nix
@@ -2,9 +2,9 @@
 
 {
   imports = [
-    ./atuin
-    ./direnv
-    ./git
+    ./atuin.nix
+    ./direnv.nix
+    ./git.nix
     ./zsh
   ];
 }
\ No newline at end of file
diff --git a/modules/home/shell/direnv/default.nix b/modules/home/shell/direnv.nix
similarity index 100%
rename from modules/home/shell/direnv/default.nix
rename to modules/home/shell/direnv.nix
diff --git a/modules/home/shell/git/default.nix b/modules/home/shell/git.nix
similarity index 100%
rename from modules/home/shell/git/default.nix
rename to modules/home/shell/git.nix
diff --git a/modules/system/apps/default.nix b/modules/system/apps/default.nix
index e61811f..5a3ce18 100644
--- a/modules/system/apps/default.nix
+++ b/modules/system/apps/default.nix
@@ -2,8 +2,8 @@
 
 {
   imports = [
-    ./flatpak
-    ./qemu
-    ./steam
+    ./flatpak.nix
+    ./qemu.nix
+    ./steam.nix
   ];
 }
diff --git a/modules/system/apps/flatpak/default.nix b/modules/system/apps/flatpak.nix
similarity index 100%
rename from modules/system/apps/flatpak/default.nix
rename to modules/system/apps/flatpak.nix
diff --git a/modules/system/apps/qemu/default.nix b/modules/system/apps/qemu.nix
similarity index 100%
rename from modules/system/apps/qemu/default.nix
rename to modules/system/apps/qemu.nix
diff --git a/modules/system/apps/steam/default.nix b/modules/system/apps/steam.nix
similarity index 100%
rename from modules/system/apps/steam/default.nix
rename to modules/system/apps/steam.nix
diff --git a/modules/system/desktop/default.nix b/modules/system/desktop/default.nix
index 026a1f7..01db9ec 100644
--- a/modules/system/desktop/default.nix
+++ b/modules/system/desktop/default.nix
@@ -2,8 +2,7 @@
 
 {
   imports = [
-    ./gnome
-    # ./hyprland
-    ./plasma
+    ./gnome.nix
+    ./plasma.nix
   ];
 }
\ No newline at end of file
diff --git a/modules/system/desktop/gnome/default.nix b/modules/system/desktop/gnome.nix
similarity index 100%
rename from modules/system/desktop/gnome/default.nix
rename to modules/system/desktop/gnome.nix
diff --git a/modules/system/desktop/plasma/default.nix b/modules/system/desktop/plasma.nix
similarity index 100%
rename from modules/system/desktop/plasma/default.nix
rename to modules/system/desktop/plasma.nix
diff --git a/modules/system/hardware/bluetooth/default.nix b/modules/system/hardware/bluetooth.nix
similarity index 100%
rename from modules/system/hardware/bluetooth/default.nix
rename to modules/system/hardware/bluetooth.nix
diff --git a/modules/system/hardware/default.nix b/modules/system/hardware/default.nix
index d70612d..5525334 100644
--- a/modules/system/hardware/default.nix
+++ b/modules/system/hardware/default.nix
@@ -2,13 +2,13 @@
 
 {
   imports = [
-    ./bluetooth
-    ./gamingKernel
+    ./bluetooth.nix
+    ./gaming-kernel.nix
     ./keymaps
-    ./nvidia
-    ./pipewire
-    ./plymouth
-    ./printing
-    ./waydroid
+    ./nvidia.nix
+    ./pipewire.nix
+    ./plymouth.nix
+    ./printing.nix
+    ./waydroid.nix
   ];
 }
\ No newline at end of file
diff --git a/modules/system/hardware/gamingKernel/default.nix b/modules/system/hardware/gaming-kernel.nix
similarity index 100%
rename from modules/system/hardware/gamingKernel/default.nix
rename to modules/system/hardware/gaming-kernel.nix
diff --git a/modules/system/hardware/nvidia/default.nix b/modules/system/hardware/nvidia.nix
similarity index 100%
rename from modules/system/hardware/nvidia/default.nix
rename to modules/system/hardware/nvidia.nix
diff --git a/modules/system/hardware/pipewire/default.nix b/modules/system/hardware/pipewire.nix
similarity index 100%
rename from modules/system/hardware/pipewire/default.nix
rename to modules/system/hardware/pipewire.nix
diff --git a/modules/system/hardware/plymouth/default.nix b/modules/system/hardware/plymouth.nix
similarity index 100%
rename from modules/system/hardware/plymouth/default.nix
rename to modules/system/hardware/plymouth.nix
diff --git a/modules/system/hardware/printing/default.nix b/modules/system/hardware/printing.nix
similarity index 100%
rename from modules/system/hardware/printing/default.nix
rename to modules/system/hardware/printing.nix
diff --git a/modules/system/hardware/waydroid/default.nix b/modules/system/hardware/waydroid.nix
similarity index 100%
rename from modules/system/hardware/waydroid/default.nix
rename to modules/system/hardware/waydroid.nix
diff --git a/modules/system/services/default.nix b/modules/system/services/default.nix
index 9d05b9d..7161ded 100644
--- a/modules/system/services/default.nix
+++ b/modules/system/services/default.nix
@@ -2,9 +2,9 @@
 
 {
   imports = [
-    ./distrobox
-    ./docker
-    ./ollama
-    ./openssh
+    ./distrobox.nix
+    ./docker.nix
+    ./ollama.nix
+    ./openssh.nix
   ];
 }
\ No newline at end of file
diff --git a/modules/system/services/distrobox/default.nix b/modules/system/services/distrobox.nix
similarity index 100%
rename from modules/system/services/distrobox/default.nix
rename to modules/system/services/distrobox.nix
diff --git a/modules/system/services/docker/default.nix b/modules/system/services/docker.nix
similarity index 100%
rename from modules/system/services/docker/default.nix
rename to modules/system/services/docker.nix
diff --git a/modules/system/services/ollama/default.nix b/modules/system/services/ollama.nix
similarity index 100%
rename from modules/system/services/ollama/default.nix
rename to modules/system/services/ollama.nix
diff --git a/modules/system/services/openssh/default.nix b/modules/system/services/openssh.nix
similarity index 100%
rename from modules/system/services/openssh/default.nix
rename to modules/system/services/openssh.nix