diff --git a/modules/home-editor.nix b/users/modules/editor.nix
similarity index 100%
rename from modules/home-editor.nix
rename to users/modules/editor.nix
diff --git a/modules/home-git.nix b/users/modules/git.nix
similarity index 100%
rename from modules/home-git.nix
rename to users/modules/git.nix
diff --git a/modules/home-sh.nix b/users/modules/sh.nix
similarity index 100%
rename from modules/home-sh.nix
rename to users/modules/sh.nix
diff --git a/modules/home-terminal.nix b/users/modules/terminal.nix
similarity index 100%
rename from modules/home-terminal.nix
rename to users/modules/terminal.nix
diff --git a/modules/home-tmux.nix b/users/modules/tmux.nix
similarity index 100%
rename from modules/home-tmux.nix
rename to users/modules/tmux.nix
diff --git a/modules/home-utils.nix b/users/modules/utils.nix
similarity index 100%
rename from modules/home-utils.nix
rename to users/modules/utils.nix
diff --git a/modules/home-wm.nix b/users/modules/wm.nix
similarity index 100%
rename from modules/home-wm.nix
rename to users/modules/wm.nix
diff --git a/users/rafiq.nix b/users/rafiq.nix
index fa6251e..e70c7f3 100644
--- a/users/rafiq.nix
+++ b/users/rafiq.nix
@@ -1,14 +1,16 @@
-{ self, pkgs, ... }:
-
 {
+  self,
+  pkgs,
+  ...
+}: {
   imports = [
-    ../modules/home-git.nix # git specific configs
-    ../modules/home-tmux.nix # tmux specific configs (might move this)
-    ../modules/home-sh.nix # bash and other shell specific configs
-    ../modules/home-wm.nix # window manager configs
-    ../modules/home-editor.nix # editor specific configs
-    ../modules/home-terminal.nix # terminal emulator configs
-    ../modules/home-utils.nix # miscellaneous utilities
+    ./modules/git.nix # git specific configs
+    ./modules/tmux.nix # tmux specific configs (might move this)
+    ./modules/sh.nix # bash and other shell specific configs
+    ./modules/wm.nix # window manager configs
+    ./modules/editor.nix # editor specific configs
+    ./modules/terminal.nix # terminal emulator configs
+    ./modules/utils.nix # miscellaneous utilities
   ];
 
   # This enables using home-manager from the command line.