diff --git a/README.md b/README.md
index 8f5d18c..87f064d 100644
--- a/README.md
+++ b/README.md
@@ -139,7 +139,7 @@ $ inv setup-secret --hosts buildXX
 
 ```console
 $ nixos-generate-config  --root /tmp
-# optional, in most cases one can import roles/hardware/hetzner-amd.nix
+# optional, in most cases one can import roles/hetzner/amd.nix
 $ scp buildXX.nix-community.org:/tmp/etc/nixos/hardware-configuration.nix buildXX/hardware-configuration.nix
 ```
 
diff --git a/build01/configuration.nix b/build01/configuration.nix
index 26f4004..9cfcddf 100644
--- a/build01/configuration.nix
+++ b/build01/configuration.nix
@@ -11,10 +11,9 @@
 # nixos-enter
 {
   imports = [
-    ../roles/dev-packages.nix
     ../roles/common.nix
-    ../roles/hardware/hetzner-amd.nix
-    ../roles/hetzner-network.nix
+    ../roles/hetzner/amd.nix
+    ../roles/hetzner/network.nix
     ../roles/raid.nix
     ../roles/builder
     ../roles/remote-builder/aarch64-nixos-community.nix
diff --git a/build02/configuration.nix b/build02/configuration.nix
index 862b684..aa9f99e 100644
--- a/build02/configuration.nix
+++ b/build02/configuration.nix
@@ -3,8 +3,8 @@
 {
   imports = [
     ../roles/common.nix
-    ../roles/hardware/hetzner-amd.nix
-    ../roles/hetzner-network.nix
+    ../roles/hetzner/amd.nix
+    ../roles/hetzner/network.nix
     ../roles/nginx.nix
     ../roles/raid.nix
     ../roles/remote-builder/aarch64-build04.nix
diff --git a/build03/configuration.nix b/build03/configuration.nix
index 91f8cd3..b985611 100644
--- a/build03/configuration.nix
+++ b/build03/configuration.nix
@@ -11,16 +11,16 @@
   # $ nixos-enter
   imports = [
     ../roles/common.nix
-    ../roles/hardware/hetzner-amd.nix
+    ../roles/hetzner/amd.nix
+    ../roles/hetzner/network.nix
     ../roles/hercules-ci
-    ../roles/hetzner-network.nix
     ../roles/nginx.nix
     ../roles/raid.nix
     ../roles/remote-builder/aarch64-build04.nix
 
     ../services/hound
     ../services/hydra
-    ../services/matterbridge.nix
+    ../services/matterbridge
   ];
 
   # /boot is a mirror raid
diff --git a/build04/configuration.nix b/build04/configuration.nix
index c63039d..7eea8be 100644
--- a/build04/configuration.nix
+++ b/build04/configuration.nix
@@ -4,7 +4,7 @@
     ./hardware-configuration.nix
     ../roles/common.nix
     ../roles/hercules-ci
-    ../roles/builder.nix
+    ../roles/remote-builder/user.nix
   ];
 
   nixpkgs.system = "aarch64-linux";
diff --git a/roles/builder/default.nix b/roles/builder/default.nix
index 370a4b8..187992f 100644
--- a/roles/builder/default.nix
+++ b/roles/builder/default.nix
@@ -1,3 +1,6 @@
 { ... }: {
-  imports = [ ./users.nix ];
+  imports = [
+    ./packages.nix
+    ./users.nix
+  ];
 }
diff --git a/roles/dev-packages.nix b/roles/builder/packages.nix
similarity index 100%
rename from roles/dev-packages.nix
rename to roles/builder/packages.nix
diff --git a/roles/common.nix b/roles/common.nix
index 873f452..69505e7 100644
--- a/roles/common.nix
+++ b/roles/common.nix
@@ -3,14 +3,14 @@
 {
 
   imports = [
+    ./auto-upgrade.nix
     ./nix-daemon.nix
     ./security.nix
+    ./sops-nix.nix
     ./sshd.nix
-    ./telegraf
+    ./telegraf.nix
     ./users.nix
     ./zfs.nix
-    ./sops-nix.nix
-    ./auto-upgrade.nix
   ];
 
   environment.systemPackages = [
diff --git a/roles/hardware/hetzner-amd.nix b/roles/hetzner/amd.nix
similarity index 100%
rename from roles/hardware/hetzner-amd.nix
rename to roles/hetzner/amd.nix
diff --git a/roles/hetzner-network.nix b/roles/hetzner/network.nix
similarity index 100%
rename from roles/hetzner-network.nix
rename to roles/hetzner/network.nix
diff --git a/roles/builder.nix b/roles/remote-builder/user.nix
similarity index 100%
rename from roles/builder.nix
rename to roles/remote-builder/user.nix
diff --git a/roles/telegraf/default.nix b/roles/telegraf.nix
similarity index 100%
rename from roles/telegraf/default.nix
rename to roles/telegraf.nix
diff --git a/services/matterbridge.nix b/services/matterbridge/default.nix
similarity index 100%
rename from services/matterbridge.nix
rename to services/matterbridge/default.nix