diff --git a/flake.nix b/flake.nix
index 54faa02..da33afc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,7 +53,7 @@
             }
           ] ++ lib.optionals (buildType != "nix-cache") [
             ./modules/nix-cache/client.nix
-            ./modules/remote-builder-client.nix
+            ./modules/nix-cache/remote-builder-client.nix
           ];
           specialArgs = { inherit inputs vars; };
         };
diff --git a/modules/build-types/docker.nix b/modules/build-types/docker.nix
index 2572051..2c4c755 100644
--- a/modules/build-types/docker.nix
+++ b/modules/build-types/docker.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, vars, ... }:
 
 {
   # Pins the Docker Engine version, carried forward from the pre-refactor
@@ -13,11 +13,11 @@
   imports = [
     ../docker/mount-data.nix
     ../docker/enable-service.nix
+    ../docker/nextcloud-cron-job.nix
+    ../docker/docker-health-to-gotify.nix
     ../tailscale/enable-service.nix
-    ../rotate-traefik-logs.nix
+    ../traefik/rotate-logs.nix
     ../raspi/mount-data.nix
-    ../services/nextcloud-cron-job.nix
-    ../services/docker-health-to-gotify.nix
     ../services/enable-rpcbind.nix
   ];
 
@@ -36,5 +36,5 @@
   users.users.nixos.extraGroups = [ "docker" ];
   services.openssh.settings.PermitRootLogin = "yes";
 
-  networking.firewall.allowedTCPPorts = [ 80 8080 443 8090 ];
+  networking.firewall.allowedTCPPorts = [ 80 8080 443 vars.beszelHubPort ];
 }
diff --git a/modules/common/configuration.nix b/modules/common/configuration.nix
index 6920607..fe1e4e9 100644
--- a/modules/common/configuration.nix
+++ b/modules/common/configuration.nix
@@ -5,7 +5,7 @@
     [
       # Include the results of the hardware scan.
       #      ./hardware-configuration.nix
-      ../set-locale.nix
+      ./set-locale.nix
     ];
   # Use the GRUB 2 boot loader.
   # boot.loader.grub.enable = true;
diff --git a/modules/set-locale.nix b/modules/common/set-locale.nix
similarity index 100%
rename from modules/set-locale.nix
rename to modules/common/set-locale.nix
diff --git a/modules/services/docker-health-to-gotify.nix b/modules/docker/docker-health-to-gotify.nix
similarity index 100%
rename from modules/services/docker-health-to-gotify.nix
rename to modules/docker/docker-health-to-gotify.nix
diff --git a/modules/services/nextcloud-cron-job.nix b/modules/docker/nextcloud-cron-job.nix
similarity index 100%
rename from modules/services/nextcloud-cron-job.nix
rename to modules/docker/nextcloud-cron-job.nix
diff --git a/modules/enable-ip-forwarding.nix b/modules/networking/enable-ip-forwarding.nix
similarity index 100%
rename from modules/enable-ip-forwarding.nix
rename to modules/networking/enable-ip-forwarding.nix
diff --git a/modules/remote-builder-client.nix b/modules/nix-cache/remote-builder-client.nix
similarity index 100%
rename from modules/remote-builder-client.nix
rename to modules/nix-cache/remote-builder-client.nix
diff --git a/modules/rotate-traefik-logs.nix b/modules/traefik/rotate-logs.nix
similarity index 100%
rename from modules/rotate-traefik-logs.nix
rename to modules/traefik/rotate-logs.nix