diff --git a/users/modules/containers.nix b/users/modules/podman/containers.nix
similarity index 100%
rename from users/modules/containers.nix
rename to users/modules/podman/containers.nix
diff --git a/users/modules/podman/default.nix b/users/modules/podman/default.nix
new file mode 100644
index 0000000..bd9c6f9
--- /dev/null
+++ b/users/modules/podman/default.nix
@@ -0,0 +1,7 @@
+{ ... }: {
+  imports = [
+    ./podman.nix
+    ./containers.nix
+    ./podman-dnsname.nix
+  ];
+}
diff --git a/users/modules/podman-dnsname.nix b/users/modules/podman/podman-dnsname.nix
similarity index 100%
rename from users/modules/podman-dnsname.nix
rename to users/modules/podman/podman-dnsname.nix
diff --git a/users/modules/podman.nix b/users/modules/podman/podman.nix
similarity index 100%
rename from users/modules/podman.nix
rename to users/modules/podman/podman.nix
diff --git a/users/nixos/default.nix b/users/nixos/default.nix
deleted file mode 100644
index 077a52e..0000000
--- a/users/nixos/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ hmUsers, ... }:
-{
-  home-manager.users = { inherit (hmUsers) nixos; };
-
-  users.users.nixos = {
-    password = "nixos";
-    description = "default";
-    isNormalUser = true;
-    extraGroups = [ "wheel" ];
-  };
-}