diff --git a/modules/default.nix b/modules/default.nix
index 173b621..fbdbfb4 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -11,6 +11,5 @@
     ./packages.nix
     ./services
     ./system
-    ./users.nix
   ];
 }
diff --git a/modules/system/default.nix b/modules/system/default.nix
index b651ebe..24edcbe 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -4,5 +4,6 @@
 {
   imports = [
     ./media.nix
+    ./users.nix
   ];
 }
diff --git a/modules/ssh/aramis.pub b/modules/system/ssh/aramis.pub
similarity index 100%
rename from modules/ssh/aramis.pub
rename to modules/system/ssh/aramis.pub
diff --git a/modules/ssh/shared.pub b/modules/system/ssh/shared.pub
similarity index 100%
rename from modules/ssh/shared.pub
rename to modules/system/ssh/shared.pub
diff --git a/modules/users.nix b/modules/system/users.nix
similarity index 100%
rename from modules/users.nix
rename to modules/system/users.nix