diff --git a/flake.nix b/flake.nix
index 8353c071..15c45ef3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -44,11 +44,11 @@
         modules = [
           ./hosts/rustboro
           ./system
-          ./users/aly.nix
+          ./users/aly
           ./desktop/gnome
-          ./programs/podman
-          ./programs/steam
-          ./programs/via-qmk
+          ./modules/podman
+          ./modules/steam
+          ./modules/via-qmk
 
           # Add managed flatpak module.
           nix-flatpak.nixosModules.nix-flatpak
@@ -71,11 +71,11 @@
         modules = [
           ./hosts/petalburg
           ./system
-          ./users/aly.nix
+          ./users/aly
           ./desktop/gnome
-          ./programs/podman
-          ./programs/steam
-          ./programs/via-qmk
+          ./modules/podman
+          ./modules/steam
+          ./modules/via-qmk
 
           # Add managed flatpak module.
           nix-flatpak.nixosModules.nix-flatpak
diff --git a/programs/podman/default.nix b/modules/podman/default.nix
similarity index 100%
rename from programs/podman/default.nix
rename to modules/podman/default.nix
diff --git a/programs/steam/default.nix b/modules/steam/default.nix
similarity index 100%
rename from programs/steam/default.nix
rename to modules/steam/default.nix
diff --git a/programs/via-qmk/default.nix b/modules/via-qmk/default.nix
similarity index 100%
rename from programs/via-qmk/default.nix
rename to modules/via-qmk/default.nix
diff --git a/users/aly.nix b/users/aly/default.nix
similarity index 100%
rename from users/aly.nix
rename to users/aly/default.nix
diff --git a/users/dustin.nix b/users/dustin/default.nix
similarity index 100%
rename from users/dustin.nix
rename to users/dustin/default.nix