diff --git a/home-manager/common/desktop/default.nix b/home-manager/common/desktop/default.nix
deleted file mode 100644
index 1e61bbb..0000000
--- a/home-manager/common/desktop/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ inputs, pkgs, ... }:
-
-{
-  imports = [
-    ./picom.nix
-  ];
-
-  nixpkgs.overlays = [
-    (final: prev: {
-      xmobar = inputs.xmobar-config.packages.${pkgs.system}.xmobar-config;
-    })
-  ];
-
-  home.packages = with pkgs; [
-    dmenu
-    feh
-    unstable.wezterm
-    xmobar
-  ];
-
-  xsession.windowManager.xmonad = {
-    enable = true;
-    enableContribAndExtras = true;
-    config = ./xmonad/src/xmonad.hs;
-  };
-
-  home.file.".xinitrc".source = ./xinitrc;
-
-  xdg.configFile = {
-    wezterm = { source = ./wezterm; recursive = true; };
-  };
-}
diff --git a/home-manager/sajenim/home.nix b/home-manager/sajenim/home.nix
index 8cef975..17c670e 100644
--- a/home-manager/sajenim/home.nix
+++ b/home-manager/sajenim/home.nix
@@ -12,12 +12,14 @@
 
     # You can also split up your configuration and import pieces of it here:
 
+    # User services
+    ./services/picom
+
     # User programs
     ./programs/discord
     ./programs/mangohud
 
     # Common programs
-    ../common/desktop
     ../common/programs/git
     ../common/programs/zsh
     ../common/programs/nvim
@@ -63,12 +65,33 @@
   
     # Install some packages
     packages = with pkgs; [
+      # Stable user programs
       bitwarden
+      dmenu
+      feh
       spotify
       prismlauncher
+      xmobar
+      # Unstable user programs
+      unstable.wezterm
     ];
   };
 
+  # Setup our window manager
+  xsession.windowManager.xmonad = {
+    enable = true;
+    enableContribAndExtras = true;
+    config = ../../pkgs/xmonad-config/src/xmonad.hs;
+  };
+
+  # Copy some configuration files to $XDG_CONFIG_HOME
+  xdg.configFile = {
+    wezterm = { source = ./programs/wezterm/config; recursive = true; };
+  };
+  
+  # Setup our desktop environment
+  home.file.".xinitrc".source = ./xinitrc;
+
   # Nicely reload system units when changing configs
   systemd.user.startServices = "sd-switch";
 
diff --git a/home-manager/common/desktop/wezterm/colors/gruvbox_material_dark_hard.toml b/home-manager/sajenim/programs/wezterm/config/colors/gruvbox_material_dark_hard.toml
similarity index 100%
rename from home-manager/common/desktop/wezterm/colors/gruvbox_material_dark_hard.toml
rename to home-manager/sajenim/programs/wezterm/config/colors/gruvbox_material_dark_hard.toml
diff --git a/home-manager/common/desktop/wezterm/wezterm.lua b/home-manager/sajenim/programs/wezterm/config/wezterm.lua
similarity index 100%
rename from home-manager/common/desktop/wezterm/wezterm.lua
rename to home-manager/sajenim/programs/wezterm/config/wezterm.lua
diff --git a/home-manager/common/desktop/picom.nix b/home-manager/sajenim/services/picom/default.nix
similarity index 100%
rename from home-manager/common/desktop/picom.nix
rename to home-manager/sajenim/services/picom/default.nix
diff --git a/home-manager/common/desktop/xinitrc b/home-manager/sajenim/xinitrc
similarity index 100%
rename from home-manager/common/desktop/xinitrc
rename to home-manager/sajenim/xinitrc