diff --git a/hosts/docker/configuration.nix b/hosts/docker/configuration.nix
index a1bd47a..9a6808e 100644
--- a/hosts/docker/configuration.nix
+++ b/hosts/docker/configuration.nix
@@ -15,11 +15,16 @@ in
   imports =
     [ # Include the results of the hardware scan.
       ../../common/configuration.nix
-      ../../modules/nix/cache-client.nix
-      ../../modules/nix/remote-builder-client.nix
-      ../../modules/nix/docker-data.nix
-      ../../modules/nix/docker-service.nix
-      ../../modules/nix/tailscale-service.nix
+      # ../../modules/nix/cache-client.nix
+      ../../modules/nix-cache/client.nix
+      # ../../modules/nix/remote-builder-client.nix
+      ../../modules/remote-builder-client.nix
+      # ../../modules/nix/docker-data.nix
+      ../../modules/docker/mount-data.nix
+      # ../../modules/nix/docker-service.nix
+      ../../modules/docker/enable-service.nix
+      # ../../modules/nix/tailscale-service.nix
+      ../../tailscale/enable-service.nix
     ];
 
 
diff --git a/modules/nix/beszel-agent.nix b/modules/beszel/enable-agent.nix
similarity index 100%
rename from modules/nix/beszel-agent.nix
rename to modules/beszel/enable-agent.nix
diff --git a/modules/nix/docker-service.nix b/modules/docker/enable-service.nix
similarity index 100%
rename from modules/nix/docker-service.nix
rename to modules/docker/enable-service.nix
diff --git a/modules/nix/docker-data.nix b/modules/docker/mount-data.nix
similarity index 100%
rename from modules/nix/docker-data.nix
rename to modules/docker/mount-data.nix
diff --git a/modules/nix/enable-ip-forwarding.nix b/modules/enable-ip-forwarding.nix
similarity index 100%
rename from modules/nix/enable-ip-forwarding.nix
rename to modules/enable-ip-forwarding.nix
diff --git a/modules/nix/cache-client.nix b/modules/nix-cache/client.nix
similarity index 100%
rename from modules/nix/cache-client.nix
rename to modules/nix-cache/client.nix
diff --git a/modules/nix/cache-server.nix b/modules/nix-cache/server.nix
similarity index 100%
rename from modules/nix/cache-server.nix
rename to modules/nix-cache/server.nix
diff --git a/modules/nix/remote-builder-client.nix b/modules/remote-builder-client.nix
similarity index 100%
rename from modules/nix/remote-builder-client.nix
rename to modules/remote-builder-client.nix
diff --git a/modules/nix/rotate-traefik-logs.nix b/modules/rotate-traefik-logs.nix
similarity index 100%
rename from modules/nix/rotate-traefik-logs.nix
rename to modules/rotate-traefik-logs.nix
diff --git a/modules/nix/tailscale-service.nix b/modules/tailscale/enable-service.nix
similarity index 100%
rename from modules/nix/tailscale-service.nix
rename to modules/tailscale/enable-service.nix
diff --git a/modules/nix/tailscale-exit-node.nix b/modules/tailscale/exit-node.nix
similarity index 100%
rename from modules/nix/tailscale-exit-node.nix
rename to modules/tailscale/exit-node.nix