diff --git a/users/hu/packages/nvim/config/ftplugin/lua.lua b/dotfiles/nvim/ftplugin/lua.lua
similarity index 100%
rename from users/hu/packages/nvim/config/ftplugin/lua.lua
rename to dotfiles/nvim/ftplugin/lua.lua
diff --git a/users/hu/packages/nvim/config/ftplugin/nix.lua b/dotfiles/nvim/ftplugin/nix.lua
similarity index 100%
rename from users/hu/packages/nvim/config/ftplugin/nix.lua
rename to dotfiles/nvim/ftplugin/nix.lua
diff --git a/users/hu/packages/nvim/config/init.lua b/dotfiles/nvim/init.lua
similarity index 100%
rename from users/hu/packages/nvim/config/init.lua
rename to dotfiles/nvim/init.lua
diff --git a/users/hu/packages/nvim/config/lua/plugins/cmp.lua b/dotfiles/nvim/lua/plugins/cmp.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/plugins/cmp.lua
rename to dotfiles/nvim/lua/plugins/cmp.lua
diff --git a/users/hu/packages/nvim/config/lua/plugins/comment.lua b/dotfiles/nvim/lua/plugins/comment.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/plugins/comment.lua
rename to dotfiles/nvim/lua/plugins/comment.lua
diff --git a/users/hu/packages/nvim/config/lua/plugins/dressing.lua b/dotfiles/nvim/lua/plugins/dressing.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/plugins/dressing.lua
rename to dotfiles/nvim/lua/plugins/dressing.lua
diff --git a/users/hu/packages/nvim/config/lua/plugins/ibl.lua b/dotfiles/nvim/lua/plugins/ibl.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/plugins/ibl.lua
rename to dotfiles/nvim/lua/plugins/ibl.lua
diff --git a/users/hu/packages/nvim/config/lua/plugins/init.lua b/dotfiles/nvim/lua/plugins/init.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/plugins/init.lua
rename to dotfiles/nvim/lua/plugins/init.lua
diff --git a/users/hu/packages/nvim/config/lua/plugins/kanagawa.lua b/dotfiles/nvim/lua/plugins/kanagawa.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/plugins/kanagawa.lua
rename to dotfiles/nvim/lua/plugins/kanagawa.lua
diff --git a/users/hu/packages/nvim/config/lua/plugins/lsp/c.lua b/dotfiles/nvim/lua/plugins/lsp/c.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/plugins/lsp/c.lua
rename to dotfiles/nvim/lua/plugins/lsp/c.lua
diff --git a/users/hu/packages/nvim/config/lua/plugins/lsp/js.lua b/dotfiles/nvim/lua/plugins/lsp/js.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/plugins/lsp/js.lua
rename to dotfiles/nvim/lua/plugins/lsp/js.lua
diff --git a/users/hu/packages/nvim/config/lua/plugins/lsp/lua.lua b/dotfiles/nvim/lua/plugins/lsp/lua.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/plugins/lsp/lua.lua
rename to dotfiles/nvim/lua/plugins/lsp/lua.lua
diff --git a/users/hu/packages/nvim/config/lua/plugins/lsp/nix.lua b/dotfiles/nvim/lua/plugins/lsp/nix.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/plugins/lsp/nix.lua
rename to dotfiles/nvim/lua/plugins/lsp/nix.lua
diff --git a/users/hu/packages/nvim/config/lua/plugins/lsp/php.lua b/dotfiles/nvim/lua/plugins/lsp/php.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/plugins/lsp/php.lua
rename to dotfiles/nvim/lua/plugins/lsp/php.lua
diff --git a/users/hu/packages/nvim/config/lua/plugins/lsp/python.lua b/dotfiles/nvim/lua/plugins/lsp/python.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/plugins/lsp/python.lua
rename to dotfiles/nvim/lua/plugins/lsp/python.lua
diff --git a/users/hu/packages/nvim/config/lua/plugins/lsp/rust.lua b/dotfiles/nvim/lua/plugins/lsp/rust.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/plugins/lsp/rust.lua
rename to dotfiles/nvim/lua/plugins/lsp/rust.lua
diff --git a/users/hu/packages/nvim/config/lua/plugins/lspconfig.lua b/dotfiles/nvim/lua/plugins/lspconfig.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/plugins/lspconfig.lua
rename to dotfiles/nvim/lua/plugins/lspconfig.lua
diff --git a/users/hu/packages/nvim/config/lua/plugins/lualine.lua b/dotfiles/nvim/lua/plugins/lualine.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/plugins/lualine.lua
rename to dotfiles/nvim/lua/plugins/lualine.lua
diff --git a/users/hu/packages/nvim/config/lua/plugins/nvim-colorizer.lua b/dotfiles/nvim/lua/plugins/nvim-colorizer.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/plugins/nvim-colorizer.lua
rename to dotfiles/nvim/lua/plugins/nvim-colorizer.lua
diff --git a/users/hu/packages/nvim/config/lua/plugins/telescope.lua b/dotfiles/nvim/lua/plugins/telescope.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/plugins/telescope.lua
rename to dotfiles/nvim/lua/plugins/telescope.lua
diff --git a/users/hu/packages/nvim/config/lua/plugins/treesitter.lua b/dotfiles/nvim/lua/plugins/treesitter.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/plugins/treesitter.lua
rename to dotfiles/nvim/lua/plugins/treesitter.lua
diff --git a/users/hu/packages/nvim/config/lua/plugins/vimtex.lua b/dotfiles/nvim/lua/plugins/vimtex.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/plugins/vimtex.lua
rename to dotfiles/nvim/lua/plugins/vimtex.lua
diff --git a/users/hu/packages/nvim/config/lua/settings/autocmds.lua b/dotfiles/nvim/lua/settings/autocmds.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/settings/autocmds.lua
rename to dotfiles/nvim/lua/settings/autocmds.lua
diff --git a/users/hu/packages/nvim/config/lua/settings/init.lua b/dotfiles/nvim/lua/settings/init.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/settings/init.lua
rename to dotfiles/nvim/lua/settings/init.lua
diff --git a/users/hu/packages/nvim/config/lua/settings/keymaps.lua b/dotfiles/nvim/lua/settings/keymaps.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/settings/keymaps.lua
rename to dotfiles/nvim/lua/settings/keymaps.lua
diff --git a/users/hu/packages/nvim/config/lua/settings/options.lua b/dotfiles/nvim/lua/settings/options.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/settings/options.lua
rename to dotfiles/nvim/lua/settings/options.lua
diff --git a/users/hu/packages/nvim/config/lua/util/get_distro.lua b/dotfiles/nvim/lua/util/get_distro.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/util/get_distro.lua
rename to dotfiles/nvim/lua/util/get_distro.lua
diff --git a/users/hu/packages/nvim/config/lua/util/hl.lua b/dotfiles/nvim/lua/util/hl.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/util/hl.lua
rename to dotfiles/nvim/lua/util/hl.lua
diff --git a/users/hu/packages/nvim/config/lua/util/map.lua b/dotfiles/nvim/lua/util/map.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/util/map.lua
rename to dotfiles/nvim/lua/util/map.lua
diff --git a/users/hu/packages/nvim/config/lua/util/require_dir.lua b/dotfiles/nvim/lua/util/require_dir.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/util/require_dir.lua
rename to dotfiles/nvim/lua/util/require_dir.lua
diff --git a/users/hu/packages/nvim/config/lua/util/rgb_to_hex.lua b/dotfiles/nvim/lua/util/rgb_to_hex.lua
similarity index 100%
rename from users/hu/packages/nvim/config/lua/util/rgb_to_hex.lua
rename to dotfiles/nvim/lua/util/rgb_to_hex.lua
diff --git a/users/hu/packages/zsh/config/.zshrc b/dotfiles/zsh/.zshrc
similarity index 100%
rename from users/hu/packages/zsh/config/.zshrc
rename to dotfiles/zsh/.zshrc
diff --git a/users/hu/packages/zsh/config/conf.d/alias.zsh b/dotfiles/zsh/conf.d/alias.zsh
similarity index 100%
rename from users/hu/packages/zsh/config/conf.d/alias.zsh
rename to dotfiles/zsh/conf.d/alias.zsh
diff --git a/users/hu/packages/zsh/config/conf.d/color.zsh b/dotfiles/zsh/conf.d/color.zsh
similarity index 100%
rename from users/hu/packages/zsh/config/conf.d/color.zsh
rename to dotfiles/zsh/conf.d/color.zsh
diff --git a/users/hu/packages/zsh/config/conf.d/completions.zsh b/dotfiles/zsh/conf.d/completions.zsh
similarity index 100%
rename from users/hu/packages/zsh/config/conf.d/completions.zsh
rename to dotfiles/zsh/conf.d/completions.zsh
diff --git a/users/hu/packages/zsh/config/conf.d/env.zsh b/dotfiles/zsh/conf.d/env.zsh
similarity index 100%
rename from users/hu/packages/zsh/config/conf.d/env.zsh
rename to dotfiles/zsh/conf.d/env.zsh
diff --git a/users/hu/packages/zsh/config/conf.d/fuck.zsh b/dotfiles/zsh/conf.d/fuck.zsh
similarity index 100%
rename from users/hu/packages/zsh/config/conf.d/fuck.zsh
rename to dotfiles/zsh/conf.d/fuck.zsh
diff --git a/users/hu/packages/zsh/config/conf.d/gpg.zsh b/dotfiles/zsh/conf.d/gpg.zsh
similarity index 100%
rename from users/hu/packages/zsh/config/conf.d/gpg.zsh
rename to dotfiles/zsh/conf.d/gpg.zsh
diff --git a/users/hu/packages/zsh/config/conf.d/manpager.zsh b/dotfiles/zsh/conf.d/manpager.zsh
similarity index 100%
rename from users/hu/packages/zsh/config/conf.d/manpager.zsh
rename to dotfiles/zsh/conf.d/manpager.zsh
diff --git a/users/hu/packages/zsh/config/conf.d/nix.zsh b/dotfiles/zsh/conf.d/nix.zsh
similarity index 100%
rename from users/hu/packages/zsh/config/conf.d/nix.zsh
rename to dotfiles/zsh/conf.d/nix.zsh
diff --git a/users/hu/packages/zsh/config/conf.d/path.zsh b/dotfiles/zsh/conf.d/path.zsh
similarity index 100%
rename from users/hu/packages/zsh/config/conf.d/path.zsh
rename to dotfiles/zsh/conf.d/path.zsh
diff --git a/users/hu/packages/zsh/config/conf.d/ps1.zsh b/dotfiles/zsh/conf.d/ps1.zsh
similarity index 100%
rename from users/hu/packages/zsh/config/conf.d/ps1.zsh
rename to dotfiles/zsh/conf.d/ps1.zsh
diff --git a/users/hu/packages/zsh/config/conf.d/ssh.zsh b/dotfiles/zsh/conf.d/ssh.zsh
similarity index 100%
rename from users/hu/packages/zsh/config/conf.d/ssh.zsh
rename to dotfiles/zsh/conf.d/ssh.zsh
diff --git a/users/hu/packages/zsh/config/conf.d/suggestions.zsh b/dotfiles/zsh/conf.d/suggestions.zsh
similarity index 100%
rename from users/hu/packages/zsh/config/conf.d/suggestions.zsh
rename to dotfiles/zsh/conf.d/suggestions.zsh
diff --git a/users/hu/packages/zsh/config/conf.d/syntax.zsh b/dotfiles/zsh/conf.d/syntax.zsh
similarity index 100%
rename from users/hu/packages/zsh/config/conf.d/syntax.zsh
rename to dotfiles/zsh/conf.d/syntax.zsh
diff --git a/users/hu/packages/zsh/config/conf.d/tmux.zsh b/dotfiles/zsh/conf.d/tmux.zsh
similarity index 100%
rename from users/hu/packages/zsh/config/conf.d/tmux.zsh
rename to dotfiles/zsh/conf.d/tmux.zsh
diff --git a/users/hu/user.nix b/home/default.nix
similarity index 66%
rename from users/hu/user.nix
rename to home/default.nix
index fb4d3f0..c70b884 100644
--- a/users/hu/user.nix
+++ b/home/default.nix
@@ -2,13 +2,15 @@
 
 {
   imports = [
-    ../../modules/desktop/apps/communication.nix
-    ../../modules/desktop/apps/games.nix
-    ../../modules/desktop/apps/multimedia.nix
     ./persist.nix
-    ./packages/nh.nix
-    ./packages/zsh/zsh.nix
-    ./packages/virt-manager.nix
+
+    ../modules/desktop/apps/communication.nix
+    ../modules/desktop/apps/games.nix
+    ../modules/desktop/apps/multimedia.nix
+
+    ../modules/packages/nh.nix
+    ../modules/packages/zsh.nix
+    ../modules/packages/virt-manager.nix
   ];
 
   environment.variables = {
@@ -20,7 +22,7 @@
     isNormalUser = true;
     extraGroups = [ "wheel" "libvirtd" ];
     shell = pkgs.zsh;
-    hashedPasswordFile = "/nix/config/secrets/hu/pass";
+    hashedPasswordFile = "/nix/config/secrets/pass";
   };
 
   home-manager = {
@@ -32,7 +34,7 @@
       home.stateVersion = config.system.stateVersion;
 
       imports = [
-        ./packages/zsh/zsh-home.nix
+        ./packages/zsh.nix
         ./packages/git.nix
         ./packages/gtk.nix
         ./packages/hyprland.nix
@@ -40,9 +42,9 @@
         ./packages/firefox.nix
         ./packages/rofi.nix
         ./packages/fastfetch.nix
-        ./packages/nvim/neovim.nix
+        ./packages/nvim.nix
         ./packages/waybar.nix
-        ./packages/virt-manager-home.nix
+        ./packages/virt-manager.nix
       ];
     };
   };
diff --git a/users/hu/packages/fastfetch.nix b/home/packages/fastfetch.nix
similarity index 100%
rename from users/hu/packages/fastfetch.nix
rename to home/packages/fastfetch.nix
diff --git a/users/hu/packages/firefox.nix b/home/packages/firefox.nix
similarity index 100%
rename from users/hu/packages/firefox.nix
rename to home/packages/firefox.nix
diff --git a/users/hu/packages/foot.nix b/home/packages/foot.nix
similarity index 100%
rename from users/hu/packages/foot.nix
rename to home/packages/foot.nix
diff --git a/users/hu/packages/git.nix b/home/packages/git.nix
similarity index 100%
rename from users/hu/packages/git.nix
rename to home/packages/git.nix
diff --git a/users/hu/packages/gtk.nix b/home/packages/gtk.nix
similarity index 100%
rename from users/hu/packages/gtk.nix
rename to home/packages/gtk.nix
diff --git a/users/hu/packages/hyprland.nix b/home/packages/hyprland.nix
similarity index 100%
rename from users/hu/packages/hyprland.nix
rename to home/packages/hyprland.nix
diff --git a/users/hu/packages/nvim/neovim.nix b/home/packages/nvim.nix
similarity index 92%
rename from users/hu/packages/nvim/neovim.nix
rename to home/packages/nvim.nix
index ae84cd7..4698115 100644
--- a/users/hu/packages/nvim/neovim.nix
+++ b/home/packages/nvim.nix
@@ -19,7 +19,7 @@
   };
 
   home.file."${config.xdg.configHome}/nvim" = {
-    source = ./config;
+    source = ../../dotfiles/nvim;
     recursive = true;
   };
 }
diff --git a/users/hu/packages/qt.nix b/home/packages/qt.nix
similarity index 100%
rename from users/hu/packages/qt.nix
rename to home/packages/qt.nix
diff --git a/users/hu/packages/rofi.nix b/home/packages/rofi.nix
similarity index 100%
rename from users/hu/packages/rofi.nix
rename to home/packages/rofi.nix
diff --git a/users/hu/packages/tmux.nix b/home/packages/tmux.nix
similarity index 100%
rename from users/hu/packages/tmux.nix
rename to home/packages/tmux.nix
diff --git a/users/hu/packages/virt-manager-home.nix b/home/packages/virt-manager.nix
similarity index 100%
rename from users/hu/packages/virt-manager-home.nix
rename to home/packages/virt-manager.nix
diff --git a/users/hu/packages/waybar.nix b/home/packages/waybar.nix
similarity index 100%
rename from users/hu/packages/waybar.nix
rename to home/packages/waybar.nix
diff --git a/users/hu/packages/zsh/zsh-home.nix b/home/packages/zsh.nix
similarity index 57%
rename from users/hu/packages/zsh/zsh-home.nix
rename to home/packages/zsh.nix
index 2b8dbca..219aa39 100644
--- a/users/hu/packages/zsh/zsh-home.nix
+++ b/home/packages/zsh.nix
@@ -17,7 +17,7 @@
   };
 
   home.file."${config.xdg.configHome}/zsh/conf.d" = {
-    source = ./config/conf.d;
+    source = ../../dotfiles/zsh/conf.d;
     recursive = true;
   };
 
@@ -28,18 +28,8 @@
       SYNTAX_PLUGIN="${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
       AUTOSUGGEST_PLUGIN="${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh"
       NIX_SHELL_PLUGIN="${pkgs.zsh-nix-shell}/share/zsh-nix-shell/nix-shell.plugin.zsh"
-
-      # On systems that are not on glibc 2.38, loading fzf-tab will fail. This prevents that.
-      if [ -f "/lib/x86_64-linux-gnu/libc.so.6" ]; then
-        GLIBC_VERSION="$(/lib/x86_64-linux-gnu/libc.so.6 | head -n1 | sed -e 's/.* //g' | rev | cut -c2- | rev)"
-        if [ "$GLIBC_VERSION" = "2.38" ]; then
-          FZF_TAB_PLUGIN="${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh"
-        fi
-      else
-        FZF_TAB_PLUGIN="${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh"
-      fi
-
-    '' + (builtins.readFile config/.zshrc);
+      FZF_TAB_PLUGIN="${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh"
+    '' + (builtins.readFile ../../dotfiles/zsh/.zshrc);
   };
 }
 
diff --git a/users/hu/persist.nix b/home/persist.nix
similarity index 100%
rename from users/hu/persist.nix
rename to home/persist.nix
diff --git a/hosts/workstation/default.nix b/hosts/workstation/default.nix
index c07bf55..13eb749 100644
--- a/hosts/workstation/default.nix
+++ b/hosts/workstation/default.nix
@@ -9,7 +9,7 @@
     ../../modules/desktop/environments/hyprland.nix
     ../../modules/system/security.nix
 
-    ../../users/hu/user.nix
+    ../../home/default.nix
   ];
 
   boot.loader.efi.canTouchEfiVariables = true;
diff --git a/users/hu/packages/nh.nix b/modules/packages/nh.nix
similarity index 100%
rename from users/hu/packages/nh.nix
rename to modules/packages/nh.nix
diff --git a/users/hu/packages/virt-manager.nix b/modules/packages/virt-manager.nix
similarity index 100%
rename from users/hu/packages/virt-manager.nix
rename to modules/packages/virt-manager.nix
diff --git a/users/hu/packages/zsh/zsh.nix b/modules/packages/zsh.nix
similarity index 100%
rename from users/hu/packages/zsh/zsh.nix
rename to modules/packages/zsh.nix