diff --git a/modules/module2.nix b/modules/module2.nix
deleted file mode 100644
index bba432e..0000000
--- a/modules/module2.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-_: {
-  imports = [
-    ./programs
-    ./other
-    ./services
-    ./wms
-    ./style
-    ./options
-    ./system
-  ];
-}
diff --git a/modules/programs/editors/helix/languages.nix b/modules/programs/editors/helix/languages.nix
index 3ec0f25..d5bd891 100644
--- a/modules/programs/editors/helix/languages.nix
+++ b/modules/programs/editors/helix/languages.nix
@@ -6,7 +6,7 @@
 }: let
   cfg = config.modules.system.programs.editors.helix;
   inherit (config.modules.other.system) username;
-  inherit (lib) mkIf getExe ;
+  inherit (lib) mkIf getExe;
 in {
   config = mkIf cfg.enable {
     home-manager.users.${username} = {
diff --git a/modules/system/boot/default.nix b/modules/system/boot/default.nix
deleted file mode 100644
index 4a7959d..0000000
--- a/modules/system/boot/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-_: {imports = [./grub-boot.nix];}
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 2a95e29..672b3c0 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -1,10 +1,6 @@
 _: {
   imports = [
     ./keyboard.nix
-    ./boot
     ./hardware
-    ./nix/module.nix
-    ./os/networking/module.nix
-    ./os/security/module.nix
   ];
 }
diff --git a/modules/system/keyboard.nix b/modules/system/hardware/keyboard/default.nix
similarity index 100%
rename from modules/system/keyboard.nix
rename to modules/system/hardware/keyboard/default.nix
diff --git a/modules/system/hardware/module.nix b/modules/system/hardware/module.nix
index 76470ec..da4c82d 100644
--- a/modules/system/hardware/module.nix
+++ b/modules/system/hardware/module.nix
@@ -1 +1 @@
-_: {imports = [./bluetooth.nix ./graphics.nix];}
+_: {imports = [./bluetooth.nix ./keyboard ./graphics.nix];}
diff --git a/modules/wms/default.nix b/modules/wms/default.nix
deleted file mode 100644
index c6aa3d6..0000000
--- a/modules/wms/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-_: {imports = [./wayland];}
diff --git a/modules/wms/wayland/default.nix b/modules/wms/wayland/module.nix
similarity index 63%
rename from modules/wms/wayland/default.nix
rename to modules/wms/wayland/module.nix
index 54ab46d..9a66420 100644
--- a/modules/wms/wayland/default.nix
+++ b/modules/wms/wayland/module.nix
@@ -1,6 +1,5 @@
 _: {
   imports = [
-    ./hyprland/module.nix
     ./variables.nix
   ];
 }