diff --git a/nixos/modules/hyprland/default.nix b/nixos/modules/hyprland/default.nix
index 7389e7b..96acb58 100755
--- a/nixos/modules/hyprland/default.nix
+++ b/nixos/modules/hyprland/default.nix
@@ -1,13 +1,6 @@
 {
   imports = map (file: ./${file}.nix) [
-    "geoclue2"
-    "greetd"
-    "network"
     "hypridle"
     "hyprland"
-    "regreet"
-    "swaylock"
-    "thunar"
-    "wayland"
   ];
 }
diff --git a/nixos/modules/hyprland/greetd.nix b/nixos/modules/hyprland/greetd.nix
deleted file mode 100755
index cb46a38..0000000
--- a/nixos/modules/hyprland/greetd.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  config,
-  flake,
-  lib,
-  ...
-}: let
-  inherit
-    (flake.config.people)
-    user0
-    ;
-in {
-  services = {
-    greetd = {
-      enable = true;
-      vt = 7;
-      settings = let
-        default_session = {
-          command = "${lib.meta.getExe config.programs.hyprland.package}";
-          user = user0;
-        };
-      in {
-        inherit
-          default_session
-          ;
-        initial_session = default_session;
-      };
-    };
-  };
-}
diff --git a/nixos/modules/wayland/default.nix b/nixos/modules/wayland/default.nix
new file mode 100755
index 0000000..e45833b
--- /dev/null
+++ b/nixos/modules/wayland/default.nix
@@ -0,0 +1,11 @@
+{
+  imports = map (file: ./${file}.nix) [
+    "geoclue2"
+    "greetd"
+    "network"
+    "regreet"
+    "swaylock"
+    "thunar"
+    "wayland"
+  ];
+}
diff --git a/nixos/modules/hyprland/geoclue2.nix b/nixos/modules/wayland/geoclue2.nix
similarity index 100%
rename from nixos/modules/hyprland/geoclue2.nix
rename to nixos/modules/wayland/geoclue2.nix
diff --git a/nixos/modules/wayland/greetd.nix b/nixos/modules/wayland/greetd.nix
new file mode 100755
index 0000000..0441d56
--- /dev/null
+++ b/nixos/modules/wayland/greetd.nix
@@ -0,0 +1,32 @@
+{
+  config,
+  flake,
+  lib,
+  ...
+}:
+let
+  inherit (flake.config.people)
+    user0
+    ;
+in
+{
+  services = {
+    greetd = {
+      enable = true;
+      vt = 7;
+      settings =
+        let
+          default_session = {
+            command = "${lib.meta.getExe config.programs.hyprland.package}";
+            user = user0;
+          };
+        in
+        {
+          inherit
+            default_session
+            ;
+          initial_session = default_session;
+        };
+    };
+  };
+}
diff --git a/nixos/modules/hyprland/network.nix b/nixos/modules/wayland/network.nix
similarity index 100%
rename from nixos/modules/hyprland/network.nix
rename to nixos/modules/wayland/network.nix
diff --git a/nixos/modules/hyprland/regreet.nix b/nixos/modules/wayland/regreet.nix
similarity index 100%
rename from nixos/modules/hyprland/regreet.nix
rename to nixos/modules/wayland/regreet.nix
diff --git a/nixos/modules/hyprland/swaylock.nix b/nixos/modules/wayland/swaylock.nix
similarity index 100%
rename from nixos/modules/hyprland/swaylock.nix
rename to nixos/modules/wayland/swaylock.nix
diff --git a/nixos/modules/hyprland/thunar.nix b/nixos/modules/wayland/thunar.nix
similarity index 91%
rename from nixos/modules/hyprland/thunar.nix
rename to nixos/modules/wayland/thunar.nix
index 5a1d652..9dc6381 100755
--- a/nixos/modules/hyprland/thunar.nix
+++ b/nixos/modules/wayland/thunar.nix
@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   programs.thunar = {
     enable = true;
     plugins = [
diff --git a/nixos/modules/hyprland/wayland.nix b/nixos/modules/wayland/wayland.nix
similarity index 89%
rename from nixos/modules/hyprland/wayland.nix
rename to nixos/modules/wayland/wayland.nix
index 9b71dc6..2c6f2e4 100755
--- a/nixos/modules/hyprland/wayland.nix
+++ b/nixos/modules/wayland/wayland.nix
@@ -10,7 +10,7 @@
       extraPortals = builtins.attrValues {
         inherit (pkgs)
           xdg-desktop-portal-gtk
-          xdg-desktop-portal-hyprland
+          # xdg-desktop-portal-hyprland
           xdg-desktop-portal-wlr
           ;
       };