diff --git a/common/default.nix b/common/default.nix
index 247f3e21..7fccdd48 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -5,5 +5,6 @@
     ./nix
     ./systemd
     ./timezone
+    ./user
   ];
 }
diff --git a/user/default.nix b/common/user/default.nix
similarity index 100%
rename from user/default.nix
rename to common/user/default.nix
diff --git a/desktop/default.nix b/desktop/default.nix
index 52103787..103a05f5 100644
--- a/desktop/default.nix
+++ b/desktop/default.nix
@@ -1,13 +1,20 @@
 {
   imports = [
+    ./dual-function-keys
     ./dunst
     ./fcitx5
+    ./fonts
+    ./gtk
     ./hyprland
     ./mozc
+    ./pipewire
     ./rofi
+    ./stylix
     ./swaylock
+    ./udiskie
     ./waybar
     ./xcursor
+    ./xdg-user-dirs
     ./xresources
     ./xserver
   ];
diff --git a/dual-function-keys/default.nix b/desktop/dual-function-keys/default.nix
similarity index 100%
rename from dual-function-keys/default.nix
rename to desktop/dual-function-keys/default.nix
diff --git a/fonts/default.nix b/desktop/fonts/default.nix
similarity index 100%
rename from fonts/default.nix
rename to desktop/fonts/default.nix
diff --git a/gtk/default.nix b/desktop/gtk/default.nix
similarity index 100%
rename from gtk/default.nix
rename to desktop/gtk/default.nix
diff --git a/pipewire/default.nix b/desktop/pipewire/default.nix
similarity index 100%
rename from pipewire/default.nix
rename to desktop/pipewire/default.nix
diff --git a/stylix/default.nix b/desktop/stylix/default.nix
similarity index 100%
rename from stylix/default.nix
rename to desktop/stylix/default.nix
diff --git a/stylix/wallpaper.png b/desktop/stylix/wallpaper.png
similarity index 100%
rename from stylix/wallpaper.png
rename to desktop/stylix/wallpaper.png
diff --git a/udiskie/default.nix b/desktop/udiskie/default.nix
similarity index 100%
rename from udiskie/default.nix
rename to desktop/udiskie/default.nix
diff --git a/xdg-user-dirs/default.nix b/desktop/xdg-user-dirs/default.nix
similarity index 100%
rename from xdg-user-dirs/default.nix
rename to desktop/xdg-user-dirs/default.nix
diff --git a/dev/default.nix b/dev/default.nix
index 93a1b74a..00b67f41 100644
--- a/dev/default.nix
+++ b/dev/default.nix
@@ -1,5 +1,6 @@
 {
   imports = [
+    ./editorconfig
     ./npm
   ];
 }
diff --git a/editorconfig/default.nix b/dev/editorconfig/default.nix
similarity index 100%
rename from editorconfig/default.nix
rename to dev/editorconfig/default.nix
diff --git a/flake.nix b/flake.nix
index 56259b1e..dfd53673 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,65 +26,16 @@
       system = "x86_64-linux";
       specialArgs = attrs;
       modules = [
-        ./home-manager
+        home-manager.nixosModules.home-manager
         hyprland.nixosModules.default
         stylix.nixosModules.stylix
-        home-manager.nixosModules.home-manager
-        ./laptop.nix
-        ./bat
-        ./dunst
-        ./editorconfig
-        ./fcitx5
-        ./feh
-        ./fish
-        ./git
-        ./gpg-agent
-        ./gpg
-        ./gtk
-        ./hyprland
-        ./kitty
-        ./librewolf
-        ./mozc
-        ./mpd
-        ./mpv
-        ./ncmpcpp
-        ./neovim
-        ./qutebrowser
-        ./ranger
-        ./rofi
-        ./swaylock
-        ./thunar
-        ./tig
-        ./udiskie
-        ./waybar
-        ./xcursor
-        ./xdg-user-dirs
-        ./xresources
-        ./zathura
-        ./starship
-        ./fonts
-        ./stylix
-        ./htop
-        ./dual-function-keys
-        ./tlp
-        ./osu
-        ./srb2
-        ./mullvad
-        ./pipewire
-        ./networking
-        ./virtualization
-        ./xserver
-        ./systemd
-        ./vnstat
-        ./locale
-        ./firejail
-        ./timezone
-        ./nix
-        ./npm
-        ./home-manager
-        ./user
-        ./piper
-        ./packages
+        ./applications
+        ./common
+        ./desktop
+        ./dev
+        ./games
+        ./host
+        ./terminal
         {
           boot.loader.systemd-boot.enable = true;
           boot.loader.efi.canTouchEfiVariables = true;
diff --git a/host/default.nix b/host/default.nix
new file mode 100644
index 00000000..a5f34488
--- /dev/null
+++ b/host/default.nix
@@ -0,0 +1,8 @@
+{
+  imports = [
+    ./mullvad
+    ./networking
+    ./packages
+    ./virtualization
+  ];
+}
diff --git a/mullvad/default.nix b/host/mullvad/default.nix
similarity index 100%
rename from mullvad/default.nix
rename to host/mullvad/default.nix
diff --git a/networking/default.nix b/host/networking/default.nix
similarity index 100%
rename from networking/default.nix
rename to host/networking/default.nix
diff --git a/packages/default.nix b/host/packages/default.nix
similarity index 96%
rename from packages/default.nix
rename to host/packages/default.nix
index b444662e..ce426844 100644
--- a/packages/default.nix
+++ b/host/packages/default.nix
@@ -17,7 +17,6 @@
     anki
     logseq
     yt-dlp
-    gurk-rs
     wl-clipboard
     ffmpeg
     siege
@@ -64,5 +63,8 @@
     rustfmt
     cargo
     genact
+    helix
+    nil
+    marksman
   ];
 }
diff --git a/virtualization/default.nix b/host/virtualization/default.nix
similarity index 100%
rename from virtualization/default.nix
rename to host/virtualization/default.nix
diff --git a/terminal/default.nix b/terminal/default.nix
index 1d674241..c238d58d 100644
--- a/terminal/default.nix
+++ b/terminal/default.nix
@@ -3,6 +3,7 @@
     ./bat
     ./fish
     ./git
+    ./gpg
     ./htop
     ./ncmpcpp
     ./neovim
diff --git a/gpg/default.nix b/terminal/gpg/default.nix
similarity index 100%
rename from gpg/default.nix
rename to terminal/gpg/default.nix