diff --git a/modules/system/boot.nix b/modules/system/boot/default.nix
similarity index 100%
rename from modules/system/boot.nix
rename to modules/system/boot/default.nix
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 2b2bf97..5165e64 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -3,11 +3,11 @@
 
 {
   imports = [
-    ./boot.nix
-    ./documentation.nix
-    ./language.nix
-    ./nix.nix
-    ./packages.nix
-    ./users.nix
+    ./boot
+    ./documentation
+    ./language
+    ./nix
+    ./packages
+    ./users
   ];
 }
diff --git a/modules/system/documentation.nix b/modules/system/documentation/default.nix
similarity index 100%
rename from modules/system/documentation.nix
rename to modules/system/documentation/default.nix
diff --git a/modules/system/language.nix b/modules/system/language/default.nix
similarity index 100%
rename from modules/system/language.nix
rename to modules/system/language/default.nix
diff --git a/modules/system/nix.nix b/modules/system/nix/default.nix
similarity index 100%
rename from modules/system/nix.nix
rename to modules/system/nix/default.nix
diff --git a/modules/system/packages.nix b/modules/system/packages/default.nix
similarity index 100%
rename from modules/system/packages.nix
rename to modules/system/packages/default.nix
diff --git a/modules/system/users.nix b/modules/system/users/default.nix
similarity index 100%
rename from modules/system/users.nix
rename to modules/system/users/default.nix
diff --git a/modules/system/ssh/aramis.pub b/modules/system/users/ssh/aramis.pub
similarity index 100%
rename from modules/system/ssh/aramis.pub
rename to modules/system/users/ssh/aramis.pub
diff --git a/modules/system/ssh/shared.pub b/modules/system/users/ssh/shared.pub
similarity index 100%
rename from modules/system/ssh/shared.pub
rename to modules/system/users/ssh/shared.pub