diff --git a/modules/default.nix b/modules/default.nix
index d06c724..74d9d4e 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -6,6 +6,5 @@
         ./programs.nix
         ./users
         ./hypr
-        ./home
     ];
 }
diff --git a/modules/home/default.nix b/modules/home/default.nix
deleted file mode 100644
index 28c419b..0000000
--- a/modules/home/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, lib, ... }: {
-    
-    config.home-manager = {
-        useGlobalPkgs = true;
-        useUserPackages = true;
-        backupFileExtension = "backup";
-        users.crow = lib.mkIf config.users.crow.home.enable ./crow/home.nix;
-    };
-}
diff --git a/modules/users/crow/default.nix b/modules/users/crow/default.nix
new file mode 100644
index 0000000..0a07880
--- /dev/null
+++ b/modules/users/crow/default.nix
@@ -0,0 +1,6 @@
+{lib, config, ...}: {
+    imports = [
+        ./user.nix
+        ./home.nix
+    ];
+}
diff --git a/modules/home/crow/home.nix b/modules/users/crow/home.nix
similarity index 99%
rename from modules/home/crow/home.nix
rename to modules/users/crow/home.nix
index c1272e9..888d7fb 100644
--- a/modules/home/crow/home.nix
+++ b/modules/users/crow/home.nix
@@ -1,5 +1,4 @@
 {config, inputs, pkgs, lib, ...}: {
-    
     home = {
         username = "crow";
         homeDirectory = "/home/crow";
diff --git a/modules/home/crow/hyprland.conf b/modules/users/crow/hyprland.conf
similarity index 100%
rename from modules/home/crow/hyprland.conf
rename to modules/users/crow/hyprland.conf
diff --git a/modules/users/crow/user.nix b/modules/users/crow/user.nix
new file mode 100644
index 0000000..3a69287
--- /dev/null
+++ b/modules/users/crow/user.nix
@@ -0,0 +1,7 @@
+{ lib, config, ...}: {
+    users.users.crow = lib.mkIf config.users.crow.enable {
+        isNormalUser = true;
+        initialPassword = "changeme";
+        extraGroups = [ "wheel" "networkmanager" "audio" ];
+    };
+}
diff --git a/modules/users/default.nix b/modules/users/default.nix
index 3b4d3a6..9c215e6 100644
--- a/modules/users/default.nix
+++ b/modules/users/default.nix
@@ -1,7 +1,5 @@
-{ lib, config, pkgs, ...}: {
-    users.users.crow = lib.mkIf config.users.crow.enable {
-        isNormalUser = true;
-        initialPassword = "changeme";
-        extraGroups = [ "wheel" "networkmanager" "audio" ];
-    };
+{
+    imports = [
+        ./crow
+    ];
 }