diff --git a/flake.lock b/flake.lock
index 029aa84..280ade7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -825,11 +825,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1728792359,
-        "narHash": "sha256-aXIK4Tat912rwK01FLeOoE0rrbZD8Q+KJb/SgW1WHUc=",
+        "lastModified": 1728794320,
+        "narHash": "sha256-5Dm+961fOsneg5nX6gBCHPHMdwF6/JbV5p0Zvmi6ybU=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "120a1adeb88d528d494bb0bad3572683716ff03d",
+        "rev": "15bee9bde462e0e47e7d34c78d50bb0cc718c6e4",
         "type": "github"
       },
       "original": {
diff --git a/glasshouse-desktop/sys/default.nix b/glasshouse-desktop/sys/default.nix
index 85255c2..c3a274e 100644
--- a/glasshouse-desktop/sys/default.nix
+++ b/glasshouse-desktop/sys/default.nix
@@ -2,13 +2,13 @@
 
 {
 	imports = 
-		[ (import ./bootloader.nix) ]
-	 ++ [ (import ./fonts.nix) ]
-	 ++ [ (import ./hardware.nix) ]
-	 ++ [ (import ./network.nix) ]
-	 ++ [ (import ./packages.nix) ]
-	 ++ [ (import ./programs.nix) ]
-	 ++ [ (import ./services.nix) ]
-	 ++ [ (import ./system.nix) ]
-	 ++ [ (import ./users.nix) ];
+		[ (import ./hardware/bootloader.nix) ]
+	 ++ [ (import ./software/fonts.nix) 	 ]
+	 ++ [ (import ./hardware/hardware.nix)   ]
+	 ++ [ (import ./hardware/network.nix) 	 ]
+	 ++ [ (import ./software/packages.nix)   ]
+	 ++ [ (import ./software/programs.nix)   ]
+	 ++ [ (import ./software/services.nix)   ]
+	 ++ [ (import ./hardware/system.nix)     ]
+	 ++ [ (import ./software/users.nix)      ];
 }
diff --git a/glasshouse-desktop/sys/bootloader.nix b/glasshouse-desktop/sys/hardware/bootloader.nix
similarity index 100%
rename from glasshouse-desktop/sys/bootloader.nix
rename to glasshouse-desktop/sys/hardware/bootloader.nix
diff --git a/glasshouse-desktop/sys/hardware.nix b/glasshouse-desktop/sys/hardware/hardware.nix
similarity index 100%
rename from glasshouse-desktop/sys/hardware.nix
rename to glasshouse-desktop/sys/hardware/hardware.nix
diff --git a/glasshouse-desktop/sys/network.nix b/glasshouse-desktop/sys/hardware/network.nix
similarity index 100%
rename from glasshouse-desktop/sys/network.nix
rename to glasshouse-desktop/sys/hardware/network.nix
diff --git a/glasshouse-desktop/sys/system.nix b/glasshouse-desktop/sys/hardware/system.nix
similarity index 100%
rename from glasshouse-desktop/sys/system.nix
rename to glasshouse-desktop/sys/hardware/system.nix
diff --git a/glasshouse-desktop/sys/fonts.nix b/glasshouse-desktop/sys/software/fonts.nix
similarity index 100%
rename from glasshouse-desktop/sys/fonts.nix
rename to glasshouse-desktop/sys/software/fonts.nix
diff --git a/glasshouse-desktop/sys/packages.nix b/glasshouse-desktop/sys/software/packages.nix
similarity index 100%
rename from glasshouse-desktop/sys/packages.nix
rename to glasshouse-desktop/sys/software/packages.nix
diff --git a/glasshouse-desktop/sys/programs.nix b/glasshouse-desktop/sys/software/programs.nix
similarity index 100%
rename from glasshouse-desktop/sys/programs.nix
rename to glasshouse-desktop/sys/software/programs.nix
diff --git a/glasshouse-desktop/sys/services.nix b/glasshouse-desktop/sys/software/services.nix
similarity index 100%
rename from glasshouse-desktop/sys/services.nix
rename to glasshouse-desktop/sys/software/services.nix
diff --git a/glasshouse-desktop/sys/users.nix b/glasshouse-desktop/sys/software/users.nix
similarity index 100%
rename from glasshouse-desktop/sys/users.nix
rename to glasshouse-desktop/sys/software/users.nix