diff --git a/flake.nix b/flake.nix
index caf2beb..5170f3d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -56,21 +56,21 @@
                 till = {
                   imports = [
                     ./home/desktop-full.nix
-                    ./home/users/till.nix
+                    ./users/till/home.nix
                   ];
                 };
 
                 alt = {
                   imports = [
                     ./home/desktop-slim.nix
-                    ./home/users/alt.nix
+                    ./users/alt/home.nix
                   ];
                 };
 
                 guest = {
                   imports = [
                     ./home/desktop-slim.nix
-                    ./home/users/guest.nix
+                    ./users/guest/home.nix
                   ];
                 };
               };
diff --git a/hosts/nova/default.nix b/hosts/nova/default.nix
index 9757a76..969a3e5 100644
--- a/hosts/nova/default.nix
+++ b/hosts/nova/default.nix
@@ -5,8 +5,8 @@
 
   imports = [
     ./hardware-configuration.nix
-    ../../users/alt.nix
-    ../../users/guest.nix
+    ../../users/alt/system.nix
+    ../../users/guest/system.nix
     ../../system
     ../../system/desktop
     ../../system/desktop/gnome.nix
diff --git a/system/default.nix b/system/default.nix
index 688001f..830d769 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -1,14 +1,14 @@
-{ config, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   imports = [
-    ../users/till.nix
+    ../users/till/system.nix
   ];
 
-  networking.networkmanager.enable = true;
-  users.mutableUsers = true;
-  time.timeZone = "Europe/Berlin";
+  users.mutableUsers = lib.mkDefault true;
   programs.fish.enable = true;
+  time.timeZone = lib.mkDefault "Europe/Berlin";
+  networking.networkmanager.enable = true;
 
   nix = {
     settings.experimental-features = [ "nix-command" "flakes" ];
@@ -45,5 +45,6 @@
     settings.PermitRootLogin = "no";
   };
 
+  # Do NOT change this value
   system.stateVersion = "22.11";
 }
diff --git a/template.nix b/template.nix
deleted file mode 100644
index da77699..0000000
--- a/template.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [
-  ];
-
-}
diff --git a/home/users/alt.nix b/users/alt/home.nix
similarity index 100%
rename from home/users/alt.nix
rename to users/alt/home.nix
diff --git a/users/alt.nix b/users/alt/system.nix
similarity index 100%
rename from users/alt.nix
rename to users/alt/system.nix
diff --git a/home/users/guest.nix b/users/guest/home.nix
similarity index 100%
rename from home/users/guest.nix
rename to users/guest/home.nix
diff --git a/users/guest.nix b/users/guest/system.nix
similarity index 85%
rename from users/guest.nix
rename to users/guest/system.nix
index 04f070e..ddfbf5e 100644
--- a/users/guest.nix
+++ b/users/guest/system.nix
@@ -7,7 +7,7 @@
     extraGroups = [ "networkmanager" ];
     shell = pkgs.fish;
     openssh.authorizedKeys.keyFiles = [
-      ../till${"@"}nova.pub
+      ../till/ssh/till${"@"}nova.pub
     ];
   };
 }
diff --git a/home/users/till.nix b/users/till/home.nix
similarity index 100%
rename from home/users/till.nix
rename to users/till/home.nix
diff --git a/till@nova.pub b/users/till/ssh/till@nova.pub
similarity index 100%
rename from till@nova.pub
rename to users/till/ssh/till@nova.pub
diff --git a/users/till.nix b/users/till/system.nix
similarity index 88%
rename from users/till.nix
rename to users/till/system.nix
index d32fcd9..fd25636 100644
--- a/users/till.nix
+++ b/users/till/system.nix
@@ -10,7 +10,7 @@
     ];
     shell = pkgs.fish;
     openssh.authorizedKeys.keyFiles = [
-      ../till${"@"}nova.pub
+      ./ssh/till${"@"}nova.pub
     ];
   };
 }