diff --git a/hosts/workstation/default.nix b/hosts/workstation/default.nix
index 4012e41..c07bf55 100644
--- a/hosts/workstation/default.nix
+++ b/hosts/workstation/default.nix
@@ -4,10 +4,12 @@
   imports = [
     ./hardware-configuration.nix
     ./persist.nix
-    ../../packages/sets/basic.nix
-    ../../packages/wm/hyprland.nix
+
+    ../../modules/system/basic.nix
+    ../../modules/desktop/environments/hyprland.nix
+    ../../modules/system/security.nix
+
     ../../users/hu/user.nix
-    ../../packages/sets/security.nix
   ];
 
   boot.loader.efi.canTouchEfiVariables = true;
diff --git a/packages/sets/communication.nix b/modules/desktop/apps/communication.nix
similarity index 100%
rename from packages/sets/communication.nix
rename to modules/desktop/apps/communication.nix
diff --git a/packages/sets/games.nix b/modules/desktop/apps/games.nix
similarity index 100%
rename from packages/sets/games.nix
rename to modules/desktop/apps/games.nix
diff --git a/packages/sets/multimedia.nix b/modules/desktop/apps/multimedia.nix
similarity index 100%
rename from packages/sets/multimedia.nix
rename to modules/desktop/apps/multimedia.nix
diff --git a/packages/wm/hyprland.nix b/modules/desktop/environments/hyprland.nix
similarity index 97%
rename from packages/wm/hyprland.nix
rename to modules/desktop/environments/hyprland.nix
index 0870e4d..890c06a 100644
--- a/packages/wm/hyprland.nix
+++ b/modules/desktop/environments/hyprland.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../sets/fonts.nix
+    ../../system/fonts.nix
   ];
 
   environment.systemPackages = with pkgs; [
diff --git a/packages/wm/plasma.nix b/modules/desktop/environments/plasma.nix
similarity index 100%
rename from packages/wm/plasma.nix
rename to modules/desktop/environments/plasma.nix
diff --git a/packages/wm/sway.nix b/modules/desktop/environments/sway.nix
similarity index 100%
rename from packages/wm/sway.nix
rename to modules/desktop/environments/sway.nix
diff --git a/packages/wm/xmonad.nix b/modules/desktop/environments/xmonad.nix
similarity index 100%
rename from packages/wm/xmonad.nix
rename to modules/desktop/environments/xmonad.nix
diff --git a/packages/sets/basic.nix b/modules/system/basic.nix
similarity index 100%
rename from packages/sets/basic.nix
rename to modules/system/basic.nix
diff --git a/packages/sets/fonts.nix b/modules/system/fonts.nix
similarity index 100%
rename from packages/sets/fonts.nix
rename to modules/system/fonts.nix
diff --git a/packages/sets/security.nix b/modules/system/security.nix
similarity index 100%
rename from packages/sets/security.nix
rename to modules/system/security.nix
diff --git a/users/hu/user.nix b/users/hu/user.nix
index bad6f9e..fb4d3f0 100644
--- a/users/hu/user.nix
+++ b/users/hu/user.nix
@@ -2,9 +2,9 @@
 
 {
   imports = [
-    ../../packages/sets/communication.nix
-    ../../packages/sets/games.nix
-    ../../packages/sets/multimedia.nix
+    ../../modules/desktop/apps/communication.nix
+    ../../modules/desktop/apps/games.nix
+    ../../modules/desktop/apps/multimedia.nix
     ./persist.nix
     ./packages/nh.nix
     ./packages/zsh/zsh.nix