diff --git a/flake/nixos.nix b/flake/nixos.nix
index 7df08ce..befcba0 100644
--- a/flake/nixos.nix
+++ b/flake/nixos.nix
@@ -5,11 +5,11 @@ let
 
   hm = inputs.home-manager.nixosModules.home-manager;
 
-  systemInputs = "${self}/sys";
-  hosts = "${systemInputs}/hosts";
-  base = "${systemInputs}/modules/base";
+  sys = "${self}/sys";
+  hosts = "${self}/hosts";
 
-  roles = "${systemInputs}/modules/roles";
+  base = "${sys}/modules/base";
+  roles = "${sys}/modules/roles";
   gaming = "${roles}/gaming";
   workstation = "${roles}/workstation";
   media-server = "${roles}/media-server";
diff --git a/sys/hosts/ooks-x1/default.nix b/hosts/ooks-x1/default.nix
similarity index 100%
rename from sys/hosts/ooks-x1/default.nix
rename to hosts/ooks-x1/default.nix
diff --git a/sys/hosts/ooks-x1/hardware-configuration.nix b/hosts/ooks-x1/hardware-configuration.nix
similarity index 100%
rename from sys/hosts/ooks-x1/hardware-configuration.nix
rename to hosts/ooks-x1/hardware-configuration.nix
diff --git a/sys/hosts/ooksdesk/default.nix b/hosts/ooksdesk/default.nix
similarity index 100%
rename from sys/hosts/ooksdesk/default.nix
rename to hosts/ooksdesk/default.nix
diff --git a/sys/hosts/ooksdesk/hardware-configuration.nix b/hosts/ooksdesk/hardware-configuration.nix
similarity index 100%
rename from sys/hosts/ooksdesk/hardware-configuration.nix
rename to hosts/ooksdesk/hardware-configuration.nix
diff --git a/sys/hosts/ooksmedia/default.nix b/hosts/ooksmedia/default.nix
similarity index 100%
rename from sys/hosts/ooksmedia/default.nix
rename to hosts/ooksmedia/default.nix
diff --git a/sys/hosts/ooksmedia/hardware-configuration.nix b/hosts/ooksmedia/hardware-configuration.nix
similarity index 100%
rename from sys/hosts/ooksmedia/hardware-configuration.nix
rename to hosts/ooksmedia/hardware-configuration.nix
diff --git a/sys/hosts/ooksmicro/default.nix b/hosts/ooksmicro/default.nix
similarity index 100%
rename from sys/hosts/ooksmicro/default.nix
rename to hosts/ooksmicro/default.nix
diff --git a/sys/hosts/ooksmicro/hardware-configuration.nix b/hosts/ooksmicro/hardware-configuration.nix
similarity index 100%
rename from sys/hosts/ooksmicro/hardware-configuration.nix
rename to hosts/ooksmicro/hardware-configuration.nix
diff --git a/sys/hosts/ooksphone/default.nix b/hosts/ooksphone/default.nix
similarity index 100%
rename from sys/hosts/ooksphone/default.nix
rename to hosts/ooksphone/default.nix
diff --git a/sys/hosts/ooksphone/modules/default.nix b/hosts/ooksphone/modules/default.nix
similarity index 100%
rename from sys/hosts/ooksphone/modules/default.nix
rename to hosts/ooksphone/modules/default.nix
diff --git a/sys/hosts/ooksphone/modules/openssh.nix b/hosts/ooksphone/modules/openssh.nix
similarity index 100%
rename from sys/hosts/ooksphone/modules/openssh.nix
rename to hosts/ooksphone/modules/openssh.nix
diff --git a/sys/hosts/ooksphone/modules/theme.nix b/hosts/ooksphone/modules/theme.nix
similarity index 100%
rename from sys/hosts/ooksphone/modules/theme.nix
rename to hosts/ooksphone/modules/theme.nix
diff --git a/sys/hosts/ookst480s/default.nix b/hosts/ookst480s/default.nix
similarity index 100%
rename from sys/hosts/ookst480s/default.nix
rename to hosts/ookst480s/default.nix
diff --git a/sys/hosts/ookst480s/hardware-configuration.nix b/hosts/ookst480s/hardware-configuration.nix
similarity index 100%
rename from sys/hosts/ookst480s/hardware-configuration.nix
rename to hosts/ookst480s/hardware-configuration.nix