diff --git a/hosts/crocoite/crocoite.nix b/hosts/crocoite/crocoite.nix
index e816cca..c8dfb57 100644
--- a/hosts/crocoite/crocoite.nix
+++ b/hosts/crocoite/crocoite.nix
@@ -59,42 +59,21 @@
     ./hardware-configuration.nix
     ./boot.nix
 
-    ../../modules/locale.nix
-    ../../modules/networking.nix
-    ../../modules/boot_theming.nix
-    ../../modules/environment.nix
+    ../../modules
 
-    ../../modules/users/ranomier.nix
+    ../../modules/users
 
-    ../../modules/specific_hardware/scan_and_print.nix
-    ../../modules/specific_hardware/fwupd.nix
-    ../../modules/specific_hardware/bluetooth.nix
+    ../../modules/specific_hardware
 
-    ../../modules/sec_auth/firejail.nix
-    ../../modules/sec_auth/login-manager.nix
-    ../../modules/sec_auth/apparmor.nix
-    ../../modules/sec_auth/ssh.nix
+    ../../modules/sec_auth
 
-    ../../modules/software/software.nix
-    ../../modules/software/virt.nix
-    ../../modules/software/game.nix
-    ../../modules/software/audio_video.nix
-    ../../modules/software/obs-studio.nix
-    ../../modules/software/shell.nix
-    ../../modules/software/flatpak.nix
+    ../../modules/software
+    ../../modules/software/browser
+    ../../modules/software/nix-helper
 
-    ../../modules/wm_and_de/hyprland.nix
+    ../../modules/wm_and_de
 
-    ../../modules/pkg_mgrmnt/flatpak.nix
-    ../../modules/pkg_mgrmnt/podman.nix
-    ../../modules/pkg_mgrmnt/store_pkg_file.nix
+    ../../modules/pkg_mgrmnt
 
-    ../../modules/software/nix-helper/index.nix
-    #../../modules/software/nix-helper/doc.nix
-    ../../modules/software/nix-helper/nix-ld.nix
-
-    ../../modules/software/browser/firefox.nix
-    ../../modules/software/browser/brave.nix
-    ../../modules/software/browser/nyxt.nix
   ];
 }
diff --git a/modules/default.nix b/modules/default.nix
new file mode 100644
index 0000000..8d6c975
--- /dev/null
+++ b/modules/default.nix
@@ -0,0 +1,8 @@
+{ ... }: {
+  imports = [
+    ./boot_theming.nix
+    ./environment.nix
+    ./locale.nix
+    ./networking.nix
+  ];
+}
diff --git a/modules/pkg_mgrmnt/default.nix b/modules/pkg_mgrmnt/default.nix
new file mode 100644
index 0000000..71c5425
--- /dev/null
+++ b/modules/pkg_mgrmnt/default.nix
@@ -0,0 +1,7 @@
+{ ... }: {
+  imports = [
+    ./flatpak.nix
+    ./podman.nix
+    ./store_pkg_file.nix
+  ];
+}
diff --git a/modules/sec_auth/default.nix b/modules/sec_auth/default.nix
new file mode 100644
index 0000000..8b8f5eb
--- /dev/null
+++ b/modules/sec_auth/default.nix
@@ -0,0 +1,8 @@
+{ ... }: {
+  imports = [
+    ./apparmor.nix
+    ./firejail.nix
+    ./login-manager.nix
+    ./ssh.nix
+  ];
+}
diff --git a/modules/software/browser/default.nix b/modules/software/browser/default.nix
new file mode 100644
index 0000000..c7993a3
--- /dev/null
+++ b/modules/software/browser/default.nix
@@ -0,0 +1,7 @@
+{ ... }: {
+  imports = [
+    ./brave.nix
+    ./firefox.nix
+    ./nyxt.nix
+  ];
+}
diff --git a/modules/software/default.nix b/modules/software/default.nix
new file mode 100644
index 0000000..8a9ebdf
--- /dev/null
+++ b/modules/software/default.nix
@@ -0,0 +1,11 @@
+{ ... }: {
+  imports = [
+    ./audio_video.nix
+    ./flatpak.nix
+    ./game.nix
+    ./obs-studio.nix
+    ./shell.nix
+    ./software.nix
+    ./virt.nix
+  ];
+}
diff --git a/modules/software/nix-helper/default.nix b/modules/software/nix-helper/default.nix
new file mode 100644
index 0000000..98db3a7
--- /dev/null
+++ b/modules/software/nix-helper/default.nix
@@ -0,0 +1,7 @@
+{ ... }: {
+  imports = [
+    #./doc.nix
+    ./index.nix
+    ./nix-ld.nix
+  ];
+}
diff --git a/modules/specific_hardware/default.nix b/modules/specific_hardware/default.nix
new file mode 100644
index 0000000..1eb44d0
--- /dev/null
+++ b/modules/specific_hardware/default.nix
@@ -0,0 +1,7 @@
+{ ... }: {
+  imports = [
+    ./bluetooth.nix
+    ./fwupd.nix
+    ./scan_and_print.nix
+  ];
+}
diff --git a/modules/users/default.nix b/modules/users/default.nix
new file mode 100644
index 0000000..e76314b
--- /dev/null
+++ b/modules/users/default.nix
@@ -0,0 +1,5 @@
+{ ... }: {
+  imports = [
+    ./ranomier.nix
+  ];
+}
diff --git a/modules/wm_and_de/default.nix b/modules/wm_and_de/default.nix
new file mode 100644
index 0000000..74809a6
--- /dev/null
+++ b/modules/wm_and_de/default.nix
@@ -0,0 +1,5 @@
+{ ... }: {
+  imports = [
+    ./hyprland.nix
+  ];
+}