diff --git a/desktop/default.nix b/desktop/common.nix
similarity index 100%
rename from desktop/default.nix
rename to desktop/common.nix
diff --git a/desktop/gnome/default.nix b/desktop/gnome/default.nix
index dcdc35dd..febc70d4 100644
--- a/desktop/gnome/default.nix
+++ b/desktop/gnome/default.nix
@@ -3,7 +3,7 @@
 {
   imports =
     [ # Include X settings.
-      ../.
+      ../common.nix
     ];
 
   # Enable Gnome and GDM.
diff --git a/desktop/kde/default.nix b/desktop/kde.nix
similarity index 97%
rename from desktop/kde/default.nix
rename to desktop/kde.nix
index 59efcfb1..b4c0a205 100644
--- a/desktop/kde/default.nix
+++ b/desktop/kde.nix
@@ -3,7 +3,7 @@
 {
   imports =
     [ # Include X settings.
-      ../.
+      ./common.nix
     ];
 
   # Enable the KDE Plasma Desktop Environment.
diff --git a/flake.nix b/flake.nix
index 5d67c947..e5290522 100644
--- a/flake.nix
+++ b/flake.nix
@@ -59,7 +59,7 @@
         system = "x86_64-linux";
         modules = [
           ./hosts/rustboro
-          ./desktop/kde
+          ./desktop/kde.nix
           home-manager-unstable.nixosModules.home-manager
           nixos-hardware.nixosModules.lenovo-thinkpad-t440p
         ];
@@ -84,7 +84,7 @@
           ./hosts/mauville
           ./desktop/gnome
           ./modules/homelab
-          ./modules/steam
+          ./modules/steam.nix
           home-manager-unstable.nixosModules.home-manager
         ];
       };
diff --git a/home/aly/default.nix b/home/aly.nix
similarity index 96%
rename from home/aly/default.nix
rename to home/aly.nix
index 9cb76079..130922dd 100644
--- a/home/aly/default.nix
+++ b/home/aly.nix
@@ -2,7 +2,7 @@
 
 {
     imports = [
-        ../common.nix
+        ./common.nix
     ];
 
     # TODO please change the username & home directory to your own
diff --git a/home/nixos/default.nix b/home/nixos/default.nix
deleted file mode 100644
index 94ee9db0..00000000
--- a/home/nixos/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-    imports = [
-        ../common.nix
-    ];
-
-    home.username = "nixos";
-    home.homeDirectory = "/home/nixos";
-
-    # Packages that should be installed to the user profile.
-    home.packages = with pkgs; [
-        gparted
-        gnomeExtensions.appindicator
-        gnomeExtensions.blur-my-shell
-        gnomeExtensions.gsconnect
-        gnomeExtensions.light-shell
-        gnomeExtensions.night-theme-switcher
-        gnomeExtensions.noannoyance-fork
-        gnomeExtensions.tailscale-status
-        gnomeExtensions.tiling-assistant
-    ];
-}
diff --git a/hosts/lavaridge/default.nix b/hosts/lavaridge/default.nix
index 8123f2be..6775c2af 100644
--- a/hosts/lavaridge/default.nix
+++ b/hosts/lavaridge/default.nix
@@ -6,7 +6,7 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ../../users/aly
+      ../../users/aly.nix
       ../../system
     ];
 
diff --git a/hosts/mauville/default.nix b/hosts/mauville/default.nix
index 27c6f3ce..41fb78f1 100644
--- a/hosts/mauville/default.nix
+++ b/hosts/mauville/default.nix
@@ -6,7 +6,7 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ../../users/aly
+      ../../users/aly.nix
       ../../system
     ];
 
diff --git a/hosts/petalburg/default.nix b/hosts/petalburg/default.nix
index 0536c3a9..509f4c4e 100644
--- a/hosts/petalburg/default.nix
+++ b/hosts/petalburg/default.nix
@@ -43,7 +43,7 @@ in {
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ../../users/aly
+      ../../users/aly.nix
       ../../system
     ];
 
diff --git a/hosts/rustboro/default.nix b/hosts/rustboro/default.nix
index f5e62a99..f24fc0c5 100644
--- a/hosts/rustboro/default.nix
+++ b/hosts/rustboro/default.nix
@@ -6,7 +6,7 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ../../users/aly
+      ../../users/aly.nix
       ../../system
     ];
 
diff --git a/modules/homelab/default.nix b/modules/homelab/default.nix
index 50bd08ad..a072b217 100644
--- a/modules/homelab/default.nix
+++ b/modules/homelab/default.nix
@@ -2,8 +2,8 @@
 
 {
     imports = [
-        ./virtualization
-        ./reverse_proxy
+        ./virtualization.nix
+        ./nginx_proxy.nix
     ];
 
     # services.ddclient.enable = true;
diff --git a/modules/homelab/reverse_proxy/default.nix b/modules/homelab/nginx_proxy.nix
similarity index 100%
rename from modules/homelab/reverse_proxy/default.nix
rename to modules/homelab/nginx_proxy.nix
diff --git a/modules/homelab/virtualization/default.nix b/modules/homelab/virtualization.nix
similarity index 100%
rename from modules/homelab/virtualization/default.nix
rename to modules/homelab/virtualization.nix
diff --git a/modules/steam/default.nix b/modules/steam.nix
similarity index 100%
rename from modules/steam/default.nix
rename to modules/steam.nix
diff --git a/system/default.nix b/system/default.nix
index 7316c6c4..7bf2a20a 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -3,8 +3,8 @@
 {
   imports =
     [
-      ./network
-      ./sound
+      ./network.nix
+      ./sound.nix
     ];
   # Set your time zone.
   time.timeZone = "America/New_York";
diff --git a/system/network/default.nix b/system/network.nix
similarity index 100%
rename from system/network/default.nix
rename to system/network.nix
diff --git a/system/sound/default.nix b/system/sound.nix
similarity index 100%
rename from system/sound/default.nix
rename to system/sound.nix
diff --git a/users/aly/default.nix b/users/aly.nix
similarity index 83%
rename from users/aly/default.nix
rename to users/aly.nix
index e0e72f25..003e6682 100644
--- a/users/aly/default.nix
+++ b/users/aly.nix
@@ -8,5 +8,5 @@
     extraGroups = [ "networkmanager" "wheel" "docker" "libvirtd" ];
   };
 
-  home-manager.users.aly = import ../../home/aly;
+  home-manager.users.aly = import ../home/aly.nix;
 }