diff --git a/host/bachtel.nix b/host/bachtel.nix
index b557d87..6b4a2eb 100644
--- a/host/bachtel.nix
+++ b/host/bachtel.nix
@@ -32,8 +32,8 @@ in
       ../hardware/apu.nix
       ../hardware/wle900vx.nix
       ../role/base
-      ../role/networking/wwan.nix
-      (import ../role/router.nix routerConfig)
+      ../role/wwan
+      (import ../role/router routerConfig)
     ];
 
   fileSystems."/" =
diff --git a/host/montalin.nix b/host/montalin.nix
index d2f2a81..01e470b 100644
--- a/host/montalin.nix
+++ b/host/montalin.nix
@@ -10,8 +10,8 @@
     [
       ../hardware/nuc.nix
       ../role/base
-      ../role/dropbear.nix
-      (import ../role/backup.nix {systemdMount = "var-backup.mount"; borgArchiveFolder = "/var/backup/montalin";})
+      ../role/dropbear
+      (import ../role/backup { systemdMount = "var-backup.mount"; borgArchiveFolder = "/var/backup/montalin";})
     ];
 
   boot.initrd.luks.devices = {
diff --git a/role/router.nix b/role/router/default.nix
similarity index 91%
rename from role/router.nix
rename to role/router/default.nix
index b8b76a3..9082be7 100644
--- a/role/router.nix
+++ b/role/router/default.nix
@@ -24,8 +24,8 @@ let pkgs = import<nixpkgs>{};
 in
 {
   imports = [
-   (import ./networking/wireless-access-point.nix wireless)
-   (import ./networking/dns-recursive.nix lanNetwork)
+   (import ./wireless-access-point.nix wireless)
+   (import ./dns-recursive.nix lanNetwork)
   ];
  
   networking = {
diff --git a/role/networking/dns-recursive.nix b/role/router/dns-recursive.nix
similarity index 100%
rename from role/networking/dns-recursive.nix
rename to role/router/dns-recursive.nix
diff --git a/role/networking/wireless-access-point.nix b/role/router/wireless-access-point.nix
similarity index 100%
rename from role/networking/wireless-access-point.nix
rename to role/router/wireless-access-point.nix
diff --git a/role/networking/wwan.nix b/role/wwan/default.nix
similarity index 98%
rename from role/networking/wwan.nix
rename to role/wwan/default.nix
index 3cf31cd..fa6cd6e 100644
--- a/role/networking/wwan.nix
+++ b/role/wwan/default.nix
@@ -10,7 +10,7 @@ let
   mbim-ip-configured = pkgs.writeScriptBin "mbim-ip-configured" (''
     #!${pkgs.stdenv.shell}
     MBIM_INTERFACE=${cfg.mbimInterface}
-  '' + (readFile ./wwan/mbim-ip.bash));
+  '' + (readFile ./mbim-ip.bash));
 
   mbim-check-status = pkgs.writeScriptBin "mbim-check-status" ''
     #!${pkgs.stdenv.shell}
diff --git a/role/networking/wwan/mbim-ip.bash b/role/wwan/mbim-ip.bash
similarity index 100%
rename from role/networking/wwan/mbim-ip.bash
rename to role/wwan/mbim-ip.bash