diff --git a/hosts/perso-desktop/configuration.nix b/hosts/perso-desktop/configuration.nix
index 0c726c9..69efd70 100644
--- a/hosts/perso-desktop/configuration.nix
+++ b/hosts/perso-desktop/configuration.nix
@@ -41,6 +41,8 @@
       qemu.enable = true;
     };
 
+    boot.plymouth.enable = true;
+
     desktop = {
       plasma = {
         enable = true;
@@ -51,9 +53,8 @@
       bluetooth.enable = true;
       gamingKernel.enable = true;
       keymaps.layout = "us";
-      nvidia.enable = true;
-      pipewire.enable = true;
-      plymouth.enable = true;
+      graphics.nvidia.enable = true;
+      audio.pipewire.enable = true;
       printing.enable = true;
       waydroid.enable = true;
     };
diff --git a/hosts/perso-laptop/configuration.nix b/hosts/perso-laptop/configuration.nix
index e067cfe..d4420d8 100644
--- a/hosts/perso-laptop/configuration.nix
+++ b/hosts/perso-laptop/configuration.nix
@@ -42,6 +42,8 @@
       flatpak.enable = true;
     };
 
+    boot.plymouth.enable = true;
+
     desktop = {
       plasma.enable = true;
     };
@@ -50,9 +52,8 @@
       bluetooth.enable = true;
       gamingKernel.enable = true;
       keymaps.layout = "fr";
-      nvidia.enable = true;
-      pipewire.enable = true;
-      plymouth.enable = true;
+      graphics.nvidia.enable = true;
+      audio.pipewire.enable = true;
       printing.enable = true;
       waydroid.enable = true;
     };
diff --git a/modules/system/boot/default.nix b/modules/system/boot/default.nix
new file mode 100644
index 0000000..5ffa010
--- /dev/null
+++ b/modules/system/boot/default.nix
@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  imports = [
+    ./plymouth.nix
+  ];
+}
\ No newline at end of file
diff --git a/modules/system/hardware/plymouth.nix b/modules/system/boot/plymouth.nix
similarity index 68%
rename from modules/system/hardware/plymouth.nix
rename to modules/system/boot/plymouth.nix
index 8388b0d..171f42e 100644
--- a/modules/system/hardware/plymouth.nix
+++ b/modules/system/boot/plymouth.nix
@@ -2,10 +2,10 @@
 
 with lib;
 let
-  cfg = config.modules.system.hardware.plymouth;
+  cfg = config.modules.system.boot.plymouth;
 in
 {
-  options.modules.system.hardware.plymouth = {
+  options.modules.system.boot.plymouth = {
     enable = mkEnableOption ''
       Enable plymouth with my custom configurations
     '';
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 91d849e..9b250d3 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -3,6 +3,7 @@
 {
   imports = [
     ./apps
+    ./boot
     ./desktop
     ./hardware
     ./services
diff --git a/modules/system/hardware/audio/default.nix b/modules/system/hardware/audio/default.nix
new file mode 100644
index 0000000..08cd750
--- /dev/null
+++ b/modules/system/hardware/audio/default.nix
@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  imports = [
+    ./pipewire.nix
+  ];
+}
\ No newline at end of file
diff --git a/modules/system/hardware/pipewire.nix b/modules/system/hardware/audio/pipewire.nix
similarity index 86%
rename from modules/system/hardware/pipewire.nix
rename to modules/system/hardware/audio/pipewire.nix
index 69bfe79..43f1b03 100644
--- a/modules/system/hardware/pipewire.nix
+++ b/modules/system/hardware/audio/pipewire.nix
@@ -2,10 +2,10 @@
 
 with lib;
 let
-  cfg = config.modules.system.hardware.pipewire;
+  cfg = config.modules.system.hardware.audio.pipewire;
 in
 {
-  options.modules.system.hardware.pipewire = {
+  options.modules.system.hardware.audio.pipewire = {
     enable = mkEnableOption ''
       Enable pipewire with my custom configurations
     '';
diff --git a/modules/system/hardware/default.nix b/modules/system/hardware/default.nix
index 5525334..53e8473 100644
--- a/modules/system/hardware/default.nix
+++ b/modules/system/hardware/default.nix
@@ -2,12 +2,11 @@
 
 {
   imports = [
+    ./audio
     ./bluetooth.nix
     ./gaming-kernel.nix
     ./keymaps
-    ./nvidia.nix
-    ./pipewire.nix
-    ./plymouth.nix
+    ./graphics
     ./printing.nix
     ./waydroid.nix
   ];
diff --git a/modules/system/hardware/graphics/default.nix b/modules/system/hardware/graphics/default.nix
new file mode 100644
index 0000000..955883d
--- /dev/null
+++ b/modules/system/hardware/graphics/default.nix
@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  imports = [
+    ./nvidia.nix
+  ];
+}
\ No newline at end of file
diff --git a/modules/system/hardware/nvidia.nix b/modules/system/hardware/graphics/nvidia.nix
similarity index 94%
rename from modules/system/hardware/nvidia.nix
rename to modules/system/hardware/graphics/nvidia.nix
index 716d75b..cf086ff 100644
--- a/modules/system/hardware/nvidia.nix
+++ b/modules/system/hardware/graphics/nvidia.nix
@@ -2,10 +2,10 @@
 
 with lib;
 let
-  cfg = config.modules.system.hardware.nvidia;
+  cfg = config.modules.system.hardware.graphics.nvidia;
 in
 {
-  options.modules.system.hardware.nvidia = {
+  options.modules.system.hardware.graphics.nvidia = {
     enable = mkEnableOption ''
       Enable nvidia with my custom configurations
     '';