diff --git a/flake.lock b/flake.lock
index 56fa978..48fa56a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -32,11 +32,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1734649281,
-        "narHash": "sha256-NuqS+O4AVcRE6pPjoK3Pm/2w+GCeMHPlr5XMTHR3LvM=",
+        "lastModified": 1735177024,
+        "narHash": "sha256-MbhBmxPeUma3Kan3N8TS1mwUERWJR/gRaOTIboZATF8=",
         "owner": "lilyinstarlight",
         "repo": "nixos-cosmic",
-        "rev": "0370a4df2f768ce8a028c7ba01b4704a5f9b065f",
+        "rev": "7d7a5bfee808b80658300a4421cf97d1efc44dc4",
         "type": "github"
       },
       "original": {
@@ -267,11 +267,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1734424634,
-        "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
+        "lastModified": 1734649271,
+        "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
+        "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
         "type": "github"
       },
       "original": {
@@ -283,11 +283,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1734323986,
-        "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=",
+        "lastModified": 1734991663,
+        "narHash": "sha256-8T660guvdaOD+2/Cj970bWlQwAyZLKrrbkhYOFcY1YE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "394571358ce82dff7411395829aa6a3aad45b907",
+        "rev": "6c90912761c43e22b6fb000025ab96dd31c971ff",
         "type": "github"
       },
       "original": {
@@ -1477,11 +1477,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734489114,
-        "narHash": "sha256-dKBBZr2pw7KDI/7GeiN5qPccqqtvnK2jqAMcMo4rVvU=",
+        "lastModified": 1735093658,
+        "narHash": "sha256-eIUYGDtairggo7+JXSwN7b6Zr03BJ7tsZL/U0NkDr0s=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "b2e385f8e5c1d7c0d9ce738d650955c2e94555ae",
+        "rev": "ca249a1d98eff27e92665ac462b9d47f58141925",
         "type": "github"
       },
       "original": {
diff --git a/configs/gpdPocket3/configuration.nix b/hosts/gpdPocket3/configuration.nix
similarity index 100%
rename from configs/gpdPocket3/configuration.nix
rename to hosts/gpdPocket3/configuration.nix
diff --git a/configs/gpdPocket3/flake.nix b/hosts/gpdPocket3/flake.nix
similarity index 100%
rename from configs/gpdPocket3/flake.nix
rename to hosts/gpdPocket3/flake.nix
diff --git a/configs/gpdPocket3/hardware-configuration.nix b/hosts/gpdPocket3/hardware-configuration.nix
similarity index 100%
rename from configs/gpdPocket3/hardware-configuration.nix
rename to hosts/gpdPocket3/hardware-configuration.nix
diff --git a/configs/h002/configuration.nix b/hosts/h002/configuration.nix
similarity index 100%
rename from configs/h002/configuration.nix
rename to hosts/h002/configuration.nix
diff --git a/configs/h002/flake.nix b/hosts/h002/flake.nix
similarity index 100%
rename from configs/h002/flake.nix
rename to hosts/h002/flake.nix
diff --git a/configs/h002/hardware-configuration.nix b/hosts/h002/hardware-configuration.nix
similarity index 100%
rename from configs/h002/hardware-configuration.nix
rename to hosts/h002/hardware-configuration.nix
diff --git a/configs/lio/configuration.nix b/hosts/lio/configuration.nix
similarity index 100%
rename from configs/lio/configuration.nix
rename to hosts/lio/configuration.nix
diff --git a/configs/lio/flake.nix b/hosts/lio/flake.nix
similarity index 100%
rename from configs/lio/flake.nix
rename to hosts/lio/flake.nix
diff --git a/configs/lio/hardware-configuration.nix b/hosts/lio/hardware-configuration.nix
similarity index 100%
rename from configs/lio/hardware-configuration.nix
rename to hosts/lio/hardware-configuration.nix
diff --git a/configs/oren/configuration.nix b/hosts/oren/configuration.nix
similarity index 100%
rename from configs/oren/configuration.nix
rename to hosts/oren/configuration.nix
diff --git a/configs/oren/flake.lock b/hosts/oren/flake.lock
similarity index 95%
rename from configs/oren/flake.lock
rename to hosts/oren/flake.lock
index 05b9a05..5dcec72 100644
--- a/configs/oren/flake.lock
+++ b/hosts/oren/flake.lock
@@ -130,11 +130,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-q8gMFwivaZtlaqp44mV7W5M8T5RkBhvjnikr6Ed4xIQ=",
-        "path": "/nix/store/37xsf6hrn243an0ynwflam47sqzja5ki-source/modules/boot_systemd",
+        "path": "/nix/store/prvi2x26ymzgydzr49na2qs7ihgjrq2d-source/modules/boot_systemd",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/37xsf6hrn243an0ynwflam47sqzja5ki-source/modules/boot_systemd",
+        "path": "/nix/store/prvi2x26ymzgydzr49na2qs7ihgjrq2d-source/modules/boot_systemd",
         "type": "path"
       }
     },
@@ -147,12 +147,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-44urGkCVL5AUQeHR9OUKn9f/r3k4wRDWOsbE+nzxBEk=",
-        "path": "/nix/store/37xsf6hrn243an0ynwflam47sqzja5ki-source/modules/common",
+        "narHash": "sha256-lWrwhvR+E4BC9vSKptGrAKy0C12HeasTMCtDmqI0rdY=",
+        "path": "/nix/store/prvi2x26ymzgydzr49na2qs7ihgjrq2d-source/modules/common",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/37xsf6hrn243an0ynwflam47sqzja5ki-source/modules/common",
+        "path": "/nix/store/prvi2x26ymzgydzr49na2qs7ihgjrq2d-source/modules/common",
         "type": "path"
       }
     },
diff --git a/configs/oren/flake.nix b/hosts/oren/flake.nix
similarity index 100%
rename from configs/oren/flake.nix
rename to hosts/oren/flake.nix
diff --git a/configs/oren/hardware-configuration.nix b/hosts/oren/hardware-configuration.nix
similarity index 100%
rename from configs/oren/hardware-configuration.nix
rename to hosts/oren/hardware-configuration.nix
diff --git a/modules/common/flake.nix b/modules/common/flake.nix
index cd34779..ed5bdf3 100644
--- a/modules/common/flake.nix
+++ b/modules/common/flake.nix
@@ -110,7 +110,7 @@
                 clean.enable = true;
                 clean.extraArgs = "--keep 10";
                 # TODO this may need to be defined higher up if it is ever different for a machine...
-                flake = "/home/${cfg.primaryUser}/.config/nixos-config/configs/${cfg.systemName}";
+                flake = "/home/${cfg.primaryUser}/.config/nixos-config/hosts/${cfg.systemName}";
               };
 
               # Remote build off home lio computer