diff --git a/flake.nix b/flake.nix
index 0c04a26..1025a20 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,7 +15,7 @@
       ];
 
       flake = {
-        nixosConfigurations = import ./outputs/nixos {inherit self inputs nixpkgs;};
+        nixosConfigurations = import ./outputs/nixos.nix {inherit self inputs nixpkgs;};
       };
 
     });
diff --git a/outputs/nixos/ooks-x1/default.nix b/inputs/system/hosts/ooks-x1/default.nix
similarity index 100%
rename from outputs/nixos/ooks-x1/default.nix
rename to inputs/system/hosts/ooks-x1/default.nix
diff --git a/outputs/nixos/ooks-x1/hardware-configuration.nix b/inputs/system/hosts/ooks-x1/hardware-configuration.nix
similarity index 100%
rename from outputs/nixos/ooks-x1/hardware-configuration.nix
rename to inputs/system/hosts/ooks-x1/hardware-configuration.nix
diff --git a/outputs/nixos/ooksdesk/default.nix b/inputs/system/hosts/ooksdesk/default.nix
similarity index 100%
rename from outputs/nixos/ooksdesk/default.nix
rename to inputs/system/hosts/ooksdesk/default.nix
diff --git a/outputs/nixos/ooksdesk/hardware-configuration.nix b/inputs/system/hosts/ooksdesk/hardware-configuration.nix
similarity index 100%
rename from outputs/nixos/ooksdesk/hardware-configuration.nix
rename to inputs/system/hosts/ooksdesk/hardware-configuration.nix
diff --git a/outputs/nixos/ooksmedia/default.nix b/inputs/system/hosts/ooksmedia/default.nix
similarity index 100%
rename from outputs/nixos/ooksmedia/default.nix
rename to inputs/system/hosts/ooksmedia/default.nix
diff --git a/outputs/nixos/ooksmedia/hardware-configuration.nix b/inputs/system/hosts/ooksmedia/hardware-configuration.nix
similarity index 100%
rename from outputs/nixos/ooksmedia/hardware-configuration.nix
rename to inputs/system/hosts/ooksmedia/hardware-configuration.nix
diff --git a/outputs/nixos/ooksmedia/nixarr.nix b/inputs/system/hosts/ooksmedia/nixarr.nix
similarity index 100%
rename from outputs/nixos/ooksmedia/nixarr.nix
rename to inputs/system/hosts/ooksmedia/nixarr.nix
diff --git a/outputs/nixos/ooksmicro/default.nix b/inputs/system/hosts/ooksmicro/default.nix
similarity index 100%
rename from outputs/nixos/ooksmicro/default.nix
rename to inputs/system/hosts/ooksmicro/default.nix
diff --git a/outputs/nixos/ooksmicro/hardware-configuration.nix b/inputs/system/hosts/ooksmicro/hardware-configuration.nix
similarity index 100%
rename from outputs/nixos/ooksmicro/hardware-configuration.nix
rename to inputs/system/hosts/ooksmicro/hardware-configuration.nix
diff --git a/outputs/nixos/ooksphone/default.nix b/inputs/system/hosts/ooksphone/default.nix
similarity index 100%
rename from outputs/nixos/ooksphone/default.nix
rename to inputs/system/hosts/ooksphone/default.nix
diff --git a/outputs/nixos/ooksphone/modules/default.nix b/inputs/system/hosts/ooksphone/modules/default.nix
similarity index 100%
rename from outputs/nixos/ooksphone/modules/default.nix
rename to inputs/system/hosts/ooksphone/modules/default.nix
diff --git a/outputs/nixos/ooksphone/modules/openssh.nix b/inputs/system/hosts/ooksphone/modules/openssh.nix
similarity index 100%
rename from outputs/nixos/ooksphone/modules/openssh.nix
rename to inputs/system/hosts/ooksphone/modules/openssh.nix
diff --git a/outputs/nixos/ooksphone/modules/theme.nix b/inputs/system/hosts/ooksphone/modules/theme.nix
similarity index 100%
rename from outputs/nixos/ooksphone/modules/theme.nix
rename to inputs/system/hosts/ooksphone/modules/theme.nix
diff --git a/outputs/nixos/ookst480s/default.nix b/inputs/system/hosts/ookst480s/default.nix
similarity index 100%
rename from outputs/nixos/ookst480s/default.nix
rename to inputs/system/hosts/ookst480s/default.nix
diff --git a/outputs/nixos/ookst480s/hardware-configuration.nix b/inputs/system/hosts/ookst480s/hardware-configuration.nix
similarity index 100%
rename from outputs/nixos/ookst480s/hardware-configuration.nix
rename to inputs/system/hosts/ookst480s/hardware-configuration.nix
diff --git a/outputs/nixos/default.nix b/outputs/nixos.nix
similarity index 86%
rename from outputs/nixos/default.nix
rename to outputs/nixos.nix
index f5d7762..c4bf348 100644
--- a/outputs/nixos/default.nix
+++ b/outputs/nixos.nix
@@ -6,6 +6,7 @@ let
   hm = inputs.home-manager.nixosModules.home-manager;
 
   systemInputs = "${self}/inputs/system";
+  hosts = "${systemInputs}/hosts";
   base = "${systemInputs}/modules/base";
 
   specialArgs = {inherit inputs self;};
@@ -16,7 +17,7 @@ in
     inherit specialArgs;
     system = "x86_64-linux";
     modules = [
-      ./ooksdesk
+      "${hosts}/ooksdesk"
       hm
       base
     ];