diff --git a/flake.nix b/flake.nix
index 1855c6f..84254a8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,7 +20,7 @@
           }
           ./system
           ./system/desktop.nix
-          ./system/hardware-nova.nix
+          ./system/hardware/nova.nix
           ./system/gnome.nix
           ./system/steam.nix
           ./system/btrbk.nix
@@ -37,7 +37,7 @@
           }
           ./system
           ./system/desktop.nix
-          ./system/hardware-tron.nix
+          ./system/hardware/tron.nix
           ./system/gnome.nix
           ./system/btrbk.nix
           ./system/yubikey.nix
@@ -57,7 +57,7 @@
           }
           ./system
           ./system/desktop.nix
-          ./system/hardware-romulus.nix
+          ./system/hardware/romulus.nix
         ];
       };
 
@@ -70,8 +70,10 @@
             boot.loader.grub.device = "/dev/sda";
           }
           ./system
-          ./system/web-server.nix
-          ./system/hardware-arielle.nix
+          ./system/web-server
+          ./system/web-server/outline.nix
+          ./system/web-server/jenkins.nix
+          ./system/hardware/arielle.nix
         ];
       };
 
diff --git a/system/hardware-arielle.nix b/system/hardware/arielle.nix
similarity index 100%
rename from system/hardware-arielle.nix
rename to system/hardware/arielle.nix
diff --git a/system/hardware-ernst.nix b/system/hardware/ernst.nix
similarity index 100%
rename from system/hardware-ernst.nix
rename to system/hardware/ernst.nix
diff --git a/system/hardware-nova.nix b/system/hardware/nova.nix
similarity index 100%
rename from system/hardware-nova.nix
rename to system/hardware/nova.nix
diff --git a/system/hardware-romulus.nix b/system/hardware/romulus.nix
similarity index 100%
rename from system/hardware-romulus.nix
rename to system/hardware/romulus.nix
diff --git a/system/hardware-tron.nix b/system/hardware/tron.nix
similarity index 100%
rename from system/hardware-tron.nix
rename to system/hardware/tron.nix
diff --git a/system/web-server/default.nix b/system/web-server/default.nix
new file mode 100644
index 0000000..dc4a0fa
--- /dev/null
+++ b/system/web-server/default.nix
@@ -0,0 +1,21 @@
+{ config, pkgs, ... }:
+
+{
+  nixpkgs.config.allowUnfree = true;
+
+  networking.firewall.allowedTCPPorts = [ 80 443 ];
+
+  services.jenkins.enable = true;
+
+  services.nginx = {
+    enable = true;
+    recommendedProxySettings = true;
+    recommendedTlsSettings = true;
+  };
+
+  security.acme = {
+    acceptTerms = true;
+    defaults.email = "till@ktiu.net";
+  };
+
+}
diff --git a/system/web-server.nix b/system/web-server/outline.nix
similarity index 67%
rename from system/web-server.nix
rename to system/web-server/outline.nix
index 67b4503..b6173ca 100644
--- a/system/web-server.nix
+++ b/system/web-server/outline.nix
@@ -1,32 +1,16 @@
 { config, pkgs, ... }:
 
 {
-  nixpkgs.config.allowUnfree = true;
-
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
-
-  services.jenkins.enable = true;
 
   services.outline = {
     enable = true;
     storage.storageType = "local";
   };
 
-  services.nginx = {
-    enable = true;
-    recommendedProxySettings = true;
-    recommendedTlsSettings = true;
-  };
-
-  security.acme = {
-    acceptTerms = true;
-    defaults.email = "till@ktiu.net";
-  };
-
   services.nginx.virtualHosts."outline.ktiu.net" = {
     addSSL = true;
     enableACME = true;
-    root = "/var/www/myhost.org";
+    # root = "/var/www/myhost.org";
     locations."/" = {
       proxyPass = "http://127.0.0.1:3000";
       extraConfig =