diff --git a/configuration.nix b/configuration.nix
index 847a511..b9375d5 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -12,6 +12,7 @@
     ./dev
     ./games
     ./hardware
+    ./system
   ];
 
   # This value determines the NixOS release from which the default
diff --git a/system/default.nix b/system/default.nix
new file mode 100644
index 0000000..9946b6e
--- /dev/null
+++ b/system/default.nix
@@ -0,0 +1,6 @@
+{
+    imports = [
+        ./grub.nix
+        ./kernel.nix
+    ];
+}
diff --git a/boot.nix b/system/grub.nix
similarity index 76%
rename from boot.nix
rename to system/grub.nix
index a1247c0..6ccb48f 100644
--- a/boot.nix
+++ b/system/grub.nix
@@ -27,21 +27,6 @@
     };
   };
 
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
-  # extra enabled kernel modules
-  boot.kernelModules = [
-    "sg" # for generic SCSI devices such as /dev/sg0
-  ];
-
-  # Kernel parameter on boot
-  boot.kernelParams = [
-    "quiet"
-    "splash"
-    "psi=1"
-    "boot_delay=0"
-  ];
-
   # Setup keyfile
   boot.initrd.secrets = {
     "/crypto_keyfile.bin" = null;
diff --git a/system/kernel.nix b/system/kernel.nix
new file mode 100644
index 0000000..5f7b939
--- /dev/null
+++ b/system/kernel.nix
@@ -0,0 +1,20 @@
+{ pkgs, ... }:
+{
+    boot.kernelPackages = pkgs.linuxPackages_latest;
+
+    # extra enabled kernel modules
+    boot.kernelModules = [
+        "sg" # for generic SCSI devices such as /dev/sg0
+    ];
+
+    boot.consoleLogLevel = 0;
+
+    # Kernel parameter on boot
+    boot.kernelParams = [
+        "quiet"
+        "udev.log_level=3"
+        "splash"
+        "psi=1"
+        "boot_delay=0"
+    ];
+}