diff --git a/modules/bluetooth.nix b/modules/desktop/bluetooth.nix
similarity index 100%
rename from modules/bluetooth.nix
rename to modules/desktop/bluetooth.nix
diff --git a/modules/bluetuith.nix b/modules/desktop/bluetuith.nix
similarity index 100%
rename from modules/bluetuith.nix
rename to modules/desktop/bluetuith.nix
diff --git a/modules/bookmarkthis.nix b/modules/desktop/bookmarkthis.nix
similarity index 100%
rename from modules/bookmarkthis.nix
rename to modules/desktop/bookmarkthis.nix
diff --git a/modules/browsers/chromium.nix b/modules/desktop/browsers/chromium.nix
similarity index 100%
rename from modules/browsers/chromium.nix
rename to modules/desktop/browsers/chromium.nix
diff --git a/modules/browsers/librewolf/enable.nix b/modules/desktop/browsers/librewolf/enable.nix
similarity index 100%
rename from modules/browsers/librewolf/enable.nix
rename to modules/desktop/browsers/librewolf/enable.nix
diff --git a/modules/browsers/librewolf/extensions.nix b/modules/desktop/browsers/librewolf/extensions.nix
similarity index 100%
rename from modules/browsers/librewolf/extensions.nix
rename to modules/desktop/browsers/librewolf/extensions.nix
diff --git a/modules/browsers/librewolf/languages.nix b/modules/desktop/browsers/librewolf/languages.nix
similarity index 100%
rename from modules/browsers/librewolf/languages.nix
rename to modules/desktop/browsers/librewolf/languages.nix
diff --git a/modules/browsers/librewolf/policies.nix b/modules/desktop/browsers/librewolf/policies.nix
similarity index 100%
rename from modules/browsers/librewolf/policies.nix
rename to modules/desktop/browsers/librewolf/policies.nix
diff --git a/modules/browsers/librewolf/search-engines.nix b/modules/desktop/browsers/librewolf/search-engines.nix
similarity index 100%
rename from modules/browsers/librewolf/search-engines.nix
rename to modules/desktop/browsers/librewolf/search-engines.nix
diff --git a/modules/browsers/librewolf/search.nix b/modules/desktop/browsers/librewolf/search.nix
similarity index 100%
rename from modules/browsers/librewolf/search.nix
rename to modules/desktop/browsers/librewolf/search.nix
diff --git a/modules/browsers/librewolf/settings.nix b/modules/desktop/browsers/librewolf/settings.nix
similarity index 100%
rename from modules/browsers/librewolf/settings.nix
rename to modules/desktop/browsers/librewolf/settings.nix
diff --git a/modules/browsers/qutebrowser/enable.nix b/modules/desktop/browsers/qutebrowser/enable.nix
similarity index 100%
rename from modules/browsers/qutebrowser/enable.nix
rename to modules/desktop/browsers/qutebrowser/enable.nix
diff --git a/modules/browsers/qutebrowser/key-bindings.nix b/modules/desktop/browsers/qutebrowser/key-bindings.nix
similarity index 100%
rename from modules/browsers/qutebrowser/key-bindings.nix
rename to modules/desktop/browsers/qutebrowser/key-bindings.nix
diff --git a/modules/browsers/qutebrowser/package.nix b/modules/desktop/browsers/qutebrowser/package.nix
similarity index 100%
rename from modules/browsers/qutebrowser/package.nix
rename to modules/desktop/browsers/qutebrowser/package.nix
diff --git a/modules/browsers/qutebrowser/search-engines.nix b/modules/desktop/browsers/qutebrowser/search-engines.nix
similarity index 100%
rename from modules/browsers/qutebrowser/search-engines.nix
rename to modules/desktop/browsers/qutebrowser/search-engines.nix
diff --git a/modules/browsers/qutebrowser/settings.nix b/modules/desktop/browsers/qutebrowser/settings.nix
similarity index 100%
rename from modules/browsers/qutebrowser/settings.nix
rename to modules/desktop/browsers/qutebrowser/settings.nix
diff --git a/modules/dconf.nix b/modules/desktop/dconf.nix
similarity index 100%
rename from modules/dconf.nix
rename to modules/desktop/dconf.nix
diff --git a/modules/desktop.nix b/modules/desktop/desktop.nix
similarity index 100%
rename from modules/desktop.nix
rename to modules/desktop/desktop.nix
diff --git a/modules/displayselect/default.nix b/modules/desktop/displayselect/default.nix
similarity index 100%
rename from modules/displayselect/default.nix
rename to modules/desktop/displayselect/default.nix
diff --git a/modules/displayselect/scaling.patch b/modules/desktop/displayselect/scaling.patch
similarity index 100%
rename from modules/displayselect/scaling.patch
rename to modules/desktop/displayselect/scaling.patch
diff --git a/modules/dmenu-mpv.nix b/modules/desktop/dmenu-mpv.nix
similarity index 100%
rename from modules/dmenu-mpv.nix
rename to modules/desktop/dmenu-mpv.nix
diff --git a/modules/dmenu-sys.nix b/modules/desktop/dmenu-sys.nix
similarity index 100%
rename from modules/dmenu-sys.nix
rename to modules/desktop/dmenu-sys.nix
diff --git a/modules/dmenu-timer.nix b/modules/desktop/dmenu-timer.nix
similarity index 100%
rename from modules/dmenu-timer.nix
rename to modules/desktop/dmenu-timer.nix
diff --git a/modules/dmenu-tmux.nix b/modules/desktop/dmenu-tmux.nix
similarity index 100%
rename from modules/dmenu-tmux.nix
rename to modules/desktop/dmenu-tmux.nix
diff --git a/modules/dwm/config.nix b/modules/desktop/dwm/config.nix
similarity index 100%
rename from modules/dwm/config.nix
rename to modules/desktop/dwm/config.nix
diff --git a/modules/dwm/dmenu-center-noop.patch b/modules/desktop/dwm/dmenu-center-noop.patch
similarity index 100%
rename from modules/dwm/dmenu-center-noop.patch
rename to modules/desktop/dwm/dmenu-center-noop.patch
diff --git a/modules/dwm/packages.nix b/modules/desktop/dwm/packages.nix
similarity index 100%
rename from modules/dwm/packages.nix
rename to modules/desktop/dwm/packages.nix
diff --git a/modules/dwm/xinitrc b/modules/desktop/dwm/xinitrc
similarity index 100%
rename from modules/dwm/xinitrc
rename to modules/desktop/dwm/xinitrc
diff --git a/modules/flameshot/enable.nix b/modules/desktop/flameshot/enable.nix
similarity index 100%
rename from modules/flameshot/enable.nix
rename to modules/desktop/flameshot/enable.nix
diff --git a/modules/flameshot/settings.nix b/modules/desktop/flameshot/settings.nix
similarity index 100%
rename from modules/flameshot/settings.nix
rename to modules/desktop/flameshot/settings.nix
diff --git a/modules/fonts.nix b/modules/desktop/fonts.nix
similarity index 100%
rename from modules/fonts.nix
rename to modules/desktop/fonts.nix
diff --git a/modules/games/steam.nix b/modules/desktop/games/steam.nix
similarity index 100%
rename from modules/games/steam.nix
rename to modules/desktop/games/steam.nix
diff --git a/modules/games/zeroad.nix b/modules/desktop/games/zeroad.nix
similarity index 100%
rename from modules/games/zeroad.nix
rename to modules/desktop/games/zeroad.nix
diff --git a/modules/gammastep/enable.nix b/modules/desktop/gammastep/enable.nix
similarity index 100%
rename from modules/gammastep/enable.nix
rename to modules/desktop/gammastep/enable.nix
diff --git a/modules/gammastep/provider.nix b/modules/desktop/gammastep/provider.nix
similarity index 100%
rename from modules/gammastep/provider.nix
rename to modules/desktop/gammastep/provider.nix
diff --git a/modules/gtk/animations.nix b/modules/desktop/gtk/animations.nix
similarity index 100%
rename from modules/gtk/animations.nix
rename to modules/desktop/gtk/animations.nix
diff --git a/modules/gtk/enable.nix b/modules/desktop/gtk/enable.nix
similarity index 100%
rename from modules/gtk/enable.nix
rename to modules/desktop/gtk/enable.nix
diff --git a/modules/gtk/icon-theme.nix b/modules/desktop/gtk/icon-theme.nix
similarity index 100%
rename from modules/gtk/icon-theme.nix
rename to modules/desktop/gtk/icon-theme.nix
diff --git a/modules/gtk/theme.nix b/modules/desktop/gtk/theme.nix
similarity index 100%
rename from modules/gtk/theme.nix
rename to modules/desktop/gtk/theme.nix
diff --git a/modules/handbrake.nix b/modules/desktop/handbrake.nix
similarity index 100%
rename from modules/handbrake.nix
rename to modules/desktop/handbrake.nix
diff --git a/modules/makemkv.nix b/modules/desktop/makemkv.nix
similarity index 100%
rename from modules/makemkv.nix
rename to modules/desktop/makemkv.nix
diff --git a/modules/mpv/bindings.nix b/modules/desktop/mpv/bindings.nix
similarity index 100%
rename from modules/mpv/bindings.nix
rename to modules/desktop/mpv/bindings.nix
diff --git a/modules/mpv/enable.nix b/modules/desktop/mpv/enable.nix
similarity index 100%
rename from modules/mpv/enable.nix
rename to modules/desktop/mpv/enable.nix
diff --git a/modules/redshift.nix b/modules/desktop/redshift.nix
similarity index 100%
rename from modules/redshift.nix
rename to modules/desktop/redshift.nix
diff --git a/modules/sound/pipewire/alsa.nix b/modules/desktop/sound/pipewire/alsa.nix
similarity index 100%
rename from modules/sound/pipewire/alsa.nix
rename to modules/desktop/sound/pipewire/alsa.nix
diff --git a/modules/sound/pipewire/enable.nix b/modules/desktop/sound/pipewire/enable.nix
similarity index 100%
rename from modules/sound/pipewire/enable.nix
rename to modules/desktop/sound/pipewire/enable.nix
diff --git a/modules/sound/pipewire/pulse.nix b/modules/desktop/sound/pipewire/pulse.nix
similarity index 100%
rename from modules/sound/pipewire/pulse.nix
rename to modules/desktop/sound/pipewire/pulse.nix
diff --git a/modules/st.nix b/modules/desktop/st.nix
similarity index 100%
rename from modules/st.nix
rename to modules/desktop/st.nix
diff --git a/modules/sxhkd/enable.nix b/modules/desktop/sxhkd/enable.nix
similarity index 100%
rename from modules/sxhkd/enable.nix
rename to modules/desktop/sxhkd/enable.nix
diff --git a/modules/sxhkd/keybindings.nix b/modules/desktop/sxhkd/keybindings.nix
similarity index 100%
rename from modules/sxhkd/keybindings.nix
rename to modules/desktop/sxhkd/keybindings.nix
diff --git a/modules/thunar/enable.nix b/modules/desktop/thunar/enable.nix
similarity index 100%
rename from modules/thunar/enable.nix
rename to modules/desktop/thunar/enable.nix
diff --git a/modules/thunar/extra-packages.nix b/modules/desktop/thunar/extra-packages.nix
similarity index 100%
rename from modules/thunar/extra-packages.nix
rename to modules/desktop/thunar/extra-packages.nix
diff --git a/modules/thunar/plugins.nix b/modules/desktop/thunar/plugins.nix
similarity index 100%
rename from modules/thunar/plugins.nix
rename to modules/desktop/thunar/plugins.nix
diff --git a/modules/xbanish.nix b/modules/desktop/xbanish.nix
similarity index 100%
rename from modules/xbanish.nix
rename to modules/desktop/xbanish.nix
diff --git a/modules/xsession.nix b/modules/desktop/xsession.nix
similarity index 100%
rename from modules/xsession.nix
rename to modules/desktop/xsession.nix
diff --git a/modules/zram.nix b/modules/desktop/zram.nix
similarity index 100%
rename from modules/zram.nix
rename to modules/desktop/zram.nix