diff --git a/nix/nixos-module/container.nix b/nix/nixos-module/container/defaults.nix
similarity index 100%
rename from nix/nixos-module/container.nix
rename to nix/nixos-module/container/defaults.nix
diff --git a/nix/nixos-module/default.nix b/nix/nixos-module/default.nix
index 500aaa6..ccbdd14 100644
--- a/nix/nixos-module/default.nix
+++ b/nix/nixos-module/default.nix
@@ -8,13 +8,13 @@ in {
   site = lib.config.site;
 
   imports = [
-    ./defaults.nix
     ../lib/config/options.nix
+    ./defaults.nix
   ]
   ++ optionals (hostConfig.role == "server") [
-    ./lxc-containers.nix
+    ./server/lxc-containers.nix
   ]
   ++ optionals (hostConfig.role == "container") [
-    ./container.nix
+    ./container/defaults.nix
   ];
 }
diff --git a/nix/nixos-module/lxc-containers.nix b/nix/nixos-module/server/lxc-containers.nix
similarity index 100%
rename from nix/nixos-module/lxc-containers.nix
rename to nix/nixos-module/server/lxc-containers.nix