diff --git a/flake.nix b/flake.nix
index c41b67c..c53a39d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,19 +33,10 @@
     };    
     nixosConfigurations.universedesktop = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
+      specialArgs = attrs;
       modules =
         [
-          ./configuration.nix
-          ./programs/art.nix
-          ./programs/audio.nix
-          ./programs/cad.nix
-          ./programs/desktop.nix
-          ./programs/games.nix
-          ./programs/office.nix
-          ./programs/programming.nix
-          ./programs/terminal.nix
-          ./programs/video.nix
-          ./printing.nix
+          ./machines/universedesktop/configuration.nix
         ];
     };
   };
diff --git a/configuration.nix b/machines/universedesktop/configuration.nix
similarity index 94%
rename from configuration.nix
rename to machines/universedesktop/configuration.nix
index 7bcdb88..5489a8c 100644
--- a/configuration.nix
+++ b/machines/universedesktop/configuration.nix
@@ -2,11 +2,23 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ lib, config, pkgs, ... }: {
+{ lib, config, pkgs, nixpkgs, ... }: {
     nix.settings.auto-optimise-store = true;
+    nix.registry.nixpkgs.flake = nixpkgs;
     imports =
       [ # Include the results of the hardware scan.
         ./hardware-configuration.nix
+
+        ./programs/art.nix
+        ./programs/audio.nix
+        ./programs/cad.nix
+        ./programs/desktop.nix
+        ./programs/games.nix
+        ./programs/office.nix
+        ./programs/programming.nix
+        ./programs/terminal.nix
+        ./programs/video.nix
+        ./printing.nix
       ];
 
     fileSystems."/home/universe/tmp" = {
@@ -199,7 +211,7 @@
     # Enable the OpenSSH daemon.
     services.openssh.enable = true;
     services.openssh.ports = [7000];
-
+    services.openssh.settings.X11Forwarding = true;
     # Tailscale
     services.tailscale = {
       enable = true;
diff --git a/hardware-configuration.nix b/machines/universedesktop/hardware-configuration.nix
similarity index 100%
rename from hardware-configuration.nix
rename to machines/universedesktop/hardware-configuration.nix
diff --git a/printing.nix b/machines/universedesktop/printing.nix
similarity index 100%
rename from printing.nix
rename to machines/universedesktop/printing.nix
diff --git a/programs/art.nix b/machines/universedesktop/programs/art.nix
similarity index 100%
rename from programs/art.nix
rename to machines/universedesktop/programs/art.nix
diff --git a/programs/audio.nix b/machines/universedesktop/programs/audio.nix
similarity index 100%
rename from programs/audio.nix
rename to machines/universedesktop/programs/audio.nix
diff --git a/programs/cad.nix b/machines/universedesktop/programs/cad.nix
similarity index 100%
rename from programs/cad.nix
rename to machines/universedesktop/programs/cad.nix
diff --git a/programs/desktop.nix b/machines/universedesktop/programs/desktop.nix
similarity index 100%
rename from programs/desktop.nix
rename to machines/universedesktop/programs/desktop.nix
diff --git a/programs/games.nix b/machines/universedesktop/programs/games.nix
similarity index 100%
rename from programs/games.nix
rename to machines/universedesktop/programs/games.nix
diff --git a/programs/gtitles.c b/machines/universedesktop/programs/gtitles.c
similarity index 100%
rename from programs/gtitles.c
rename to machines/universedesktop/programs/gtitles.c
diff --git a/programs/office.nix b/machines/universedesktop/programs/office.nix
similarity index 100%
rename from programs/office.nix
rename to machines/universedesktop/programs/office.nix
diff --git a/programs/programming.nix b/machines/universedesktop/programs/programming.nix
similarity index 100%
rename from programs/programming.nix
rename to machines/universedesktop/programs/programming.nix
diff --git a/programs/terminal.nix b/machines/universedesktop/programs/terminal.nix
similarity index 100%
rename from programs/terminal.nix
rename to machines/universedesktop/programs/terminal.nix
diff --git a/programs/video.nix b/machines/universedesktop/programs/video.nix
similarity index 100%
rename from programs/video.nix
rename to machines/universedesktop/programs/video.nix