diff --git a/flake.nix b/flake.nix
index ebb32cfd..e03ecc80 100644
--- a/flake.nix
+++ b/flake.nix
@@ -86,6 +86,6 @@
         overlays = import ./overlays { inherit inputs; };
       };
 
-      imports = [ (inputs.import-tree ./modules2) ];
+      imports = [ (inputs.import-tree ./modules) ];
     };
 }
diff --git a/modules2/.keep b/modules/.keep
similarity index 100%
rename from modules2/.keep
rename to modules/.keep
diff --git a/modules2/README.md b/modules/README.md
similarity index 100%
rename from modules2/README.md
rename to modules/README.md
diff --git a/modules2/avahi.nix b/modules/avahi.nix
similarity index 100%
rename from modules2/avahi.nix
rename to modules/avahi.nix
diff --git a/modules2/bluetooth.nix b/modules/bluetooth.nix
similarity index 100%
rename from modules2/bluetooth.nix
rename to modules/bluetooth.nix
diff --git a/modules2/bluetuith.nix b/modules/bluetuith.nix
similarity index 100%
rename from modules2/bluetuith.nix
rename to modules/bluetuith.nix
diff --git a/modules2/bookmarkthis.nix b/modules/bookmarkthis.nix
similarity index 100%
rename from modules2/bookmarkthis.nix
rename to modules/bookmarkthis.nix
diff --git a/modules2/browsers/chromium.nix b/modules/browsers/chromium.nix
similarity index 100%
rename from modules2/browsers/chromium.nix
rename to modules/browsers/chromium.nix
diff --git a/modules2/browsers/librewolf/enable.nix b/modules/browsers/librewolf/enable.nix
similarity index 100%
rename from modules2/browsers/librewolf/enable.nix
rename to modules/browsers/librewolf/enable.nix
diff --git a/modules2/browsers/librewolf/extensions.nix b/modules/browsers/librewolf/extensions.nix
similarity index 100%
rename from modules2/browsers/librewolf/extensions.nix
rename to modules/browsers/librewolf/extensions.nix
diff --git a/modules2/browsers/librewolf/languages.nix b/modules/browsers/librewolf/languages.nix
similarity index 100%
rename from modules2/browsers/librewolf/languages.nix
rename to modules/browsers/librewolf/languages.nix
diff --git a/modules2/browsers/librewolf/policies.nix b/modules/browsers/librewolf/policies.nix
similarity index 100%
rename from modules2/browsers/librewolf/policies.nix
rename to modules/browsers/librewolf/policies.nix
diff --git a/modules2/browsers/librewolf/search-engines.nix b/modules/browsers/librewolf/search-engines.nix
similarity index 100%
rename from modules2/browsers/librewolf/search-engines.nix
rename to modules/browsers/librewolf/search-engines.nix
diff --git a/modules2/browsers/librewolf/search.nix b/modules/browsers/librewolf/search.nix
similarity index 100%
rename from modules2/browsers/librewolf/search.nix
rename to modules/browsers/librewolf/search.nix
diff --git a/modules2/browsers/librewolf/settings.nix b/modules/browsers/librewolf/settings.nix
similarity index 100%
rename from modules2/browsers/librewolf/settings.nix
rename to modules/browsers/librewolf/settings.nix
diff --git a/modules2/browsers/qutebrowser/enable.nix b/modules/browsers/qutebrowser/enable.nix
similarity index 100%
rename from modules2/browsers/qutebrowser/enable.nix
rename to modules/browsers/qutebrowser/enable.nix
diff --git a/modules2/browsers/qutebrowser/key-bindings.nix b/modules/browsers/qutebrowser/key-bindings.nix
similarity index 100%
rename from modules2/browsers/qutebrowser/key-bindings.nix
rename to modules/browsers/qutebrowser/key-bindings.nix
diff --git a/modules2/browsers/qutebrowser/package.nix b/modules/browsers/qutebrowser/package.nix
similarity index 100%
rename from modules2/browsers/qutebrowser/package.nix
rename to modules/browsers/qutebrowser/package.nix
diff --git a/modules2/browsers/qutebrowser/search-engines.nix b/modules/browsers/qutebrowser/search-engines.nix
similarity index 100%
rename from modules2/browsers/qutebrowser/search-engines.nix
rename to modules/browsers/qutebrowser/search-engines.nix
diff --git a/modules2/browsers/qutebrowser/settings.nix b/modules/browsers/qutebrowser/settings.nix
similarity index 100%
rename from modules2/browsers/qutebrowser/settings.nix
rename to modules/browsers/qutebrowser/settings.nix
diff --git a/modules2/calculator.nix b/modules/calculator.nix
similarity index 100%
rename from modules2/calculator.nix
rename to modules/calculator.nix
diff --git a/modules2/dconf.nix b/modules/dconf.nix
similarity index 100%
rename from modules2/dconf.nix
rename to modules/dconf.nix
diff --git a/modules2/desktop.nix b/modules/desktop.nix
similarity index 100%
rename from modules2/desktop.nix
rename to modules/desktop.nix
diff --git a/modules2/dev-commit.nix b/modules/dev-commit.nix
similarity index 100%
rename from modules2/dev-commit.nix
rename to modules/dev-commit.nix
diff --git a/modules2/direnv/enable.nix b/modules/direnv/enable.nix
similarity index 100%
rename from modules2/direnv/enable.nix
rename to modules/direnv/enable.nix
diff --git a/modules2/direnv/nix-direnv.nix b/modules/direnv/nix-direnv.nix
similarity index 100%
rename from modules2/direnv/nix-direnv.nix
rename to modules/direnv/nix-direnv.nix
diff --git a/modules2/direnv/silent.nix b/modules/direnv/silent.nix
similarity index 100%
rename from modules2/direnv/silent.nix
rename to modules/direnv/silent.nix
diff --git a/modules2/direnv/zsh.nix b/modules/direnv/zsh.nix
similarity index 100%
rename from modules2/direnv/zsh.nix
rename to modules/direnv/zsh.nix
diff --git a/modules2/docker.nix b/modules/docker.nix
similarity index 100%
rename from modules2/docker.nix
rename to modules/docker.nix
diff --git a/modules2/dwm/config.nix b/modules/dwm/config.nix
similarity index 100%
rename from modules2/dwm/config.nix
rename to modules/dwm/config.nix
diff --git a/modules2/dwm/packages.nix b/modules/dwm/packages.nix
similarity index 100%
rename from modules2/dwm/packages.nix
rename to modules/dwm/packages.nix
diff --git a/modules2/dwm/xinitrc b/modules/dwm/xinitrc
similarity index 100%
rename from modules2/dwm/xinitrc
rename to modules/dwm/xinitrc
diff --git a/modules2/firmware.nix b/modules/firmware.nix
similarity index 100%
rename from modules2/firmware.nix
rename to modules/firmware.nix
diff --git a/modules2/flameshot/enable.nix b/modules/flameshot/enable.nix
similarity index 100%
rename from modules2/flameshot/enable.nix
rename to modules/flameshot/enable.nix
diff --git a/modules2/flameshot/settings.nix b/modules/flameshot/settings.nix
similarity index 100%
rename from modules2/flameshot/settings.nix
rename to modules/flameshot/settings.nix
diff --git a/modules2/fonts.nix b/modules/fonts.nix
similarity index 100%
rename from modules2/fonts.nix
rename to modules/fonts.nix
diff --git a/modules2/fzf/enable.nix b/modules/fzf/enable.nix
similarity index 100%
rename from modules2/fzf/enable.nix
rename to modules/fzf/enable.nix
diff --git a/modules2/fzf/session-variables.nix b/modules/fzf/session-variables.nix
similarity index 100%
rename from modules2/fzf/session-variables.nix
rename to modules/fzf/session-variables.nix
diff --git a/modules2/games/steam.nix b/modules/games/steam.nix
similarity index 100%
rename from modules2/games/steam.nix
rename to modules/games/steam.nix
diff --git a/modules2/games/zeroad.nix b/modules/games/zeroad.nix
similarity index 100%
rename from modules2/games/zeroad.nix
rename to modules/games/zeroad.nix
diff --git a/modules2/gammastep/enable.nix b/modules/gammastep/enable.nix
similarity index 100%
rename from modules2/gammastep/enable.nix
rename to modules/gammastep/enable.nix
diff --git a/modules2/gammastep/provider.nix b/modules/gammastep/provider.nix
similarity index 100%
rename from modules2/gammastep/provider.nix
rename to modules/gammastep/provider.nix
diff --git a/modules2/git-repo-updater.nix b/modules/git-repo-updater.nix
similarity index 100%
rename from modules2/git-repo-updater.nix
rename to modules/git-repo-updater.nix
diff --git a/modules2/git/aliases.nix b/modules/git/aliases.nix
similarity index 100%
rename from modules2/git/aliases.nix
rename to modules/git/aliases.nix
diff --git a/modules2/git/default-commit-message.nix b/modules/git/default-commit-message.nix
similarity index 100%
rename from modules2/git/default-commit-message.nix
rename to modules/git/default-commit-message.nix
diff --git a/modules2/git/defaults.nix b/modules/git/defaults.nix
similarity index 100%
rename from modules2/git/defaults.nix
rename to modules/git/defaults.nix
diff --git a/modules2/git/enable.nix b/modules/git/enable.nix
similarity index 100%
rename from modules2/git/enable.nix
rename to modules/git/enable.nix
diff --git a/modules2/git/extra-packages.nix b/modules/git/extra-packages.nix
similarity index 100%
rename from modules2/git/extra-packages.nix
rename to modules/git/extra-packages.nix
diff --git a/modules2/git/ignores.nix b/modules/git/ignores.nix
similarity index 100%
rename from modules2/git/ignores.nix
rename to modules/git/ignores.nix
diff --git a/modules2/git/user.nix b/modules/git/user.nix
similarity index 100%
rename from modules2/git/user.nix
rename to modules/git/user.nix
diff --git a/modules2/git/variables.nix b/modules/git/variables.nix
similarity index 100%
rename from modules2/git/variables.nix
rename to modules/git/variables.nix
diff --git a/modules2/gnupg.nix b/modules/gnupg.nix
similarity index 100%
rename from modules2/gnupg.nix
rename to modules/gnupg.nix
diff --git a/modules2/gtk/animations.nix b/modules/gtk/animations.nix
similarity index 100%
rename from modules2/gtk/animations.nix
rename to modules/gtk/animations.nix
diff --git a/modules2/gtk/enable.nix b/modules/gtk/enable.nix
similarity index 100%
rename from modules2/gtk/enable.nix
rename to modules/gtk/enable.nix
diff --git a/modules2/gtk/icon-theme.nix b/modules/gtk/icon-theme.nix
similarity index 100%
rename from modules2/gtk/icon-theme.nix
rename to modules/gtk/icon-theme.nix
diff --git a/modules2/gtk/theme.nix b/modules/gtk/theme.nix
similarity index 100%
rename from modules2/gtk/theme.nix
rename to modules/gtk/theme.nix
diff --git a/modules2/handbrake.nix b/modules/handbrake.nix
similarity index 100%
rename from modules2/handbrake.nix
rename to modules/handbrake.nix
diff --git a/modules2/home-manager/base.nix b/modules/home-manager/base.nix
similarity index 100%
rename from modules2/home-manager/base.nix
rename to modules/home-manager/base.nix
diff --git a/modules2/home-manager/nixos.nix b/modules/home-manager/nixos.nix
similarity index 100%
rename from modules2/home-manager/nixos.nix
rename to modules/home-manager/nixos.nix
diff --git a/modules2/hosts/nixedo/gitea-actions-runner.nix b/modules/hosts/nixedo/gitea-actions-runner.nix
similarity index 100%
rename from modules2/hosts/nixedo/gitea-actions-runner.nix
rename to modules/hosts/nixedo/gitea-actions-runner.nix
diff --git a/modules2/hosts/nixedo/imports.nix b/modules/hosts/nixedo/imports.nix
similarity index 100%
rename from modules2/hosts/nixedo/imports.nix
rename to modules/hosts/nixedo/imports.nix
diff --git a/modules2/hosts/t480/dev-commit.nix b/modules/hosts/t480/dev-commit.nix
similarity index 100%
rename from modules2/hosts/t480/dev-commit.nix
rename to modules/hosts/t480/dev-commit.nix
diff --git a/modules2/hosts/t480/dwm/blocks.nix b/modules/hosts/t480/dwm/blocks.nix
similarity index 100%
rename from modules2/hosts/t480/dwm/blocks.nix
rename to modules/hosts/t480/dwm/blocks.nix
diff --git a/modules2/hosts/t480/dwm/dwm.nix b/modules/hosts/t480/dwm/dwm.nix
similarity index 100%
rename from modules2/hosts/t480/dwm/dwm.nix
rename to modules/hosts/t480/dwm/dwm.nix
diff --git a/modules2/hosts/t480/fixapost.nix b/modules/hosts/t480/fixapost.nix
similarity index 100%
rename from modules2/hosts/t480/fixapost.nix
rename to modules/hosts/t480/fixapost.nix
diff --git a/modules2/hosts/t480/heightwidth.nix b/modules/hosts/t480/heightwidth.nix
similarity index 100%
rename from modules2/hosts/t480/heightwidth.nix
rename to modules/hosts/t480/heightwidth.nix
diff --git a/modules2/hosts/t480/imports.nix b/modules/hosts/t480/imports.nix
similarity index 100%
rename from modules2/hosts/t480/imports.nix
rename to modules/hosts/t480/imports.nix
diff --git a/modules2/hosts/t480/kanata/devices.nix b/modules/hosts/t480/kanata/devices.nix
similarity index 100%
rename from modules2/hosts/t480/kanata/devices.nix
rename to modules/hosts/t480/kanata/devices.nix
diff --git a/modules2/hosts/t480/kanata/enable.nix b/modules/hosts/t480/kanata/enable.nix
similarity index 100%
rename from modules2/hosts/t480/kanata/enable.nix
rename to modules/hosts/t480/kanata/enable.nix
diff --git a/modules2/hosts/t480/notes.nix b/modules/hosts/t480/notes.nix
similarity index 100%
rename from modules2/hosts/t480/notes.nix
rename to modules/hosts/t480/notes.nix
diff --git a/modules2/hosts/t480/ollama.nix b/modules/hosts/t480/ollama.nix
similarity index 100%
rename from modules2/hosts/t480/ollama.nix
rename to modules/hosts/t480/ollama.nix
diff --git a/modules2/hosts/t480/open-webui.nix b/modules/hosts/t480/open-webui.nix
similarity index 100%
rename from modules2/hosts/t480/open-webui.nix
rename to modules/hosts/t480/open-webui.nix
diff --git a/modules2/hosts/t480/password-store.nix b/modules/hosts/t480/password-store.nix
similarity index 100%
rename from modules2/hosts/t480/password-store.nix
rename to modules/hosts/t480/password-store.nix
diff --git a/modules2/hosts/t480/slack.nix b/modules/hosts/t480/slack.nix
similarity index 100%
rename from modules2/hosts/t480/slack.nix
rename to modules/hosts/t480/slack.nix
diff --git a/modules2/hosts/t480/tmux-sessionizer.nix b/modules/hosts/t480/tmux-sessionizer.nix
similarity index 100%
rename from modules2/hosts/t480/tmux-sessionizer.nix
rename to modules/hosts/t480/tmux-sessionizer.nix
diff --git a/modules2/hosts/t480/zoom.nix b/modules/hosts/t480/zoom.nix
similarity index 100%
rename from modules2/hosts/t480/zoom.nix
rename to modules/hosts/t480/zoom.nix
diff --git a/modules2/kanata/config.nix b/modules/kanata/config.nix
similarity index 100%
rename from modules2/kanata/config.nix
rename to modules/kanata/config.nix
diff --git a/modules2/kanata/devices.nix b/modules/kanata/devices.nix
similarity index 100%
rename from modules2/kanata/devices.nix
rename to modules/kanata/devices.nix
diff --git a/modules2/kanata/extra-config.nix b/modules/kanata/extra-config.nix
similarity index 100%
rename from modules2/kanata/extra-config.nix
rename to modules/kanata/extra-config.nix
diff --git a/modules2/makemkv.nix b/modules/makemkv.nix
similarity index 100%
rename from modules2/makemkv.nix
rename to modules/makemkv.nix
diff --git a/modules2/meta/dev-shell.nix b/modules/meta/dev-shell.nix
similarity index 100%
rename from modules2/meta/dev-shell.nix
rename to modules/meta/dev-shell.nix
diff --git a/modules2/meta/flake-parts.nix b/modules/meta/flake-parts.nix
similarity index 100%
rename from modules2/meta/flake-parts.nix
rename to modules/meta/flake-parts.nix
diff --git a/modules2/meta/formatting.nix b/modules/meta/formatting.nix
similarity index 100%
rename from modules2/meta/formatting.nix
rename to modules/meta/formatting.nix
diff --git a/modules2/meta/meta-output.nix b/modules/meta/meta-output.nix
similarity index 100%
rename from modules2/meta/meta-output.nix
rename to modules/meta/meta-output.nix
diff --git a/modules2/meta/systems.nix b/modules/meta/systems.nix
similarity index 100%
rename from modules2/meta/systems.nix
rename to modules/meta/systems.nix
diff --git a/modules2/mpv/bindings.nix b/modules/mpv/bindings.nix
similarity index 100%
rename from modules2/mpv/bindings.nix
rename to modules/mpv/bindings.nix
diff --git a/modules2/mpv/enable.nix b/modules/mpv/enable.nix
similarity index 100%
rename from modules2/mpv/enable.nix
rename to modules/mpv/enable.nix
diff --git a/modules2/nix-index.nix b/modules/nix-index.nix
similarity index 100%
rename from modules2/nix-index.nix
rename to modules/nix-index.nix
diff --git a/modules2/nix/utils.nix b/modules/nix/utils.nix
similarity index 100%
rename from modules2/nix/utils.nix
rename to modules/nix/utils.nix
diff --git a/modules2/nixos-configurations.nix b/modules/nixos-configurations.nix
similarity index 100%
rename from modules2/nixos-configurations.nix
rename to modules/nixos-configurations.nix
diff --git a/modules2/nixvim/aliases.nix b/modules/nixvim/aliases.nix
similarity index 100%
rename from modules2/nixvim/aliases.nix
rename to modules/nixvim/aliases.nix
diff --git a/modules2/nixvim/auto-save.nix b/modules/nixvim/auto-save.nix
similarity index 100%
rename from modules2/nixvim/auto-save.nix
rename to modules/nixvim/auto-save.nix
diff --git a/modules2/nixvim/colorscheme.nix b/modules/nixvim/colorscheme.nix
similarity index 100%
rename from modules2/nixvim/colorscheme.nix
rename to modules/nixvim/colorscheme.nix
diff --git a/modules2/nixvim/completion/cmp.nix b/modules/nixvim/completion/cmp.nix
similarity index 100%
rename from modules2/nixvim/completion/cmp.nix
rename to modules/nixvim/completion/cmp.nix
diff --git a/modules2/nixvim/completion/luasnip.nix b/modules/nixvim/completion/luasnip.nix
similarity index 100%
rename from modules2/nixvim/completion/luasnip.nix
rename to modules/nixvim/completion/luasnip.nix
diff --git a/modules2/nixvim/completion/snippets/asciidoc.lua b/modules/nixvim/completion/snippets/asciidoc.lua
similarity index 100%
rename from modules2/nixvim/completion/snippets/asciidoc.lua
rename to modules/nixvim/completion/snippets/asciidoc.lua
diff --git a/modules2/nixvim/completion/snippets/javascript.lua b/modules/nixvim/completion/snippets/javascript.lua
similarity index 100%
rename from modules2/nixvim/completion/snippets/javascript.lua
rename to modules/nixvim/completion/snippets/javascript.lua
diff --git a/modules2/nixvim/completion/snippets/lua.lua b/modules/nixvim/completion/snippets/lua.lua
similarity index 100%
rename from modules2/nixvim/completion/snippets/lua.lua
rename to modules/nixvim/completion/snippets/lua.lua
diff --git a/modules2/nixvim/completion/snippets/nix.lua b/modules/nixvim/completion/snippets/nix.lua
similarity index 100%
rename from modules2/nixvim/completion/snippets/nix.lua
rename to modules/nixvim/completion/snippets/nix.lua
diff --git a/modules2/nixvim/completion/snippets/php.lua b/modules/nixvim/completion/snippets/php.lua
similarity index 100%
rename from modules2/nixvim/completion/snippets/php.lua
rename to modules/nixvim/completion/snippets/php.lua
diff --git a/modules2/nixvim/completion/snippets/rst.lua b/modules/nixvim/completion/snippets/rst.lua
similarity index 100%
rename from modules2/nixvim/completion/snippets/rst.lua
rename to modules/nixvim/completion/snippets/rst.lua
diff --git a/modules2/nixvim/completion/snippets/twig.lua b/modules/nixvim/completion/snippets/twig.lua
similarity index 100%
rename from modules2/nixvim/completion/snippets/twig.lua
rename to modules/nixvim/completion/snippets/twig.lua
diff --git a/modules2/nixvim/conform.nix b/modules/nixvim/conform.nix
similarity index 100%
rename from modules2/nixvim/conform.nix
rename to modules/nixvim/conform.nix
diff --git a/modules2/nixvim/diagnostics.nix b/modules/nixvim/diagnostics.nix
similarity index 100%
rename from modules2/nixvim/diagnostics.nix
rename to modules/nixvim/diagnostics.nix
diff --git a/modules2/nixvim/edit-alternate/config.nix b/modules/nixvim/edit-alternate/config.nix
similarity index 100%
rename from modules2/nixvim/edit-alternate/config.nix
rename to modules/nixvim/edit-alternate/config.nix
diff --git a/modules2/nixvim/edit-alternate/extra-plugins.nix b/modules/nixvim/edit-alternate/extra-plugins.nix
similarity index 100%
rename from modules2/nixvim/edit-alternate/extra-plugins.nix
rename to modules/nixvim/edit-alternate/extra-plugins.nix
diff --git a/modules2/nixvim/edit-alternate/keymaps.nix b/modules/nixvim/edit-alternate/keymaps.nix
similarity index 100%
rename from modules2/nixvim/edit-alternate/keymaps.nix
rename to modules/nixvim/edit-alternate/keymaps.nix
diff --git a/modules2/nixvim/extra-packages.nix b/modules/nixvim/extra-packages.nix
similarity index 100%
rename from modules2/nixvim/extra-packages.nix
rename to modules/nixvim/extra-packages.nix
diff --git a/modules2/nixvim/fidget.nix b/modules/nixvim/fidget.nix
similarity index 100%
rename from modules2/nixvim/fidget.nix
rename to modules/nixvim/fidget.nix
diff --git a/modules2/nixvim/filetypes.nix b/modules/nixvim/filetypes.nix
similarity index 100%
rename from modules2/nixvim/filetypes.nix
rename to modules/nixvim/filetypes.nix
diff --git a/modules2/nixvim/flake-outputs.nix b/modules/nixvim/flake-outputs.nix
similarity index 100%
rename from modules2/nixvim/flake-outputs.nix
rename to modules/nixvim/flake-outputs.nix
diff --git a/modules2/nixvim/ftplugin/gitcommit.nix b/modules/nixvim/ftplugin/gitcommit.nix
similarity index 100%
rename from modules2/nixvim/ftplugin/gitcommit.nix
rename to modules/nixvim/ftplugin/gitcommit.nix
diff --git a/modules2/nixvim/ftplugin/just.nix b/modules/nixvim/ftplugin/just.nix
similarity index 100%
rename from modules2/nixvim/ftplugin/just.nix
rename to modules/nixvim/ftplugin/just.nix
diff --git a/modules2/nixvim/ftplugin/markdown.nix b/modules/nixvim/ftplugin/markdown.nix
similarity index 100%
rename from modules2/nixvim/ftplugin/markdown.nix
rename to modules/nixvim/ftplugin/markdown.nix
diff --git a/modules2/nixvim/fugitive.nix b/modules/nixvim/fugitive.nix
similarity index 100%
rename from modules2/nixvim/fugitive.nix
rename to modules/nixvim/fugitive.nix
diff --git a/modules2/nixvim/gitsigns.nix b/modules/nixvim/gitsigns.nix
similarity index 100%
rename from modules2/nixvim/gitsigns.nix
rename to modules/nixvim/gitsigns.nix
diff --git a/modules2/nixvim/harpoon.nix b/modules/nixvim/harpoon.nix
similarity index 100%
rename from modules2/nixvim/harpoon.nix
rename to modules/nixvim/harpoon.nix
diff --git a/modules2/nixvim/keymaps.nix b/modules/nixvim/keymaps.nix
similarity index 100%
rename from modules2/nixvim/keymaps.nix
rename to modules/nixvim/keymaps.nix
diff --git a/modules2/nixvim/leader.nix b/modules/nixvim/leader.nix
similarity index 100%
rename from modules2/nixvim/leader.nix
rename to modules/nixvim/leader.nix
diff --git a/modules2/nixvim/lint.nix b/modules/nixvim/lint.nix
similarity index 100%
rename from modules2/nixvim/lint.nix
rename to modules/nixvim/lint.nix
diff --git a/modules2/nixvim/lsp.nix b/modules/nixvim/lsp.nix
similarity index 100%
rename from modules2/nixvim/lsp.nix
rename to modules/nixvim/lsp.nix
diff --git a/modules2/nixvim/lsp/bash.nix b/modules/nixvim/lsp/bash.nix
similarity index 100%
rename from modules2/nixvim/lsp/bash.nix
rename to modules/nixvim/lsp/bash.nix
diff --git a/modules2/nixvim/lsp/css.nix b/modules/nixvim/lsp/css.nix
similarity index 100%
rename from modules2/nixvim/lsp/css.nix
rename to modules/nixvim/lsp/css.nix
diff --git a/modules2/nixvim/lsp/go.nix b/modules/nixvim/lsp/go.nix
similarity index 100%
rename from modules2/nixvim/lsp/go.nix
rename to modules/nixvim/lsp/go.nix
diff --git a/modules2/nixvim/lsp/html.nix b/modules/nixvim/lsp/html.nix
similarity index 100%
rename from modules2/nixvim/lsp/html.nix
rename to modules/nixvim/lsp/html.nix
diff --git a/modules2/nixvim/lsp/javascript.nix b/modules/nixvim/lsp/javascript.nix
similarity index 100%
rename from modules2/nixvim/lsp/javascript.nix
rename to modules/nixvim/lsp/javascript.nix
diff --git a/modules2/nixvim/lsp/lua.nix b/modules/nixvim/lsp/lua.nix
similarity index 100%
rename from modules2/nixvim/lsp/lua.nix
rename to modules/nixvim/lsp/lua.nix
diff --git a/modules2/nixvim/lsp/nix.nix b/modules/nixvim/lsp/nix.nix
similarity index 100%
rename from modules2/nixvim/lsp/nix.nix
rename to modules/nixvim/lsp/nix.nix
diff --git a/modules2/nixvim/lsp/php.nix b/modules/nixvim/lsp/php.nix
similarity index 100%
rename from modules2/nixvim/lsp/php.nix
rename to modules/nixvim/lsp/php.nix
diff --git a/modules2/nixvim/mini.nix b/modules/nixvim/mini.nix
similarity index 100%
rename from modules2/nixvim/mini.nix
rename to modules/nixvim/mini.nix
diff --git a/modules2/nixvim/oil.nix b/modules/nixvim/oil.nix
similarity index 100%
rename from modules2/nixvim/oil.nix
rename to modules/nixvim/oil.nix
diff --git a/modules2/nixvim/options.nix b/modules/nixvim/options.nix
similarity index 100%
rename from modules2/nixvim/options.nix
rename to modules/nixvim/options.nix
diff --git a/modules2/nixvim/phpactor.nix b/modules/nixvim/phpactor.nix
similarity index 100%
rename from modules2/nixvim/phpactor.nix
rename to modules/nixvim/phpactor.nix
diff --git a/modules2/nixvim/refactoring.nix b/modules/nixvim/refactoring.nix
similarity index 100%
rename from modules2/nixvim/refactoring.nix
rename to modules/nixvim/refactoring.nix
diff --git a/modules2/nixvim/spell/en.utf-8.add b/modules/nixvim/spell/en.utf-8.add
similarity index 100%
rename from modules2/nixvim/spell/en.utf-8.add
rename to modules/nixvim/spell/en.utf-8.add
diff --git a/modules2/nixvim/telescope.nix b/modules/nixvim/telescope.nix
similarity index 100%
rename from modules2/nixvim/telescope.nix
rename to modules/nixvim/telescope.nix
diff --git a/modules2/nixvim/treesitter.nix b/modules/nixvim/treesitter.nix
similarity index 100%
rename from modules2/nixvim/treesitter.nix
rename to modules/nixvim/treesitter.nix
diff --git a/modules2/nixvim/undotree.nix b/modules/nixvim/undotree.nix
similarity index 100%
rename from modules2/nixvim/undotree.nix
rename to modules/nixvim/undotree.nix
diff --git a/modules2/nixvim/use-in-home.nix b/modules/nixvim/use-in-home.nix
similarity index 100%
rename from modules2/nixvim/use-in-home.nix
rename to modules/nixvim/use-in-home.nix
diff --git a/modules2/nixvim/vim-cool.nix b/modules/nixvim/vim-cool.nix
similarity index 100%
rename from modules2/nixvim/vim-cool.nix
rename to modules/nixvim/vim-cool.nix
diff --git a/modules2/nixvim/vim-dadbod.nix b/modules/nixvim/vim-dadbod.nix
similarity index 100%
rename from modules2/nixvim/vim-dadbod.nix
rename to modules/nixvim/vim-dadbod.nix
diff --git a/modules2/nixvim/vim-heritage.nix b/modules/nixvim/vim-heritage.nix
similarity index 100%
rename from modules2/nixvim/vim-heritage.nix
rename to modules/nixvim/vim-heritage.nix
diff --git a/modules2/nixvim/vim-highlightedyank.nix b/modules/nixvim/vim-highlightedyank.nix
similarity index 100%
rename from modules2/nixvim/vim-highlightedyank.nix
rename to modules/nixvim/vim-highlightedyank.nix
diff --git a/modules2/nixvim/vim-test.nix b/modules/nixvim/vim-test.nix
similarity index 100%
rename from modules2/nixvim/vim-test.nix
rename to modules/nixvim/vim-test.nix
diff --git a/modules2/nixvim/vim-textobj-xmlattr.nix b/modules/nixvim/vim-textobj-xmlattr.nix
similarity index 100%
rename from modules2/nixvim/vim-textobj-xmlattr.nix
rename to modules/nixvim/vim-textobj-xmlattr.nix
diff --git a/modules2/nixvim/web-devicons.nix b/modules/nixvim/web-devicons.nix
similarity index 100%
rename from modules2/nixvim/web-devicons.nix
rename to modules/nixvim/web-devicons.nix
diff --git a/modules2/node.nix b/modules/node.nix
similarity index 100%
rename from modules2/node.nix
rename to modules/node.nix
diff --git a/modules2/notes/base.nix b/modules/notes/base.nix
similarity index 100%
rename from modules2/notes/base.nix
rename to modules/notes/base.nix
diff --git a/modules2/notes/session-variables.nix b/modules/notes/session-variables.nix
similarity index 100%
rename from modules2/notes/session-variables.nix
rename to modules/notes/session-variables.nix
diff --git a/modules2/notes/xdg.nix b/modules/notes/xdg.nix
similarity index 100%
rename from modules2/notes/xdg.nix
rename to modules/notes/xdg.nix
diff --git a/modules2/ollama/acceleration.nix b/modules/ollama/acceleration.nix
similarity index 100%
rename from modules2/ollama/acceleration.nix
rename to modules/ollama/acceleration.nix
diff --git a/modules2/ollama/models.nix b/modules/ollama/models.nix
similarity index 100%
rename from modules2/ollama/models.nix
rename to modules/ollama/models.nix
diff --git a/modules2/openssh/enable.nix b/modules/openssh/enable.nix
similarity index 100%
rename from modules2/openssh/enable.nix
rename to modules/openssh/enable.nix
diff --git a/modules2/openssh/firewall.nix b/modules/openssh/firewall.nix
similarity index 100%
rename from modules2/openssh/firewall.nix
rename to modules/openssh/firewall.nix
diff --git a/modules2/openssh/settings.nix b/modules/openssh/settings.nix
similarity index 100%
rename from modules2/openssh/settings.nix
rename to modules/openssh/settings.nix
diff --git a/modules2/owner.nix b/modules/owner.nix
similarity index 100%
rename from modules2/owner.nix
rename to modules/owner.nix
diff --git a/modules2/password-store/enable.nix b/modules/password-store/enable.nix
similarity index 100%
rename from modules2/password-store/enable.nix
rename to modules/password-store/enable.nix
diff --git a/modules2/password-store/package.nix b/modules/password-store/package.nix
similarity index 100%
rename from modules2/password-store/package.nix
rename to modules/password-store/package.nix
diff --git a/modules2/password-store/settings.nix b/modules/password-store/settings.nix
similarity index 100%
rename from modules2/password-store/settings.nix
rename to modules/password-store/settings.nix
diff --git a/modules2/phpactor/config/phpactor.yml b/modules/phpactor/config/phpactor.yml
similarity index 100%
rename from modules2/phpactor/config/phpactor.yml
rename to modules/phpactor/config/phpactor.yml
diff --git a/modules2/phpactor/config/templates/action/SourceCode.php.twig b/modules/phpactor/config/templates/action/SourceCode.php.twig
similarity index 100%
rename from modules2/phpactor/config/templates/action/SourceCode.php.twig
rename to modules/phpactor/config/templates/action/SourceCode.php.twig
diff --git a/modules2/phpactor/config/templates/collection/SourceCode.php.twig b/modules/phpactor/config/templates/collection/SourceCode.php.twig
similarity index 100%
rename from modules2/phpactor/config/templates/collection/SourceCode.php.twig
rename to modules/phpactor/config/templates/collection/SourceCode.php.twig
diff --git a/modules2/phpactor/config/templates/default/SourceCode.php.twig b/modules/phpactor/config/templates/default/SourceCode.php.twig
similarity index 100%
rename from modules2/phpactor/config/templates/default/SourceCode.php.twig
rename to modules/phpactor/config/templates/default/SourceCode.php.twig
diff --git a/modules2/phpactor/config/templates/drupal-functional-test/SourceCode.php.twig b/modules/phpactor/config/templates/drupal-functional-test/SourceCode.php.twig
similarity index 100%
rename from modules2/phpactor/config/templates/drupal-functional-test/SourceCode.php.twig
rename to modules/phpactor/config/templates/drupal-functional-test/SourceCode.php.twig
diff --git a/modules2/phpactor/config/templates/drupal-kernel-test/SourceCode.php.twig b/modules/phpactor/config/templates/drupal-kernel-test/SourceCode.php.twig
similarity index 100%
rename from modules2/phpactor/config/templates/drupal-kernel-test/SourceCode.php.twig
rename to modules/phpactor/config/templates/drupal-kernel-test/SourceCode.php.twig
diff --git a/modules2/phpactor/config/templates/drupal-unit-test/SourceCode.php.twig b/modules/phpactor/config/templates/drupal-unit-test/SourceCode.php.twig
similarity index 100%
rename from modules2/phpactor/config/templates/drupal-unit-test/SourceCode.php.twig
rename to modules/phpactor/config/templates/drupal-unit-test/SourceCode.php.twig
diff --git a/modules2/phpactor/phpactor.nix b/modules/phpactor/phpactor.nix
similarity index 100%
rename from modules2/phpactor/phpactor.nix
rename to modules/phpactor/phpactor.nix
diff --git a/modules2/ranger.nix b/modules/ranger.nix
similarity index 100%
rename from modules2/ranger.nix
rename to modules/ranger.nix
diff --git a/modules2/redshift.nix b/modules/redshift.nix
similarity index 100%
rename from modules2/redshift.nix
rename to modules/redshift.nix
diff --git a/modules2/scripts/git-save.nix b/modules/scripts/git-save.nix
similarity index 100%
rename from modules2/scripts/git-save.nix
rename to modules/scripts/git-save.nix
diff --git a/modules2/sound/pipewire/alsa.nix b/modules/sound/pipewire/alsa.nix
similarity index 100%
rename from modules2/sound/pipewire/alsa.nix
rename to modules/sound/pipewire/alsa.nix
diff --git a/modules2/sound/pipewire/enable.nix b/modules/sound/pipewire/enable.nix
similarity index 100%
rename from modules2/sound/pipewire/enable.nix
rename to modules/sound/pipewire/enable.nix
diff --git a/modules2/sound/pipewire/pulse.nix b/modules/sound/pipewire/pulse.nix
similarity index 100%
rename from modules2/sound/pipewire/pulse.nix
rename to modules/sound/pipewire/pulse.nix
diff --git a/modules2/st.nix b/modules/st.nix
similarity index 100%
rename from modules2/st.nix
rename to modules/st.nix
diff --git a/modules2/starship/format.nix b/modules/starship/format.nix
similarity index 100%
rename from modules2/starship/format.nix
rename to modules/starship/format.nix
diff --git a/modules2/starship/mob.nix b/modules/starship/mob.nix
similarity index 100%
rename from modules2/starship/mob.nix
rename to modules/starship/mob.nix
diff --git a/modules2/starship/newline.nix b/modules/starship/newline.nix
similarity index 100%
rename from modules2/starship/newline.nix
rename to modules/starship/newline.nix
diff --git a/modules2/starship/settings.nix b/modules/starship/settings.nix
similarity index 100%
rename from modules2/starship/settings.nix
rename to modules/starship/settings.nix
diff --git a/modules2/starship/shlvl.nix b/modules/starship/shlvl.nix
similarity index 100%
rename from modules2/starship/shlvl.nix
rename to modules/starship/shlvl.nix
diff --git a/modules2/starship/starship.nix b/modules/starship/starship.nix
similarity index 100%
rename from modules2/starship/starship.nix
rename to modules/starship/starship.nix
diff --git a/modules2/starship/zsh.nix b/modules/starship/zsh.nix
similarity index 100%
rename from modules2/starship/zsh.nix
rename to modules/starship/zsh.nix
diff --git a/modules2/sudo.nix b/modules/sudo.nix
similarity index 100%
rename from modules2/sudo.nix
rename to modules/sudo.nix
diff --git a/modules2/sxhkd/enable.nix b/modules/sxhkd/enable.nix
similarity index 100%
rename from modules2/sxhkd/enable.nix
rename to modules/sxhkd/enable.nix
diff --git a/modules2/sxhkd/keybindings.nix b/modules/sxhkd/keybindings.nix
similarity index 100%
rename from modules2/sxhkd/keybindings.nix
rename to modules/sxhkd/keybindings.nix
diff --git a/modules2/tailscale.nix b/modules/tailscale.nix
similarity index 100%
rename from modules2/tailscale.nix
rename to modules/tailscale.nix
diff --git a/modules2/thunar/enable.nix b/modules/thunar/enable.nix
similarity index 100%
rename from modules2/thunar/enable.nix
rename to modules/thunar/enable.nix
diff --git a/modules2/thunar/extra-packages.nix b/modules/thunar/extra-packages.nix
similarity index 100%
rename from modules2/thunar/extra-packages.nix
rename to modules/thunar/extra-packages.nix
diff --git a/modules2/thunar/plugins.nix b/modules/thunar/plugins.nix
similarity index 100%
rename from modules2/thunar/plugins.nix
rename to modules/thunar/plugins.nix
diff --git a/modules2/tmux-sessionizer/config.nix b/modules/tmux-sessionizer/config.nix
similarity index 100%
rename from modules2/tmux-sessionizer/config.nix
rename to modules/tmux-sessionizer/config.nix
diff --git a/modules2/tmux-sessionizer/default.nix b/modules/tmux-sessionizer/default.nix
similarity index 100%
rename from modules2/tmux-sessionizer/default.nix
rename to modules/tmux-sessionizer/default.nix
diff --git a/modules2/tmux-sessionizer/package.nix b/modules/tmux-sessionizer/package.nix
similarity index 100%
rename from modules2/tmux-sessionizer/package.nix
rename to modules/tmux-sessionizer/package.nix
diff --git a/modules2/tmux/enable.nix b/modules/tmux/enable.nix
similarity index 100%
rename from modules2/tmux/enable.nix
rename to modules/tmux/enable.nix
diff --git a/modules2/tmux/extra-config.nix b/modules/tmux/extra-config.nix
similarity index 100%
rename from modules2/tmux/extra-config.nix
rename to modules/tmux/extra-config.nix
diff --git a/modules2/tmux/plugins.nix b/modules/tmux/plugins.nix
similarity index 100%
rename from modules2/tmux/plugins.nix
rename to modules/tmux/plugins.nix
diff --git a/modules2/tmux/terminal.nix b/modules/tmux/terminal.nix
similarity index 100%
rename from modules2/tmux/terminal.nix
rename to modules/tmux/terminal.nix
diff --git a/modules2/unfree-packages.nix b/modules/unfree-packages.nix
similarity index 100%
rename from modules2/unfree-packages.nix
rename to modules/unfree-packages.nix
diff --git a/modules2/xbanish.nix b/modules/xbanish.nix
similarity index 100%
rename from modules2/xbanish.nix
rename to modules/xbanish.nix
diff --git a/modules2/xsession.nix b/modules/xsession.nix
similarity index 100%
rename from modules2/xsession.nix
rename to modules/xsession.nix
diff --git a/modules2/zram.nix b/modules/zram.nix
similarity index 100%
rename from modules2/zram.nix
rename to modules/zram.nix
diff --git a/modules2/zsh/abbreviations/abbreviations.nix b/modules/zsh/abbreviations/abbreviations.nix
similarity index 100%
rename from modules2/zsh/abbreviations/abbreviations.nix
rename to modules/zsh/abbreviations/abbreviations.nix
diff --git a/modules2/zsh/abbreviations/enable.nix b/modules/zsh/abbreviations/enable.nix
similarity index 100%
rename from modules2/zsh/abbreviations/enable.nix
rename to modules/zsh/abbreviations/enable.nix
diff --git a/modules2/zsh/abbreviations/global-abbreviations.nix b/modules/zsh/abbreviations/global-abbreviations.nix
similarity index 100%
rename from modules2/zsh/abbreviations/global-abbreviations.nix
rename to modules/zsh/abbreviations/global-abbreviations.nix
diff --git a/modules2/zsh/aliases.nix b/modules/zsh/aliases.nix
similarity index 100%
rename from modules2/zsh/aliases.nix
rename to modules/zsh/aliases.nix
diff --git a/modules2/zsh/completion.nix b/modules/zsh/completion.nix
similarity index 100%
rename from modules2/zsh/completion.nix
rename to modules/zsh/completion.nix
diff --git a/modules2/zsh/dot-dir.nix b/modules/zsh/dot-dir.nix
similarity index 100%
rename from modules2/zsh/dot-dir.nix
rename to modules/zsh/dot-dir.nix
diff --git a/modules2/zsh/enable.nix b/modules/zsh/enable.nix
similarity index 100%
rename from modules2/zsh/enable.nix
rename to modules/zsh/enable.nix
diff --git a/modules2/zsh/init.nix b/modules/zsh/init.nix
similarity index 100%
rename from modules2/zsh/init.nix
rename to modules/zsh/init.nix
diff --git a/modules2/zsh/profile.nix b/modules/zsh/profile.nix
similarity index 100%
rename from modules2/zsh/profile.nix
rename to modules/zsh/profile.nix
diff --git a/modules2/zsh/syntax-highlighting.nix b/modules/zsh/syntax-highlighting.nix
similarity index 100%
rename from modules2/zsh/syntax-highlighting.nix
rename to modules/zsh/syntax-highlighting.nix
diff --git a/modules2/zsh/variables.nix b/modules/zsh/variables.nix
similarity index 100%
rename from modules2/zsh/variables.nix
rename to modules/zsh/variables.nix