diff --git a/flake.nix b/flake.nix
index a1b1572..6256f4d 100755
--- a/flake.nix
+++ b/flake.nix
@@ -46,12 +46,12 @@
   };
 
   outputs = { self, nixpkgs, nixpkgs-stable, home-manager, flatpaks, rust-overlay, nur, chaotic, aagl, nixGL }: {
-    nixosConfigurations = import ./hosts/nixos.nix {
+    nixosConfigurations = import ./nixos {
       inherit nixpkgs nixpkgs-stable home-manager flatpaks rust-overlay nur chaotic aagl nixGL;
     };
 
     # For *nix systems that are not NixOS or macOS
-    homeConfigurations = import ./hosts/home-manager.nix {
+    homeConfigurations = import ./home-manager.nix {
       inherit nixpkgs nixpkgs-stable home-manager flatpaks rust-overlay nur chaotic aagl nixGL;
     };
   };
diff --git a/hosts/home-manager.nix b/home-manager.nix
similarity index 100%
rename from hosts/home-manager.nix
rename to home-manager.nix
diff --git a/hosts/nixos.nix b/nixos/default.nix
similarity index 100%
rename from hosts/nixos.nix
rename to nixos/default.nix
diff --git a/hosts/latitude7390-loki-nixos/configuration.nix b/nixos/latitude7390-loki-nixos/configuration.nix
similarity index 100%
rename from hosts/latitude7390-loki-nixos/configuration.nix
rename to nixos/latitude7390-loki-nixos/configuration.nix
diff --git a/hosts/latitude7390-loki-nixos/default.nix b/nixos/latitude7390-loki-nixos/default.nix
similarity index 100%
rename from hosts/latitude7390-loki-nixos/default.nix
rename to nixos/latitude7390-loki-nixos/default.nix
diff --git a/hosts/latitude7390-loki-nixos/hardware-configuration.nix b/nixos/latitude7390-loki-nixos/hardware-configuration.nix
similarity index 100%
rename from hosts/latitude7390-loki-nixos/hardware-configuration.nix
rename to nixos/latitude7390-loki-nixos/hardware-configuration.nix
diff --git a/hosts/latitude7390-loki-nixos/home.nix b/nixos/latitude7390-loki-nixos/home.nix
similarity index 100%
rename from hosts/latitude7390-loki-nixos/home.nix
rename to nixos/latitude7390-loki-nixos/home.nix
diff --git a/hosts/omen25l-odin-nixos/configuration.nix b/nixos/omen25l-odin-nixos/configuration.nix
similarity index 100%
rename from hosts/omen25l-odin-nixos/configuration.nix
rename to nixos/omen25l-odin-nixos/configuration.nix
diff --git a/hosts/omen25l-odin-nixos/default.nix b/nixos/omen25l-odin-nixos/default.nix
similarity index 100%
rename from hosts/omen25l-odin-nixos/default.nix
rename to nixos/omen25l-odin-nixos/default.nix
diff --git a/hosts/omen25l-odin-nixos/home.nix b/nixos/omen25l-odin-nixos/home.nix
similarity index 100%
rename from hosts/omen25l-odin-nixos/home.nix
rename to nixos/omen25l-odin-nixos/home.nix
diff --git a/hosts/temp-installer-nixos/configuration.nix b/nixos/temp-installer-nixos/configuration.nix
similarity index 100%
rename from hosts/temp-installer-nixos/configuration.nix
rename to nixos/temp-installer-nixos/configuration.nix
diff --git a/hosts/temp-installer-nixos/default.nix b/nixos/temp-installer-nixos/default.nix
similarity index 100%
rename from hosts/temp-installer-nixos/default.nix
rename to nixos/temp-installer-nixos/default.nix
diff --git a/hosts/temp-installer-nixos/home.nix b/nixos/temp-installer-nixos/home.nix
similarity index 100%
rename from hosts/temp-installer-nixos/home.nix
rename to nixos/temp-installer-nixos/home.nix