diff --git a/nixos76/system/configuration.nix b/config/systems/nixos76/default.nix
similarity index 100%
rename from nixos76/system/configuration.nix
rename to config/systems/nixos76/default.nix
diff --git a/nixos76/system/hardware-configuration.nix b/config/systems/nixos76/hardware-configuration.nix
similarity index 100%
rename from nixos76/system/hardware-configuration.nix
rename to config/systems/nixos76/hardware-configuration.nix
diff --git a/nixos76/alex/home.nix b/config/users/alex/default.nix
similarity index 100%
rename from nixos76/alex/home.nix
rename to config/users/alex/default.nix
diff --git a/flake.nix b/flake.nix
index 9f6953f..fb8292b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,13 +28,13 @@
         nixos76 = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           modules = [
-            ./nixos76/system/configuration.nix
+            ./config/systems/nixos76
             home-manager.nixosModules.home-manager
             {
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
               home-manager.backupFileExtension = "backup";
-              home-manager.users.alex = import ./nixos76/alex/home.nix;
+              home-manager.users.alex = import ./config/users/alex/default.nix;
               # Optionally, use home-manager.extraSpecialArgs to pass
               # arguments to home.nix
             }
@@ -49,7 +49,7 @@
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
               home-manager.backupFileExtension = "backup";
-              home-manager.users.alex = import ./nixos76/alex/home.nix;
+              home-manager.users.alex = import ./config/users/alex/default.nix;
               home-manager.extraSpecialArgs = { ff = firefox-addons.packages.${system}; };
             }
           ];