diff --git a/modules/3dprinting.nix b/desktop/3dprinting.nix
similarity index 100%
rename from modules/3dprinting.nix
rename to desktop/3dprinting.nix
diff --git a/modules/crypto.nix b/desktop/crypto.nix
similarity index 100%
rename from modules/crypto.nix
rename to desktop/crypto.nix
diff --git a/modules/dev.nix b/desktop/dev.nix
similarity index 100%
rename from modules/dev.nix
rename to desktop/dev.nix
diff --git a/modules/gaming.nix b/desktop/gaming.nix
similarity index 100%
rename from modules/gaming.nix
rename to desktop/gaming.nix
diff --git a/modules/gnome.nix b/desktop/gnome.nix
similarity index 100%
rename from modules/gnome.nix
rename to desktop/gnome.nix
diff --git a/modules/office.nix b/desktop/office.nix
similarity index 100%
rename from modules/office.nix
rename to desktop/office.nix
diff --git a/modules/plasma.nix b/desktop/plasma.nix
similarity index 100%
rename from modules/plasma.nix
rename to desktop/plasma.nix
diff --git a/modules/virtualization.nix b/desktop/virtualization.nix
similarity index 87%
rename from modules/virtualization.nix
rename to desktop/virtualization.nix
index d321727..76f54b2 100755
--- a/modules/virtualization.nix
+++ b/desktop/virtualization.nix
@@ -2,12 +2,6 @@
 
 {
   virtualisation = {
-    docker = {
-      enable = true;
-      autoPrune = {
-        enable = true;
-        dates = "weekly";
-      };
     };
     libvirtd = {
       enable = true;
diff --git a/flake.nix b/flake.nix
index db2bde3..f19d54d 100755
--- a/flake.nix
+++ b/flake.nix
@@ -20,13 +20,10 @@
         ./systems/common.nix
         ./systems/framework.nix
         ./users/jsutter.nix
-        ./modules/plasma.nix
-        ./modules/dev.nix
-        ./modules/office.nix
-        ./modules/gaming.nix
-        ./modules/virtualization.nix
-        ./modules/crypto.nix
-        ./modules/3dprinting.nix
+        ./desktop/plasma.nix
+        ./desktop/dev.nix
+        ./desktop/office.nix
+        ./desktop/gaming.nix
         ];
       };
       aurora = nixpkgs.lib.nixosSystem {
@@ -35,12 +32,13 @@
         ./systems/common.nix
         ./systems/aurora.nix
         ./users/jsutter.nix
-        ./modules/plasma.nix
-        ./modules/dev.nix
-        ./modules/virtualization.nix
-        ./modules/office.nix
-        ./modules/gaming.nix
-#        ./modules/3dprinting.nix
+        ./desktop/plasma.nix
+        ./desktop/dev.nix
+        ./desktop/virtualization.nix
+        ./desktop/office.nix
+        ./desktop/gaming.nix
+	./servers/common.nix
+	./servers/hugo.nix
         ];
       };
       labrizor = nixpkgs.lib.nixosSystem {
@@ -51,9 +49,9 @@
         ./users/jsutter.nix
         ./users/isutter.nix
         ./users/aksutter.nix
-        ./modules/plasma.nix
-	./modules/virtualization.nix
-        ./modules/3dprinting.nix
+        ./desktop/plasma.nix
+	./desktop/virtualization.nix
+        ./desktop/3dprinting.nix
         ];
       };
     };
diff --git a/servers/common.nix b/servers/common.nix
new file mode 100644
index 0000000..b176501
--- /dev/null
+++ b/servers/common.nix
@@ -0,0 +1,4 @@
+virtualisation = {
+    podman = {
+      enable = true;
+    };