diff --git a/nixcfgs/hosts/zephyrus/packages.nix b/nixcfgs/hosts/zephyrus/asus.nix
similarity index 100%
rename from nixcfgs/hosts/zephyrus/packages.nix
rename to nixcfgs/hosts/zephyrus/asus.nix
diff --git a/nixcfgs/hosts/zephyrus/default.nix b/nixcfgs/hosts/zephyrus/default.nix
index 908562c..1fabc89 100644
--- a/nixcfgs/hosts/zephyrus/default.nix
+++ b/nixcfgs/hosts/zephyrus/default.nix
@@ -1,33 +1,54 @@
 # ~/.config/nixcfgs/hosts/zephyrus/default.nix
-{...}: {
+{pkgs, ...}: {
   imports = [
-    ../../modules/nixos
-    ../../modules/nixos/libvirt.nix
-    ../../modules/nixos/docker.nix
-    ../../modules/nixos/exp.nix
-    ../../modules/nixos/desktop/host-machine.nix
-    ../../modules/nixos/desktop/laptop.nix
-    ../../modules/nixos/desktop/disable-nvidia.nix
-    ../../modules/nixos/additional-packages.nix
-    ../../modules/nixos/desktop
-    ../../modules/nixos/desktop/firefox.nix
-    ../../modules/nixos/desktop/steam.nix
-    ../../modules/nixos/desktop/chromium.nix
-    ../../modules/nixos/desktop/obs-studio.nix
-    ../../modules/nixos/desktop/wine.nix
-    ../../modules/nixos/desktop/gnome-keyring.nix
-    ../../modules/nixos/udev/basys3.nix
-    ../../modules/nixos/desktop-environment/kde.nix
-    ../../modules/nixos/desktop-environment/hyprland.nix
-    ../../modules/nixos/display-manager/sddm.nix
+    # Host-specific configs
+    ./asus.nix
     ./hardware-configuration.nix
     ./keyd.nix
-    ./packages.nix
+
+    # core config and packages
+    ../../modules/nixos
+
+    # this is a laptop
+    ../../modules/nixos/desktop
+    ../../modules/nixos/desktop/laptop.nix
+
+    # hardware drivers
+    ../../modules/nixos/hardware/nvidia-disable.nix
+
+    # udev rules
+    ../../modules/nixos/hardware/udev/basys3.nix
+
+    # desktop environment and display manager
+    ../../modules/nixos/desktop/de/kde.nix
+    ../../modules/nixos/desktop/de/hyprland.nix
+    ../../modules/nixos/desktop/dm/sddm.nix
+
+    # desktop programs
+    ../../modules/nixos/programs/chromium.nix
+    ../../modules/nixos/programs/firefox.nix
+    ../../modules/nixos/programs/libvirt.nix
+    ../../modules/nixos/programs/obs-studio.nix
+    ../../modules/nixos/programs/steam.nix
+    ../../modules/nixos/programs/waydroid.nix
+    ../../modules/nixos/programs/winboat.nix
+    ../../modules/nixos/programs/wine.nix
+
+    # services
+    ../../modules/nixos/services/docker.nix
+    ../../modules/nixos/services/exp.nix
   ];
 
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-  nixpkgs.config.allowUnfree = true;
+  # Hostname
   networking.hostName = "zephyrus";
+
+  # Use latest kernel
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
+  # Use unfree software
+  # nixpkgs.config.allowUnfree = true;
+
+  # Disable modem
   networking.modemmanager.enable = false;
   system.stateVersion = "25.05";
 }
diff --git a/nixcfgs/modules/nixos/desktop/default.nix b/nixcfgs/modules/nixos/desktop/default.nix
index 5119da9..fb51438 100644
--- a/nixcfgs/modules/nixos/desktop/default.nix
+++ b/nixcfgs/modules/nixos/desktop/default.nix
@@ -1,8 +1,7 @@
-{...}: {
-
+{pkgs, ...}: {
   imports = [
-    ../rime.nix
-    ../fonts.nix
+    ./fonts.nix
+    ./gnome-keyring.nix
   ];
   services.pipewire = {
     enable = true;
@@ -47,5 +46,6 @@
   };
   environment.systemPackages = with pkgs; [
     wl-clipboard
+    libnotify
   ];
 }
diff --git a/nixcfgs/modules/nixos/desktop/laptop.nix b/nixcfgs/modules/nixos/desktop/laptop.nix
index a4d3b00..113a40b 100644
--- a/nixcfgs/modules/nixos/desktop/laptop.nix
+++ b/nixcfgs/modules/nixos/desktop/laptop.nix
@@ -1,9 +1,8 @@
-{ pkgs, ... }:
-
-{
+{pkgs, ...}: {
   environment.systemPackages = with pkgs; [
     powertop
   ];
+  imports = [
+    ./host-machine.nix
+  ];
 }
-
-
diff --git a/nixcfgs/modules/nixos/desktop/libvirt.nix b/nixcfgs/modules/nixos/programs/libvirt.nix
similarity index 100%
rename from nixcfgs/modules/nixos/desktop/libvirt.nix
rename to nixcfgs/modules/nixos/programs/libvirt.nix
diff --git a/nixcfgs/modules/nixos/programs/packages.nix b/nixcfgs/modules/nixos/programs/packages.nix
deleted file mode 100644
index e5cb8bc..0000000
--- a/nixcfgs/modules/nixos/programs/packages.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
-    nil
-    nixd
-    libnotify
-    imagemagick
-  ];
-}
diff --git a/nixcfgs/modules/nixos/desktop/rime.nix b/nixcfgs/modules/nixos/programs/rime.nix
similarity index 100%
rename from nixcfgs/modules/nixos/desktop/rime.nix
rename to nixcfgs/modules/nixos/programs/rime.nix
diff --git a/nixcfgs/modules/nixos/desktop/steam.nix b/nixcfgs/modules/nixos/programs/steam.nix
similarity index 100%
rename from nixcfgs/modules/nixos/desktop/steam.nix
rename to nixcfgs/modules/nixos/programs/steam.nix
diff --git a/nixcfgs/modules/nixos/desktop/waydroid.nix b/nixcfgs/modules/nixos/programs/waydroid.nix
similarity index 100%
rename from nixcfgs/modules/nixos/desktop/waydroid.nix
rename to nixcfgs/modules/nixos/programs/waydroid.nix
diff --git a/nixcfgs/modules/nixos/desktop/winboat.nix b/nixcfgs/modules/nixos/programs/winboat.nix
similarity index 100%
rename from nixcfgs/modules/nixos/desktop/winboat.nix
rename to nixcfgs/modules/nixos/programs/winboat.nix
diff --git a/nixcfgs/modules/nixos/desktop/wine.nix b/nixcfgs/modules/nixos/programs/wine.nix
similarity index 100%
rename from nixcfgs/modules/nixos/desktop/wine.nix
rename to nixcfgs/modules/nixos/programs/wine.nix