diff --git a/.gitattributes b/.gitattributes
index f0bd4f3..1b4ca31 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-secrets.nix filter=git-crypt diff=git-crypt
+**/secrets.nix filter=git-crypt diff=git-crypt
diff --git a/makefile b/makefile
index 1a7c2bb..49ab12f 100644
--- a/makefile
+++ b/makefile
@@ -1,11 +1,11 @@
 switchHm = home-manager switch --flake
 switchSys = nixos-rebuild switch --flake
 
-home-me: fix-systemd
-	${switchHm} .#home-me
+users-jan: fix-systemd
+	${switchHm} .#users-jan
 
-home-laptop-me: fix-systemd
-	${switchHm} .#home-laptop-me
+users-laptop-jan: fix-systemd
+	${switchHm} .#users-laptop-jan
 
 sys-home:
 	sudo ${switchSys} .#system-home
diff --git a/outputs/home.nix b/outputs/home.nix
index de9d623..087664a 100644
--- a/outputs/home.nix
+++ b/outputs/home.nix
@@ -14,18 +14,18 @@ let
     ];
   };
 
-  mkHome = mods: home-manager.lib.homeManagerConfiguration {
+  mkUsersJan = mods: home-manager.lib.homeManagerConfiguration {
     inherit pkgs;
 
     modules = [
       inputs.wired.homeManagerModules.default
-      ../home/home.nix
+      ../users/jan/home.nix
     ] ++ mods;
   };
 in
 {
-  home-me = mkHome [ ];
-  home-laptop-me = mkHome [
+  users-jan = mkUsersJan [ ];
+  users-laptop-jan = mkUsersJan [
     ({ config, ... }: {
       progs.alacritty.fontSize = 6.0;
     })
diff --git a/secrets.nix b/secrets.nix
index cc5c7eb..e9525d2 100644
Binary files a/secrets.nix and b/secrets.nix differ
diff --git a/system/configuration.nix b/system/configuration.nix
index 5bb5528..d40e254 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -97,8 +97,8 @@ in
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.me = {
     isNormalUser = true;
-    name = secrets.userName;
-    home = secrets.userDir;
+    name = secrets.mainUser.userName;
+    home = secrets.mainUser.userDir;
     extraGroups = [
       "wheel" # Enable ‘sudo’ for the user.
       "networkmanager"
@@ -131,7 +131,7 @@ in
     settings = {
       auto-optimise-store = true;
 
-      trusted-users = [ "root" secrets.userName ];
+      trusted-users = [ "root" secrets.mainUser.userName ];
 
       experimental-features = [ "nix-command" "flakes" ];
 
diff --git a/home/home.nix b/users/jan/home.nix
similarity index 95%
rename from home/home.nix
rename to users/jan/home.nix
index 3f0d274..d891101 100644
--- a/home/home.nix
+++ b/users/jan/home.nix
@@ -1,12 +1,12 @@
 { config, pkgs, ... }:
 
 let
-  secrets = import ../secrets.nix;
+  secrets = import ./secrets.nix;
 in
 {
   imports = (import ./ui) ++ (import ./shell) ++ (import ./progs);
 
-  nixpkgs.overlays = import ../overlays;
+  nixpkgs.overlays = import ../../overlays;
 
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
@@ -120,12 +120,12 @@ in
 
   home.file = {
     "scripts" = {
-      source = ../scripts;
+      source = ./scripts;
       recursive = true;
     };
 
     "pictures/wallpapers" = {
-      source = ../wallpapers;
+      source = ./wallpapers;
       recursive = true;
     };
   };
diff --git a/home/progs/aerc/colorize b/users/jan/progs/aerc/colorize
similarity index 100%
rename from home/progs/aerc/colorize
rename to users/jan/progs/aerc/colorize
diff --git a/home/progs/aerc/default.nix b/users/jan/progs/aerc/default.nix
similarity index 100%
rename from home/progs/aerc/default.nix
rename to users/jan/progs/aerc/default.nix
diff --git a/home/progs/alacritty/config.nix b/users/jan/progs/alacritty/config.nix
similarity index 100%
rename from home/progs/alacritty/config.nix
rename to users/jan/progs/alacritty/config.nix
diff --git a/home/progs/alacritty/default.nix b/users/jan/progs/alacritty/default.nix
similarity index 100%
rename from home/progs/alacritty/default.nix
rename to users/jan/progs/alacritty/default.nix
diff --git a/home/progs/default.nix b/users/jan/progs/default.nix
similarity index 100%
rename from home/progs/default.nix
rename to users/jan/progs/default.nix
diff --git a/home/progs/exa.nix b/users/jan/progs/exa.nix
similarity index 100%
rename from home/progs/exa.nix
rename to users/jan/progs/exa.nix
diff --git a/home/progs/git.nix b/users/jan/progs/git.nix
similarity index 100%
rename from home/progs/git.nix
rename to users/jan/progs/git.nix
diff --git a/home/progs/himalaya.nix b/users/jan/progs/himalaya.nix
similarity index 100%
rename from home/progs/himalaya.nix
rename to users/jan/progs/himalaya.nix
diff --git a/home/progs/hledger.nix b/users/jan/progs/hledger.nix
similarity index 100%
rename from home/progs/hledger.nix
rename to users/jan/progs/hledger.nix
diff --git a/home/progs/nvim.nix b/users/jan/progs/nvim.nix
similarity index 100%
rename from home/progs/nvim.nix
rename to users/jan/progs/nvim.nix
diff --git a/home/progs/pass.nix b/users/jan/progs/pass.nix
similarity index 100%
rename from home/progs/pass.nix
rename to users/jan/progs/pass.nix
diff --git a/home/progs/vifm/default.nix b/users/jan/progs/vifm/default.nix
similarity index 100%
rename from home/progs/vifm/default.nix
rename to users/jan/progs/vifm/default.nix
diff --git a/home/progs/vifm/vifmrc b/users/jan/progs/vifm/vifmrc
similarity index 100%
rename from home/progs/vifm/vifmrc
rename to users/jan/progs/vifm/vifmrc
diff --git a/home/progs/zoxide.nix b/users/jan/progs/zoxide.nix
similarity index 100%
rename from home/progs/zoxide.nix
rename to users/jan/progs/zoxide.nix
diff --git a/scripts/exchangerate.sh b/users/jan/scripts/exchangerate.sh
similarity index 100%
rename from scripts/exchangerate.sh
rename to users/jan/scripts/exchangerate.sh
diff --git a/scripts/get_volume.sh b/users/jan/scripts/get_volume.sh
similarity index 100%
rename from scripts/get_volume.sh
rename to users/jan/scripts/get_volume.sh
diff --git a/scripts/himz b/users/jan/scripts/himz
similarity index 100%
rename from scripts/himz
rename to users/jan/scripts/himz
diff --git a/scripts/slugify.ts b/users/jan/scripts/slugify.ts
similarity index 100%
rename from scripts/slugify.ts
rename to users/jan/scripts/slugify.ts
diff --git a/users/jan/secrets.nix b/users/jan/secrets.nix
new file mode 100644
index 0000000..41eed1d
Binary files /dev/null and b/users/jan/secrets.nix differ
diff --git a/home/shell/default.nix b/users/jan/shell/default.nix
similarity index 100%
rename from home/shell/default.nix
rename to users/jan/shell/default.nix
diff --git a/home/shell/prompt/default.nix b/users/jan/shell/prompt/default.nix
similarity index 100%
rename from home/shell/prompt/default.nix
rename to users/jan/shell/prompt/default.nix
diff --git a/home/shell/prompt/starship/config.nix b/users/jan/shell/prompt/starship/config.nix
similarity index 100%
rename from home/shell/prompt/starship/config.nix
rename to users/jan/shell/prompt/starship/config.nix
diff --git a/home/shell/prompt/starship/default.nix b/users/jan/shell/prompt/starship/default.nix
similarity index 100%
rename from home/shell/prompt/starship/default.nix
rename to users/jan/shell/prompt/starship/default.nix
diff --git a/home/shell/zsh.nix b/users/jan/shell/zsh.nix
similarity index 100%
rename from home/shell/zsh.nix
rename to users/jan/shell/zsh.nix
diff --git a/home/ui/betterlockscreen.nix b/users/jan/ui/betterlockscreen.nix
similarity index 100%
rename from home/ui/betterlockscreen.nix
rename to users/jan/ui/betterlockscreen.nix
diff --git a/home/ui/default.nix b/users/jan/ui/default.nix
similarity index 100%
rename from home/ui/default.nix
rename to users/jan/ui/default.nix
diff --git a/home/ui/polybar/config.nix b/users/jan/ui/polybar/config.nix
similarity index 100%
rename from home/ui/polybar/config.nix
rename to users/jan/ui/polybar/config.nix
diff --git a/home/ui/polybar/default.nix b/users/jan/ui/polybar/default.nix
similarity index 100%
rename from home/ui/polybar/default.nix
rename to users/jan/ui/polybar/default.nix
diff --git a/home/ui/xmonad/config.hs b/users/jan/ui/xmonad/config.hs
similarity index 100%
rename from home/ui/xmonad/config.hs
rename to users/jan/ui/xmonad/config.hs
diff --git a/home/ui/xmonad/default.nix b/users/jan/ui/xmonad/default.nix
similarity index 100%
rename from home/ui/xmonad/default.nix
rename to users/jan/ui/xmonad/default.nix
diff --git a/wallpapers/animals_tree_branch_129397_2560x1440.png b/users/jan/wallpapers/animals_tree_branch_129397_2560x1440.png
similarity index 100%
rename from wallpapers/animals_tree_branch_129397_2560x1440.png
rename to users/jan/wallpapers/animals_tree_branch_129397_2560x1440.png
diff --git a/wallpapers/artist_waves_colorful_129158_2560x1440.png b/users/jan/wallpapers/artist_waves_colorful_129158_2560x1440.png
similarity index 100%
rename from wallpapers/artist_waves_colorful_129158_2560x1440.png
rename to users/jan/wallpapers/artist_waves_colorful_129158_2560x1440.png
diff --git a/wallpapers/boat_river_loneliness_129582_2560x1440.png b/users/jan/wallpapers/boat_river_loneliness_129582_2560x1440.png
similarity index 100%
rename from wallpapers/boat_river_loneliness_129582_2560x1440.png
rename to users/jan/wallpapers/boat_river_loneliness_129582_2560x1440.png
diff --git a/wallpapers/build.sh b/users/jan/wallpapers/build.sh
similarity index 100%
rename from wallpapers/build.sh
rename to users/jan/wallpapers/build.sh
diff --git a/wallpapers/child_river_dreams_127495_2560x1440.png b/users/jan/wallpapers/child_river_dreams_127495_2560x1440.png
similarity index 100%
rename from wallpapers/child_river_dreams_127495_2560x1440.png
rename to users/jan/wallpapers/child_river_dreams_127495_2560x1440.png
diff --git a/wallpapers/clouds_sky_bridge_people_reflection_sea_92817_2560x1440.png b/users/jan/wallpapers/clouds_sky_bridge_people_reflection_sea_92817_2560x1440.png
similarity index 100%
rename from wallpapers/clouds_sky_bridge_people_reflection_sea_92817_2560x1440.png
rename to users/jan/wallpapers/clouds_sky_bridge_people_reflection_sea_92817_2560x1440.png
diff --git a/wallpapers/couple_hugs_art_140777_2560x1440.png b/users/jan/wallpapers/couple_hugs_art_140777_2560x1440.png
similarity index 100%
rename from wallpapers/couple_hugs_art_140777_2560x1440.png
rename to users/jan/wallpapers/couple_hugs_art_140777_2560x1440.png
diff --git a/wallpapers/deer_silhouette_forest_130032_2560x1440.png b/users/jan/wallpapers/deer_silhouette_forest_130032_2560x1440.png
similarity index 100%
rename from wallpapers/deer_silhouette_forest_130032_2560x1440.png
rename to users/jan/wallpapers/deer_silhouette_forest_130032_2560x1440.png
diff --git a/wallpapers/landscape_art_moon_127187_2560x1440.png b/users/jan/wallpapers/landscape_art_moon_127187_2560x1440.png
similarity index 100%
rename from wallpapers/landscape_art_moon_127187_2560x1440.png
rename to users/jan/wallpapers/landscape_art_moon_127187_2560x1440.png
diff --git a/wallpapers/landscape_art_road_127350_2560x1440.png b/users/jan/wallpapers/landscape_art_road_127350_2560x1440.png
similarity index 100%
rename from wallpapers/landscape_art_road_127350_2560x1440.png
rename to users/jan/wallpapers/landscape_art_road_127350_2560x1440.png
diff --git a/wallpapers/sea_sunset_art_131736_2560x1440.png b/users/jan/wallpapers/sea_sunset_art_131736_2560x1440.png
similarity index 100%
rename from wallpapers/sea_sunset_art_131736_2560x1440.png
rename to users/jan/wallpapers/sea_sunset_art_131736_2560x1440.png
diff --git a/wallpapers/sea_waves_art_130915_2560x1440.png b/users/jan/wallpapers/sea_waves_art_130915_2560x1440.png
similarity index 100%
rename from wallpapers/sea_waves_art_130915_2560x1440.png
rename to users/jan/wallpapers/sea_waves_art_130915_2560x1440.png
diff --git a/wallpapers/torii_art_solitude_129792_2560x1440.png b/users/jan/wallpapers/torii_art_solitude_129792_2560x1440.png
similarity index 100%
rename from wallpapers/torii_art_solitude_129792_2560x1440.png
rename to users/jan/wallpapers/torii_art_solitude_129792_2560x1440.png
diff --git a/wallpapers/wolf_silhouette_hills_130119_2560x1440.png b/users/jan/wallpapers/wolf_silhouette_hills_130119_2560x1440.png
similarity index 100%
rename from wallpapers/wolf_silhouette_hills_130119_2560x1440.png
rename to users/jan/wallpapers/wolf_silhouette_hills_130119_2560x1440.png
diff --git a/home/wired.ron b/users/jan/wired.ron
similarity index 100%
rename from home/wired.ron
rename to users/jan/wired.ron