diff --git a/host/bachtel.nix b/host/bachtel.nix
index 156c846..43d2e17 100644
--- a/host/bachtel.nix
+++ b/host/bachtel.nix
@@ -4,16 +4,7 @@
 
 { config, pkgs, ... }: {
 
-  imports = [
-    ../hardware/apu.nix
-    ../hardware/wle900vx.nix
-    ../role/base
-    ../role/wwan
-    ../role/router
-    ../role/router-dhcp
-    ../role/router-dns
-    ../role/router-wireless-ap
-  ];
+  imports = [ ../role/base ../hardware/apu.nix ../hardware/wle900vx.nix ];
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/360a6bc9-fc4e-4803-bd53-69320ac32ac5";
diff --git a/host/calanda.nix b/host/calanda.nix
index f952129..f0067e9 100644
--- a/host/calanda.nix
+++ b/host/calanda.nix
@@ -5,14 +5,7 @@
 { config, pkgs, ... }:
 
 {
-  imports = [
-    ../hardware/apu.nix
-    ../hardware/wle200nx.nix
-    ../role/base
-    ../role/router
-    ../role/router-dns
-    ../role/router-wireless-ap
-  ];
+  imports = [ ../hardware/apu.nix ../hardware/wle200nx.nix ../role/base ];
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/16efc5db-0697-4f39-b64b-fc18ac318625";
diff --git a/host/etzel.nix b/host/etzel.nix
index c7fa8ba..119b8d9 100644
--- a/host/etzel.nix
+++ b/host/etzel.nix
@@ -10,10 +10,6 @@
     ../hardware/wle200nx.nix
     ../hardware/wle600vx.nix
     ../role/base
-    ../role/router
-    ../role/router-dhcp
-    ../role/router-dns
-    ../role/router-wireless-ap
   ];
 
   nix.distributedBuilds = true;
diff --git a/modules/default.nix b/modules/default.nix
new file mode 100644
index 0000000..8a65e4b
--- /dev/null
+++ b/modules/default.nix
@@ -0,0 +1,5 @@
+{ config, pkgs, ... }: {
+
+  imports = [ ./router ./router-dhcp ./router-dns ./router-wireless-ap ./wwan ];
+
+}
diff --git a/role/router-dhcp/default.nix b/modules/router-dhcp/default.nix
similarity index 100%
rename from role/router-dhcp/default.nix
rename to modules/router-dhcp/default.nix
diff --git a/role/router-dns/default.nix b/modules/router-dns/default.nix
similarity index 100%
rename from role/router-dns/default.nix
rename to modules/router-dns/default.nix
diff --git a/role/router-wireless-ap/default.nix b/modules/router-wireless-ap/default.nix
similarity index 100%
rename from role/router-wireless-ap/default.nix
rename to modules/router-wireless-ap/default.nix
diff --git a/role/router-wireless-ap/hostapd5ghz.nix b/modules/router-wireless-ap/hostapd5ghz.nix
similarity index 100%
rename from role/router-wireless-ap/hostapd5ghz.nix
rename to modules/router-wireless-ap/hostapd5ghz.nix
diff --git a/role/router/README.adoc b/modules/router/README.adoc
similarity index 100%
rename from role/router/README.adoc
rename to modules/router/README.adoc
diff --git a/role/router/default.nix b/modules/router/default.nix
similarity index 100%
rename from role/router/default.nix
rename to modules/router/default.nix
diff --git a/role/wwan/README.adoc b/modules/wwan/README.adoc
similarity index 100%
rename from role/wwan/README.adoc
rename to modules/wwan/README.adoc
diff --git a/role/wwan/default.nix b/modules/wwan/default.nix
similarity index 100%
rename from role/wwan/default.nix
rename to modules/wwan/default.nix
diff --git a/role/wwan/mbim-ip.bash b/modules/wwan/mbim-ip.bash
similarity index 100%
rename from role/wwan/mbim-ip.bash
rename to modules/wwan/mbim-ip.bash
diff --git a/role/base/default.nix b/role/base/default.nix
index cd68079..eba4c1f 100644
--- a/role/base/default.nix
+++ b/role/base/default.nix
@@ -2,6 +2,8 @@
 { config, lib, pkgs, ... }:
 
 {
+  imports = [ ../../modules ];
+
   system.autoUpgrade.enable = true;
   system.autoUpgrade.allowReboot = false;