diff --git a/flake.nix b/flake.nix
index f51da13..298a054 100644
--- a/flake.nix
+++ b/flake.nix
@@ -45,11 +45,18 @@
 
     homeConfigurations = {
       # PC
-      "yashraj@acer" = home-manager.lib.homeManagerConfiguration {
+      "yuki@acer" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages."x86_64-linux";
         extraSpecialArgs = {inherit inputs outputs;};
-        modules = [./home/yashraj];
+        modules = [./home/yashraj/yuki];
       };
+
+      # Add more modules
+      # "name@acer" = home-manager.lib.homeManagerConfiguration {
+      #   pkgs = nixpkgs.legacyPackages."x86_64-linux";
+      #   extraSpecialArgs = {inherit inputs outputs;};
+      #   modules = [./home/yashraj/name];
+      # };
     };
   };
 }
diff --git a/home/yashraj/default.nix b/home/yashraj/default.nix
deleted file mode 100644
index a2f1874..0000000
--- a/home/yashraj/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  config,
-  pkgs,
-  inputs,
-  outputs,
-  ...
-}: {
-  imports =
-    [
-      ./home.nix
-      ./packages.nix
-
-      ./modules/colorschemes
-      ./modules/shell
-      ./modules/desktop/wm/awesome
-      ./modules/programs/alacritty.nix
-      # ./modules/programs/firefox.nix
-      ./modules/programs/vivaldi.nix
-      ./modules/programs/vscode.nix
-      ./modules/programs/nvim.nix
-      ./modules/programs/neofetch.nix
-    ]
-    ++ (builtins.attrValues outputs.homeManagerModules);
-}
-# Note: Here other wm's should be commented before adding more wm's configs
-
diff --git a/home/yashraj/modules/colorschemes/default.nix b/home/yashraj/shared/colorschemes/default.nix
similarity index 100%
rename from home/yashraj/modules/colorschemes/default.nix
rename to home/yashraj/shared/colorschemes/default.nix
diff --git a/home/yashraj/modules/colorschemes/gruvbox-medium.nix b/home/yashraj/shared/colorschemes/gruvbox-medium.nix
similarity index 100%
rename from home/yashraj/modules/colorschemes/gruvbox-medium.nix
rename to home/yashraj/shared/colorschemes/gruvbox-medium.nix
diff --git a/home/yashraj/home.nix b/home/yashraj/shared/default.nix
similarity index 85%
rename from home/yashraj/home.nix
rename to home/yashraj/shared/default.nix
index ba88e8f..ecd418d 100644
--- a/home/yashraj/home.nix
+++ b/home/yashraj/shared/default.nix
@@ -6,6 +6,14 @@
   outputs,
   ...
 }: {
+  imports =
+    [
+      ./colorschemes
+      ./pkgs
+      ./shell
+    ]
+    ++ (builtins.attrValues outputs.homeManagerModules);
+
   systemd.user.startServices = "sd-switch";
 
   manual = {
diff --git a/home/yashraj/packages.nix b/home/yashraj/shared/pkgs/default.nix
similarity index 100%
rename from home/yashraj/packages.nix
rename to home/yashraj/shared/pkgs/default.nix
diff --git a/home/yashraj/modules/programs/alacritty.nix b/home/yashraj/shared/programs/alacritty.nix
similarity index 100%
rename from home/yashraj/modules/programs/alacritty.nix
rename to home/yashraj/shared/programs/alacritty.nix
diff --git a/home/yashraj/modules/programs/firefox.nix b/home/yashraj/shared/programs/firefox.nix
similarity index 100%
rename from home/yashraj/modules/programs/firefox.nix
rename to home/yashraj/shared/programs/firefox.nix
diff --git a/home/yashraj/modules/programs/neofetch.nix b/home/yashraj/shared/programs/neofetch.nix
similarity index 100%
rename from home/yashraj/modules/programs/neofetch.nix
rename to home/yashraj/shared/programs/neofetch.nix
diff --git a/home/yashraj/modules/programs/nvim.nix b/home/yashraj/shared/programs/nvim.nix
similarity index 100%
rename from home/yashraj/modules/programs/nvim.nix
rename to home/yashraj/shared/programs/nvim.nix
diff --git a/home/yashraj/modules/programs/vivaldi.nix b/home/yashraj/shared/programs/vivaldi.nix
similarity index 100%
rename from home/yashraj/modules/programs/vivaldi.nix
rename to home/yashraj/shared/programs/vivaldi.nix
diff --git a/home/yashraj/modules/programs/vscode.nix b/home/yashraj/shared/programs/vscode.nix
similarity index 100%
rename from home/yashraj/modules/programs/vscode.nix
rename to home/yashraj/shared/programs/vscode.nix
diff --git a/home/yashraj/shared/services/default.nix b/home/yashraj/shared/services/default.nix
new file mode 100644
index 0000000..1af367e
--- /dev/null
+++ b/home/yashraj/shared/services/default.nix
@@ -0,0 +1,5 @@
+{
+  services = {
+    playerctld.enable = true;
+  };
+}
diff --git a/home/yashraj/modules/shell/bash.nix b/home/yashraj/shared/shell/bash.nix
similarity index 100%
rename from home/yashraj/modules/shell/bash.nix
rename to home/yashraj/shared/shell/bash.nix
diff --git a/home/yashraj/modules/shell/cli.nix b/home/yashraj/shared/shell/cli.nix
similarity index 94%
rename from home/yashraj/modules/shell/cli.nix
rename to home/yashraj/shared/shell/cli.nix
index c6907b2..b17ff90 100644
--- a/home/yashraj/modules/shell/cli.nix
+++ b/home/yashraj/shared/shell/cli.nix
@@ -32,10 +32,6 @@
       ;
   };
 
-  services = {
-    playerctld.enable = true;
-  };
-
   programs = {
     exa.enable = true;
     man.enable = true;
diff --git a/home/yashraj/modules/shell/default.nix b/home/yashraj/shared/shell/default.nix
similarity index 100%
rename from home/yashraj/modules/shell/default.nix
rename to home/yashraj/shared/shell/default.nix
diff --git a/home/yashraj/modules/shell/git.nix b/home/yashraj/shared/shell/git.nix
similarity index 100%
rename from home/yashraj/modules/shell/git.nix
rename to home/yashraj/shared/shell/git.nix
diff --git a/home/yashraj/modules/shell/nix.nix b/home/yashraj/shared/shell/nix.nix
similarity index 100%
rename from home/yashraj/modules/shell/nix.nix
rename to home/yashraj/shared/shell/nix.nix
diff --git a/home/yashraj/modules/shell/starship.nix b/home/yashraj/shared/shell/starship.nix
similarity index 100%
rename from home/yashraj/modules/shell/starship.nix
rename to home/yashraj/shared/shell/starship.nix
diff --git a/home/yashraj/modules/shell/xdg.nix b/home/yashraj/shared/shell/xdg.nix
similarity index 100%
rename from home/yashraj/modules/shell/xdg.nix
rename to home/yashraj/shared/shell/xdg.nix
diff --git a/home/yashraj/yuki/default.nix b/home/yashraj/yuki/default.nix
new file mode 100644
index 0000000..3acecc4
--- /dev/null
+++ b/home/yashraj/yuki/default.nix
@@ -0,0 +1,19 @@
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [
+    # Shared configuration
+    ../shared
+    ../shared/programs/alacritty.nix
+    ../shared/programs/vivaldi.nix
+    ../shared/programs/vscode.nix
+    ../shared/programs/nvim.nix
+    ../shared/programs/neofetch.nix
+
+    # Specific configuration
+    ./desktop/wm/awesome
+  ];
+}
diff --git a/home/yashraj/modules/desktop/clipmenu.nix b/home/yashraj/yuki/desktop/clipmenu.nix
similarity index 100%
rename from home/yashraj/modules/desktop/clipmenu.nix
rename to home/yashraj/yuki/desktop/clipmenu.nix
diff --git a/home/yashraj/modules/desktop/flameshot.nix b/home/yashraj/yuki/desktop/flameshot.nix
similarity index 100%
rename from home/yashraj/modules/desktop/flameshot.nix
rename to home/yashraj/yuki/desktop/flameshot.nix
diff --git a/home/yashraj/modules/desktop/gtk.nix b/home/yashraj/yuki/desktop/gtk.nix
similarity index 100%
rename from home/yashraj/modules/desktop/gtk.nix
rename to home/yashraj/yuki/desktop/gtk.nix
diff --git a/home/yashraj/modules/desktop/nm-applet.nix b/home/yashraj/yuki/desktop/nm-applet.nix
similarity index 100%
rename from home/yashraj/modules/desktop/nm-applet.nix
rename to home/yashraj/yuki/desktop/nm-applet.nix
diff --git a/home/yashraj/modules/desktop/picom.nix b/home/yashraj/yuki/desktop/picom.nix
similarity index 100%
rename from home/yashraj/modules/desktop/picom.nix
rename to home/yashraj/yuki/desktop/picom.nix
diff --git a/home/yashraj/modules/desktop/rofi.nix b/home/yashraj/yuki/desktop/rofi.nix
similarity index 100%
rename from home/yashraj/modules/desktop/rofi.nix
rename to home/yashraj/yuki/desktop/rofi.nix
diff --git a/home/yashraj/modules/desktop/wm/awesome/default.nix b/home/yashraj/yuki/desktop/wm/awesome/default.nix
similarity index 100%
rename from home/yashraj/modules/desktop/wm/awesome/default.nix
rename to home/yashraj/yuki/desktop/wm/awesome/default.nix
diff --git a/home/yashraj/modules/desktop/wm/awesome/default/init.lua b/home/yashraj/yuki/desktop/wm/awesome/default/init.lua
similarity index 100%
rename from home/yashraj/modules/desktop/wm/awesome/default/init.lua
rename to home/yashraj/yuki/desktop/wm/awesome/default/init.lua
diff --git a/home/yashraj/modules/desktop/wm/awesome/default/theme.lua b/home/yashraj/yuki/desktop/wm/awesome/default/theme.lua
similarity index 100%
rename from home/yashraj/modules/desktop/wm/awesome/default/theme.lua
rename to home/yashraj/yuki/desktop/wm/awesome/default/theme.lua
diff --git a/home/yashraj/modules/desktop/wm/awesome/helpers.lua b/home/yashraj/yuki/desktop/wm/awesome/helpers.lua
similarity index 100%
rename from home/yashraj/modules/desktop/wm/awesome/helpers.lua
rename to home/yashraj/yuki/desktop/wm/awesome/helpers.lua
diff --git a/home/yashraj/modules/desktop/wm/awesome/keys.lua b/home/yashraj/yuki/desktop/wm/awesome/keys.lua
similarity index 100%
rename from home/yashraj/modules/desktop/wm/awesome/keys.lua
rename to home/yashraj/yuki/desktop/wm/awesome/keys.lua
diff --git a/home/yashraj/modules/desktop/wm/awesome/module/json.lua b/home/yashraj/yuki/desktop/wm/awesome/module/json.lua
similarity index 100%
rename from home/yashraj/modules/desktop/wm/awesome/module/json.lua
rename to home/yashraj/yuki/desktop/wm/awesome/module/json.lua
diff --git a/home/yashraj/modules/desktop/wm/awesome/module/lockscreen/init.lua b/home/yashraj/yuki/desktop/wm/awesome/module/lockscreen/init.lua
similarity index 100%
rename from home/yashraj/modules/desktop/wm/awesome/module/lockscreen/init.lua
rename to home/yashraj/yuki/desktop/wm/awesome/module/lockscreen/init.lua
diff --git a/home/yashraj/modules/desktop/wm/awesome/module/lockscreen/lib/liblua_pam.so b/home/yashraj/yuki/desktop/wm/awesome/module/lockscreen/lib/liblua_pam.so
similarity index 100%
rename from home/yashraj/modules/desktop/wm/awesome/module/lockscreen/lib/liblua_pam.so
rename to home/yashraj/yuki/desktop/wm/awesome/module/lockscreen/lib/liblua_pam.so
diff --git a/home/yashraj/modules/desktop/wm/awesome/module/lockscreen/lockscreen.lua b/home/yashraj/yuki/desktop/wm/awesome/module/lockscreen/lockscreen.lua
similarity index 100%
rename from home/yashraj/modules/desktop/wm/awesome/module/lockscreen/lockscreen.lua
rename to home/yashraj/yuki/desktop/wm/awesome/module/lockscreen/lockscreen.lua
diff --git a/home/yashraj/modules/desktop/wm/awesome/module/window_switcher.lua b/home/yashraj/yuki/desktop/wm/awesome/module/window_switcher.lua
similarity index 100%
rename from home/yashraj/modules/desktop/wm/awesome/module/window_switcher.lua
rename to home/yashraj/yuki/desktop/wm/awesome/module/window_switcher.lua
diff --git a/home/yashraj/modules/desktop/wm/awesome/rc.lua b/home/yashraj/yuki/desktop/wm/awesome/rc.lua
similarity index 100%
rename from home/yashraj/modules/desktop/wm/awesome/rc.lua
rename to home/yashraj/yuki/desktop/wm/awesome/rc.lua
diff --git a/hosts/shared/users/yashraj.nix b/hosts/shared/users/yashraj.nix
index 5cf1c78..7f357c7 100644
--- a/hosts/shared/users/yashraj.nix
+++ b/hosts/shared/users/yashraj.nix
@@ -28,5 +28,6 @@ in {
     packages = [pkgs.home-manager];
   };
 
-  home-manager.users.yashraj = import ../../../home/yashraj;
+  # home-manager.users.yashraj = import ../../../home/yashraj/${config.networking.hostName};
+  home-manager.users.yashraj = import ../../../home/yashraj/yuki;
 }