diff --git a/flake.nix b/flake.nix
index 739e664..0b8c1df 100644
--- a/flake.nix
+++ b/flake.nix
@@ -36,7 +36,7 @@
           ./nixos/programs/anki.nix
         ] [
           ./home/programs/gamer.nix
-          ./home/programs/hyprland.nix
+          ./home/desktop/hyprland/.
           ./home/programs/personal/.
         ];
 
@@ -47,7 +47,7 @@
           ./nixos/modules/work.nix
         ] [
           ./home/programs/work.nix
-          ./home/programs/hyprland.nix
+          ./home/desktop/hyprland/.
         ];
 
       vm-sway =
@@ -62,7 +62,7 @@
           ./hardware/vm.nix
           (auto-login "sway")
         ] [
-          ./home/programs/sway.nix
+          ./home/desktop/sway/.
         ];
 
       vm-hyprland =
@@ -79,7 +79,7 @@
           ./hardware/vm.nix
           (./nixos/programs/auto-login.nix "Hyprland")
         ] [
-          ./home/programs/hyprland.nix
+          ./home/desktop/hyprland/.
         ];
 
       vm-tty = mkConf [
diff --git a/home/programs/hyprland.nix b/home/desktop/hyprland/default.nix
similarity index 98%
rename from home/programs/hyprland.nix
rename to home/desktop/hyprland/default.nix
index 84f44d5..07932db 100644
--- a/home/programs/hyprland.nix
+++ b/home/desktop/hyprland/default.nix
@@ -7,9 +7,9 @@
   modifier = config.windowManager.modifierKey;
 in {
   imports = [
-    (import ./swaylock.nix)
-    (import ./swayidle.nix)
-    (import ./waybar.nix)
+    (import ../utils/swaylock.nix)
+    (import ../utils/swayidle.nix)
+    (import ../utils/waybar.nix)
   ];
   xdg.portal = {
     enable = true;
diff --git a/home/programs/hycov.nix b/home/desktop/hyprland/hycov.nix
similarity index 100%
rename from home/programs/hycov.nix
rename to home/desktop/hyprland/hycov.nix
diff --git a/home/programs/sway.nix b/home/desktop/sway/default.nix
similarity index 84%
rename from home/programs/sway.nix
rename to home/desktop/sway/default.nix
index b534337..609c22d 100644
--- a/home/programs/sway.nix
+++ b/home/desktop/sway/default.nix
@@ -3,7 +3,6 @@
   config,
   ...
 }: let
-  term = "${config.programs.terminal}/bin/${config.programs.terminal.pname}";
   modKeyName = config.windowManager.modifierKey;
   modifier =
     if modKeyName == "SUPER"
@@ -13,9 +12,9 @@
     else null;
 in {
   imports = [
-    (import ./swaylock.nix)
-    (import ./swayidle.nix)
-    (import ./waybar.nix)
+    (import ../utils/swaylock.nix)
+    (import ../utils/swayidle.nix)
+    (import ../utils/waybar.nix)
   ];
   xdg.portal = {
     enable = true;
diff --git a/home/programs/swayidle.nix b/home/desktop/utils/swayidle.nix
similarity index 100%
rename from home/programs/swayidle.nix
rename to home/desktop/utils/swayidle.nix
diff --git a/home/programs/swaylock.nix b/home/desktop/utils/swaylock.nix
similarity index 100%
rename from home/programs/swaylock.nix
rename to home/desktop/utils/swaylock.nix
diff --git a/home/programs/waybar.nix b/home/desktop/utils/waybar.nix
similarity index 100%
rename from home/programs/waybar.nix
rename to home/desktop/utils/waybar.nix