diff --git a/CLAUDE.md b/CLAUDE.md
index 74874dc..2331e59 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -26,7 +26,7 @@ This is a modular, flake-based NixOS configuration for a single host (`hakase`).
 ### Module Organization
 
 **Two-tier module system:**
-- `modules/system/` - NixOS system-level modules (boot, kernel, services, hardware)
+- `modules/nixos/` - NixOS system-level modules (boot, kernel, services, hardware)
 - `modules/home/` - Home Manager user-level modules (imported via `home/hakase.nix`)
 
 **Application configs:** Each application has its own directory in `apps/` with a `default.nix` and optional sub-modules (e.g., `apps/hyprland/hypr/*.nix` for Hyprland settings).
@@ -37,7 +37,7 @@ This is a modular, flake-based NixOS configuration for a single host (`hakase`).
 flake.nix
   └─ nixosConfigurations.hakase
        ├─ hosts/hakase/configuration.nix
-       │   └─ modules/system/default.nix (imports all system modules)
+       │   └─ modules/nixos/default.nix (imports all system modules)
        └─ home-manager
            └─ home/hakase.nix
                └─ modules/home/* → apps/*
diff --git a/hosts/hakase/configuration.nix b/hosts/hakase/configuration.nix
index 8c620e2..84d5d2b 100644
--- a/hosts/hakase/configuration.nix
+++ b/hosts/hakase/configuration.nix
@@ -5,8 +5,8 @@
 }: {
   imports = [
     ./hardware-configuration.nix
-    ../../modules/system/default.nix
-    ../../modules/system/hyprland.nix
-    ../../modules/system/gaming.nix
+    ../../modules/nixos/default.nix
+    ../../modules/nixos/hyprland.nix
+    ../../modules/nixos/gaming.nix
   ];
 }
diff --git a/modules/system/amd.nix b/modules/nixos/amd.nix
similarity index 100%
rename from modules/system/amd.nix
rename to modules/nixos/amd.nix
diff --git a/modules/system/backlight.nix b/modules/nixos/backlight.nix
similarity index 100%
rename from modules/system/backlight.nix
rename to modules/nixos/backlight.nix
diff --git a/modules/system/boot.nix b/modules/nixos/boot.nix
similarity index 100%
rename from modules/system/boot.nix
rename to modules/nixos/boot.nix
diff --git a/modules/system/default.nix b/modules/nixos/default.nix
similarity index 100%
rename from modules/system/default.nix
rename to modules/nixos/default.nix
diff --git a/modules/system/fonts.nix b/modules/nixos/fonts.nix
similarity index 100%
rename from modules/system/fonts.nix
rename to modules/nixos/fonts.nix
diff --git a/modules/system/gaming.nix b/modules/nixos/gaming.nix
similarity index 100%
rename from modules/system/gaming.nix
rename to modules/nixos/gaming.nix
diff --git a/modules/system/hardware.nix b/modules/nixos/hardware.nix
similarity index 100%
rename from modules/system/hardware.nix
rename to modules/nixos/hardware.nix
diff --git a/modules/system/home-manager.nix b/modules/nixos/home-manager.nix
similarity index 100%
rename from modules/system/home-manager.nix
rename to modules/nixos/home-manager.nix
diff --git a/modules/system/hyprland.nix b/modules/nixos/hyprland.nix
similarity index 100%
rename from modules/system/hyprland.nix
rename to modules/nixos/hyprland.nix
diff --git a/modules/system/kernel.nix b/modules/nixos/kernel.nix
similarity index 100%
rename from modules/system/kernel.nix
rename to modules/nixos/kernel.nix
diff --git a/modules/system/nix.nix b/modules/nixos/nix.nix
similarity index 100%
rename from modules/system/nix.nix
rename to modules/nixos/nix.nix
diff --git a/modules/system/programs.nix b/modules/nixos/programs.nix
similarity index 100%
rename from modules/system/programs.nix
rename to modules/nixos/programs.nix
diff --git a/modules/system/security.nix b/modules/nixos/security.nix
similarity index 100%
rename from modules/system/security.nix
rename to modules/nixos/security.nix
diff --git a/modules/system/services.nix b/modules/nixos/services.nix
similarity index 100%
rename from modules/system/services.nix
rename to modules/nixos/services.nix
diff --git a/modules/system/time.nix b/modules/nixos/time.nix
similarity index 100%
rename from modules/system/time.nix
rename to modules/nixos/time.nix
diff --git a/modules/system/user.nix b/modules/nixos/user.nix
similarity index 100%
rename from modules/system/user.nix
rename to modules/nixos/user.nix
diff --git a/modules/system/variables.nix b/modules/nixos/variables.nix
similarity index 100%
rename from modules/system/variables.nix
rename to modules/nixos/variables.nix
diff --git a/modules/system/version.nix b/modules/nixos/version.nix
similarity index 100%
rename from modules/system/version.nix
rename to modules/nixos/version.nix