diff --git a/home.nix b/home.nix
index 3cdee8d..d5b7845 100644
--- a/home.nix
+++ b/home.nix
@@ -5,9 +5,8 @@
   home.username = "pan";
   home.homeDirectory = "/home/pan";
 
-  xdg.enable = true;
-
   imports = [
+    ./programs/xdg
     ./programs/hypr
     ./programs/dunst
     ./programs/git
@@ -20,11 +19,6 @@
 
   home.packages = with pkgs; [
     eww-wayland # eww widgets
-    socat # For hyprland scripts
-    swww # Wallpaper engine
-    trash-cli # Trash application
-    dunst # Notification Manager
-    wlr-randr # Xrandr for wayland
 
     # Applications
     syncthing # For syncing files between computers
diff --git a/programs/hypr/default.nix b/programs/hypr/default.nix
index 510e74b..8fc5589 100644
--- a/programs/hypr/default.nix
+++ b/programs/hypr/default.nix
@@ -6,4 +6,9 @@
       ${builtins.readFile ./default.conf}
       ${builtins.readFile ./keybinds.conf}
     '';
+  home.packages = with pkgs; [
+    socat # For hyprland scripts
+    swww # Wallpaper engine
+    wlr-randr # Xrandr for wayland
+  ];
 }
diff --git a/programs/nnn/default.nix b/programs/nnn/default.nix
index e5f27c9..583a7b2 100644
--- a/programs/nnn/default.nix
+++ b/programs/nnn/default.nix
@@ -8,4 +8,7 @@
     NNN_FIFO = "/tmp/nnn.fifo";
     NNN_TRASH = "1";
   };
+  home.packages = with pkgs; [
+    trash-cli # Trash program for nnn
+  ];
 }
diff --git a/programs/xdg/default.nix b/programs/xdg/default.nix
new file mode 100644
index 0000000..835b5fa
--- /dev/null
+++ b/programs/xdg/default.nix
@@ -0,0 +1,16 @@
+{ config, pkgs, ... }:
+
+{
+  xdg.enable = true;
+  xdg.userDirs.enable = true;
+  xdg.userDirs = {
+    desktop = "${config.home.homeDirectory}/dwn";
+    download = "${config.home.homeDirectory}/dwn";
+    documents = "${config.home.homeDirectory}/dox";
+    publicShare = "${config.home.homeDirectory}/dox/public";
+    templates = "${config.home.homeDirectory}/dox/templates";
+    music = "${config.home.homeDirectory}/med/mus";
+    pictures = "${config.home.homeDirectory}/med/pix";
+    videos = "${config.home.homeDirectory}/med/vid";
+  };
+}