Clean up structure

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."/" =

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 = {

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 = {

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}