diff --git a/users/default.nix b/old_users/default.nix
similarity index 100%
rename from users/default.nix
rename to old_users/default.nix
diff --git a/users/ellmau/alacritty.nix b/old_users/ellmau/alacritty.nix
similarity index 100%
rename from users/ellmau/alacritty.nix
rename to old_users/ellmau/alacritty.nix
diff --git a/users/ellmau/autorandr.nix b/old_users/ellmau/autorandr.nix
similarity index 100%
rename from users/ellmau/autorandr.nix
rename to old_users/ellmau/autorandr.nix
diff --git a/users/ellmau/conf/gh/config.yml b/old_users/ellmau/conf/gh/config.yml
similarity index 100%
rename from users/ellmau/conf/gh/config.yml
rename to old_users/ellmau/conf/gh/config.yml
diff --git a/users/ellmau/conf/gpgsm/chain.txt b/old_users/ellmau/conf/gpgsm/chain.txt
similarity index 100%
rename from users/ellmau/conf/gpgsm/chain.txt
rename to old_users/ellmau/conf/gpgsm/chain.txt
diff --git a/users/ellmau/conf/gpgsm/trustlist.txt b/old_users/ellmau/conf/gpgsm/trustlist.txt
similarity index 100%
rename from users/ellmau/conf/gpgsm/trustlist.txt
rename to old_users/ellmau/conf/gpgsm/trustlist.txt
diff --git a/users/ellmau/conf/i3/config b/old_users/ellmau/conf/i3/config
similarity index 100%
rename from users/ellmau/conf/i3/config
rename to old_users/ellmau/conf/i3/config
diff --git a/users/ellmau/conf/i3/fill_workspace4.zsh b/old_users/ellmau/conf/i3/fill_workspace4.zsh
similarity index 100%
rename from users/ellmau/conf/i3/fill_workspace4.zsh
rename to old_users/ellmau/conf/i3/fill_workspace4.zsh
diff --git a/users/ellmau/conf/i3/keepassxc.sh b/old_users/ellmau/conf/i3/keepassxc.sh
similarity index 100%
rename from users/ellmau/conf/i3/keepassxc.sh
rename to old_users/ellmau/conf/i3/keepassxc.sh
diff --git a/users/ellmau/conf/i3/keyboard_layout_toggle.sh b/old_users/ellmau/conf/i3/keyboard_layout_toggle.sh
similarity index 100%
rename from users/ellmau/conf/i3/keyboard_layout_toggle.sh
rename to old_users/ellmau/conf/i3/keyboard_layout_toggle.sh
diff --git a/users/ellmau/conf/i3/workspace4.json b/old_users/ellmau/conf/i3/workspace4.json
similarity index 100%
rename from users/ellmau/conf/i3/workspace4.json
rename to old_users/ellmau/conf/i3/workspace4.json
diff --git a/old_users/ellmau/default.nix b/old_users/ellmau/default.nix
new file mode 100644
index 0000000..e8cc81f
--- /dev/null
+++ b/old_users/ellmau/default.nix
@@ -0,0 +1,116 @@
+{ config, pkgs, lib, flakes, ...}:
+let
+    withAliases = hostname: aliases: cfg:
+    lib.recursiveUpdate
+      {
+        host = "${hostname} ${aliases}";
+        hostname = "${hostname}";
+        extraOptions.hostKeyAlias = "${hostname}";
+      }
+      cfg;
+in
+{
+
+  imports = [
+    ./alacritty.nix
+    ./autorandr.nix
+    ./dunst.nix
+    ./git.nix
+    ./gpg.nix
+    ./i3.nix
+    ./nextcloud.nix
+    ./polybar.nix
+    ./zsh.nix
+    ./go.nix
+  ];
+
+  home-manager.users.ellmau = {
+    home.packages = [
+      pkgs.htop
+      pkgs.pavucontrol
+
+      pkgs.ripgrep
+
+      pkgs.jabref
+      pkgs.libreoffice-fresh
+
+      pkgs.nixfmt
+      pkgs.nixpkgs-fmt
+      pkgs.nix-prefetch-github
+
+      pkgs.neofetch
+      
+      pkgs.jitsi-meet-electron
+      pkgs.skypeforlinux
+      pkgs.teams
+      pkgs.unstable.zoom-us
+      pkgs.element-desktop
+      pkgs.signal-desktop
+    ];
+
+    services = {
+      udiskie = {
+        enable = true;
+        automount = true;
+        notify = true;
+        tray = "auto";
+      };
+      blueman-applet.enable = config.variables.graphical;
+      network-manager-applet.enable = config.variables.graphical ;
+      gnome-keyring = {
+        enable = true;
+        components = [ "pkcs11" "secrets" "ssh" ];
+      };
+    };
+
+    xdg = {
+      enable = true;
+    };
+
+    programs.direnv = {
+      enable = true;
+      enableZshIntegration = true;
+    };
+
+    xsession = {
+      numlock.enable = true;
+      profileExtra = ''
+        if [ $(hostname) = 'stel-xps' ]; then
+          brightnessctl s 50%
+        fi
+      '';
+    };
+
+    home.file.".background-image".source = ../../common/wallpaper/nix-wallpaper-nineish-dark-gray.png;
+    
+    programs.home-manager = {
+      enable = true;
+    };
+
+    programs.ssh = {
+          enable = true;
+
+          forwardAgent = true;
+          serverAliveInterval = 5;
+          hashKnownHosts = true;
+          controlMaster = "auto";
+          controlPersist = "60s";
+
+          # matchBlocks = {
+          #   "iccl-share.inf.tu-dresden.de" =
+          #     withAliases "iccl-share.inf.tu-dresden.de" "iccl-share" {
+          #       proxyJump = "tcs.inf.tu-dresden.de";
+          #     };
+          #   "iccl.inf.tu-dresden.de" = withAliases "iccl.inf.tu-dresden.de" "" {
+          #     proxyJump = "tcs.inf.tu-dresden.de";
+          #   };
+          #   "wille.inf.tu-dresden.de" =
+          #     withAliases "wille.inf.tu-dresden.de" "wille wi" {
+          #       proxyJump = "tcs.inf.tu-dresden.de";
+          #     };
+          #   "tcs.inf.tu-dresden.de" =
+          #     withAliases "tcs.inf.tu-dresden.de" "tcs" { };
+          # };
+    };
+  };
+}
diff --git a/users/ellmau/dunst.nix b/old_users/ellmau/dunst.nix
similarity index 100%
rename from users/ellmau/dunst.nix
rename to old_users/ellmau/dunst.nix
diff --git a/users/ellmau/git.nix b/old_users/ellmau/git.nix
similarity index 100%
rename from users/ellmau/git.nix
rename to old_users/ellmau/git.nix
diff --git a/users/ellmau/go.nix b/old_users/ellmau/go.nix
similarity index 100%
rename from users/ellmau/go.nix
rename to old_users/ellmau/go.nix
diff --git a/users/ellmau/gpg.nix b/old_users/ellmau/gpg.nix
similarity index 100%
rename from users/ellmau/gpg.nix
rename to old_users/ellmau/gpg.nix
diff --git a/users/ellmau/i3.nix b/old_users/ellmau/i3.nix
similarity index 100%
rename from users/ellmau/i3.nix
rename to old_users/ellmau/i3.nix
diff --git a/users/ellmau/nextcloud.nix b/old_users/ellmau/nextcloud.nix
similarity index 100%
rename from users/ellmau/nextcloud.nix
rename to old_users/ellmau/nextcloud.nix
diff --git a/users/ellmau/polybar.nix b/old_users/ellmau/polybar.nix
similarity index 100%
rename from users/ellmau/polybar.nix
rename to old_users/ellmau/polybar.nix
diff --git a/users/ellmau/zsh.nix b/old_users/ellmau/zsh.nix
similarity index 100%
rename from users/ellmau/zsh.nix
rename to old_users/ellmau/zsh.nix
diff --git a/users/ellmau/default.nix b/users/ellmau/default.nix
index e8cc81f..b9e6357 100644
--- a/users/ellmau/default.nix
+++ b/users/ellmau/default.nix
@@ -1,116 +1,3 @@
-{ config, pkgs, lib, flakes, ...}:
-let
-    withAliases = hostname: aliases: cfg:
-    lib.recursiveUpdate
-      {
-        host = "${hostname} ${aliases}";
-        hostname = "${hostname}";
-        extraOptions.hostKeyAlias = "${hostname}";
-      }
-      cfg;
-in
+{ config, lib, pkgs, ...}:
 {
-
-  imports = [
-    ./alacritty.nix
-    ./autorandr.nix
-    ./dunst.nix
-    ./git.nix
-    ./gpg.nix
-    ./i3.nix
-    ./nextcloud.nix
-    ./polybar.nix
-    ./zsh.nix
-    ./go.nix
-  ];
-
-  home-manager.users.ellmau = {
-    home.packages = [
-      pkgs.htop
-      pkgs.pavucontrol
-
-      pkgs.ripgrep
-
-      pkgs.jabref
-      pkgs.libreoffice-fresh
-
-      pkgs.nixfmt
-      pkgs.nixpkgs-fmt
-      pkgs.nix-prefetch-github
-
-      pkgs.neofetch
-      
-      pkgs.jitsi-meet-electron
-      pkgs.skypeforlinux
-      pkgs.teams
-      pkgs.unstable.zoom-us
-      pkgs.element-desktop
-      pkgs.signal-desktop
-    ];
-
-    services = {
-      udiskie = {
-        enable = true;
-        automount = true;
-        notify = true;
-        tray = "auto";
-      };
-      blueman-applet.enable = config.variables.graphical;
-      network-manager-applet.enable = config.variables.graphical ;
-      gnome-keyring = {
-        enable = true;
-        components = [ "pkcs11" "secrets" "ssh" ];
-      };
-    };
-
-    xdg = {
-      enable = true;
-    };
-
-    programs.direnv = {
-      enable = true;
-      enableZshIntegration = true;
-    };
-
-    xsession = {
-      numlock.enable = true;
-      profileExtra = ''
-        if [ $(hostname) = 'stel-xps' ]; then
-          brightnessctl s 50%
-        fi
-      '';
-    };
-
-    home.file.".background-image".source = ../../common/wallpaper/nix-wallpaper-nineish-dark-gray.png;
-    
-    programs.home-manager = {
-      enable = true;
-    };
-
-    programs.ssh = {
-          enable = true;
-
-          forwardAgent = true;
-          serverAliveInterval = 5;
-          hashKnownHosts = true;
-          controlMaster = "auto";
-          controlPersist = "60s";
-
-          # matchBlocks = {
-          #   "iccl-share.inf.tu-dresden.de" =
-          #     withAliases "iccl-share.inf.tu-dresden.de" "iccl-share" {
-          #       proxyJump = "tcs.inf.tu-dresden.de";
-          #     };
-          #   "iccl.inf.tu-dresden.de" = withAliases "iccl.inf.tu-dresden.de" "" {
-          #     proxyJump = "tcs.inf.tu-dresden.de";
-          #   };
-          #   "wille.inf.tu-dresden.de" =
-          #     withAliases "wille.inf.tu-dresden.de" "wille wi" {
-          #       proxyJump = "tcs.inf.tu-dresden.de";
-          #     };
-          #   "tcs.inf.tu-dresden.de" =
-          #     withAliases "tcs.inf.tu-dresden.de" "tcs" { };
-          # };
-    };
-  };
 }