diff --git a/flake-modules/packages.nix b/flake-modules/packages.nix
index 8eb4c3b8..6640cca1 100644
--- a/flake-modules/packages.nix
+++ b/flake-modules/packages.nix
@@ -10,7 +10,7 @@
         neovim = inputs'.nixvim.legacyPackages.makeNixvimWithModule {
           inherit pkgs;
 
-          module = import "${self}/modules/home-manager/coding/neovim/config";
+          module = import "${self}/modules/home-manager/neovim/config";
         };
       };
     };
diff --git a/modules/home-manager/cli/bluetuith.nix b/modules/home-manager/bluetuith.nix
similarity index 100%
rename from modules/home-manager/cli/bluetuith.nix
rename to modules/home-manager/bluetuith.nix
diff --git a/modules/home-manager/cli/bookmarkthis.nix b/modules/home-manager/bookmarkthis.nix
similarity index 100%
rename from modules/home-manager/cli/bookmarkthis.nix
rename to modules/home-manager/bookmarkthis.nix
diff --git a/modules/home-manager/desktop/browsers/chromium.nix b/modules/home-manager/browsers/chromium.nix
similarity index 100%
rename from modules/home-manager/desktop/browsers/chromium.nix
rename to modules/home-manager/browsers/chromium.nix
diff --git a/modules/home-manager/desktop/browsers/firefox.nix b/modules/home-manager/browsers/firefox.nix
similarity index 85%
rename from modules/home-manager/desktop/browsers/firefox.nix
rename to modules/home-manager/browsers/firefox.nix
index dbee93d6..6ab4114f 100644
--- a/modules/home-manager/desktop/browsers/firefox.nix
+++ b/modules/home-manager/browsers/firefox.nix
@@ -118,6 +118,24 @@ in
             privateDefault = "ddg";
           };
 
+          search.engines = {
+            # TODO: Drupal.org users.
+            # TODO: Mastodon.
+            # TODO: GitHub.
+            # TODO: Forgejo.
+            drupal_projects = {
+              name = "Drupal.org projects";
+              urls = [ { template = "https://www.drupal.org/project/{searchTerms}"; } ];
+              definedAliases = [ "@dp" ];
+            };
+
+            nixvim = {
+              name = "Nixvim options search";
+              urls = [ { template = "https://nix-community.github.io/nixvim/search/?query={searchTerms}"; } ];
+              definedAliases = [ "@nxv" ];
+            };
+          };
+
           settings = {
             "browser.search.isUS" = false;
             "browser.search.region" = "GB";
diff --git a/modules/home-manager/desktop/browsers/qutebrowser.nix b/modules/home-manager/browsers/qutebrowser.nix
similarity index 100%
rename from modules/home-manager/desktop/browsers/qutebrowser.nix
rename to modules/home-manager/browsers/qutebrowser.nix
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index ff220e6b..52fe37a2 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -1,31 +1,31 @@
 {
   imports = [
-    ./cli/bluetuith.nix
-    ./cli/bookmarkthis.nix
-    ./cli/dev-commit.nix
-    ./cli/direnv.nix
-    ./cli/fzf.nix
-    ./cli/git.nix
-    ./cli/node.nix
-    ./cli/notes.nix
-    ./cli/ranger.nix
-    ./cli/starship.nix
-    ./cli/sxhkd.nix
-    ./cli/tmux-sessionizer.nix
-    ./cli/tmux.nix
-    ./cli/zsh
-    ./coding/neovim
-    ./coding/phpactor
-    ./core/gnupg.nix
-    ./desktop/browsers/chromium.nix
-    ./desktop/browsers/firefox.nix
-    ./desktop/browsers/qutebrowser.nix
-    ./desktop/flameshot.nix
-    ./desktop/gtk.nix
-    ./desktop/media/handbrake.nix
-    ./desktop/media/makemkv.nix
-    ./desktop/media/mpv.nix
-    ./desktop/redshift.nix
-    ./desktop/screenkey.nix
+    ./bluetuith.nix
+    ./bookmarkthis.nix
+    ./browsers/chromium.nix
+    ./browsers/firefox.nix
+    ./browsers/qutebrowser.nix
+    ./dev-commit.nix
+    ./direnv.nix
+    ./flameshot.nix
+    ./fzf.nix
+    ./git.nix
+    ./gnupg.nix
+    ./gtk.nix
+    ./media/handbrake.nix
+    ./media/makemkv.nix
+    ./media/mpv.nix
+    ./neovim
+    ./node.nix
+    ./notes.nix
+    ./phpactor
+    ./ranger.nix
+    ./redshift.nix
+    ./screenkey.nix
+    ./starship.nix
+    ./sxhkd.nix
+    ./tmux-sessionizer.nix
+    ./tmux.nix
+    ./zsh
   ];
 }
diff --git a/modules/home-manager/cli/dev-commit.nix b/modules/home-manager/dev-commit.nix
similarity index 100%
rename from modules/home-manager/cli/dev-commit.nix
rename to modules/home-manager/dev-commit.nix
diff --git a/modules/home-manager/cli/direnv.nix b/modules/home-manager/direnv.nix
similarity index 100%
rename from modules/home-manager/cli/direnv.nix
rename to modules/home-manager/direnv.nix
diff --git a/modules/home-manager/desktop/flameshot.nix b/modules/home-manager/flameshot.nix
similarity index 100%
rename from modules/home-manager/desktop/flameshot.nix
rename to modules/home-manager/flameshot.nix
diff --git a/modules/home-manager/cli/fzf.nix b/modules/home-manager/fzf.nix
similarity index 100%
rename from modules/home-manager/cli/fzf.nix
rename to modules/home-manager/fzf.nix
diff --git a/modules/home-manager/cli/git.nix b/modules/home-manager/git.nix
similarity index 100%
rename from modules/home-manager/cli/git.nix
rename to modules/home-manager/git.nix
diff --git a/modules/home-manager/core/gnupg.nix b/modules/home-manager/gnupg.nix
similarity index 100%
rename from modules/home-manager/core/gnupg.nix
rename to modules/home-manager/gnupg.nix
diff --git a/modules/home-manager/desktop/gtk.nix b/modules/home-manager/gtk.nix
similarity index 100%
rename from modules/home-manager/desktop/gtk.nix
rename to modules/home-manager/gtk.nix
diff --git a/modules/home-manager/desktop/media/handbrake.nix b/modules/home-manager/media/handbrake.nix
similarity index 100%
rename from modules/home-manager/desktop/media/handbrake.nix
rename to modules/home-manager/media/handbrake.nix
diff --git a/modules/home-manager/desktop/media/makemkv.nix b/modules/home-manager/media/makemkv.nix
similarity index 100%
rename from modules/home-manager/desktop/media/makemkv.nix
rename to modules/home-manager/media/makemkv.nix
diff --git a/modules/home-manager/desktop/media/mpv.nix b/modules/home-manager/media/mpv.nix
similarity index 100%
rename from modules/home-manager/desktop/media/mpv.nix
rename to modules/home-manager/media/mpv.nix
diff --git a/modules/home-manager/coding/neovim/config/default.nix b/modules/home-manager/neovim/config/default.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/config/default.nix
rename to modules/home-manager/neovim/config/default.nix
diff --git a/modules/home-manager/coding/neovim/config/keymaps.nix b/modules/home-manager/neovim/config/keymaps.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/config/keymaps.nix
rename to modules/home-manager/neovim/config/keymaps.nix
diff --git a/modules/home-manager/coding/neovim/config/options.nix b/modules/home-manager/neovim/config/options.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/config/options.nix
rename to modules/home-manager/neovim/config/options.nix
diff --git a/modules/home-manager/coding/neovim/config/plugins/auto-save.nix b/modules/home-manager/neovim/config/plugins/auto-save.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/config/plugins/auto-save.nix
rename to modules/home-manager/neovim/config/plugins/auto-save.nix
diff --git a/modules/home-manager/coding/neovim/config/plugins/cmp.nix b/modules/home-manager/neovim/config/plugins/cmp.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/config/plugins/cmp.nix
rename to modules/home-manager/neovim/config/plugins/cmp.nix
diff --git a/modules/home-manager/coding/neovim/config/plugins/conform.nix b/modules/home-manager/neovim/config/plugins/conform.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/config/plugins/conform.nix
rename to modules/home-manager/neovim/config/plugins/conform.nix
diff --git a/modules/home-manager/coding/neovim/config/plugins/fidget.nix b/modules/home-manager/neovim/config/plugins/fidget.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/config/plugins/fidget.nix
rename to modules/home-manager/neovim/config/plugins/fidget.nix
diff --git a/modules/home-manager/coding/neovim/config/plugins/fugitive.nix b/modules/home-manager/neovim/config/plugins/fugitive.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/config/plugins/fugitive.nix
rename to modules/home-manager/neovim/config/plugins/fugitive.nix
diff --git a/modules/home-manager/coding/neovim/config/plugins/gitsigns.nix b/modules/home-manager/neovim/config/plugins/gitsigns.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/config/plugins/gitsigns.nix
rename to modules/home-manager/neovim/config/plugins/gitsigns.nix
diff --git a/modules/home-manager/coding/neovim/config/plugins/harpoon.nix b/modules/home-manager/neovim/config/plugins/harpoon.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/config/plugins/harpoon.nix
rename to modules/home-manager/neovim/config/plugins/harpoon.nix
diff --git a/modules/home-manager/coding/neovim/config/plugins/lint.nix b/modules/home-manager/neovim/config/plugins/lint.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/config/plugins/lint.nix
rename to modules/home-manager/neovim/config/plugins/lint.nix
diff --git a/modules/home-manager/coding/neovim/config/plugins/lsp.nix b/modules/home-manager/neovim/config/plugins/lsp.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/config/plugins/lsp.nix
rename to modules/home-manager/neovim/config/plugins/lsp.nix
diff --git a/modules/home-manager/coding/neovim/config/plugins/lualine.nix b/modules/home-manager/neovim/config/plugins/lualine.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/config/plugins/lualine.nix
rename to modules/home-manager/neovim/config/plugins/lualine.nix
diff --git a/modules/home-manager/coding/neovim/config/plugins/luasnip.nix b/modules/home-manager/neovim/config/plugins/luasnip.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/config/plugins/luasnip.nix
rename to modules/home-manager/neovim/config/plugins/luasnip.nix
diff --git a/modules/home-manager/coding/neovim/config/plugins/mini.nix b/modules/home-manager/neovim/config/plugins/mini.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/config/plugins/mini.nix
rename to modules/home-manager/neovim/config/plugins/mini.nix
diff --git a/modules/home-manager/coding/neovim/config/plugins/oil.nix b/modules/home-manager/neovim/config/plugins/oil.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/config/plugins/oil.nix
rename to modules/home-manager/neovim/config/plugins/oil.nix
diff --git a/modules/home-manager/coding/neovim/config/plugins/phpactor.nix b/modules/home-manager/neovim/config/plugins/phpactor.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/config/plugins/phpactor.nix
rename to modules/home-manager/neovim/config/plugins/phpactor.nix
diff --git a/modules/home-manager/coding/neovim/config/plugins/refactoring.nix b/modules/home-manager/neovim/config/plugins/refactoring.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/config/plugins/refactoring.nix
rename to modules/home-manager/neovim/config/plugins/refactoring.nix
diff --git a/modules/home-manager/coding/neovim/config/plugins/telescope.nix b/modules/home-manager/neovim/config/plugins/telescope.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/config/plugins/telescope.nix
rename to modules/home-manager/neovim/config/plugins/telescope.nix
diff --git a/modules/home-manager/coding/neovim/config/plugins/treesitter.nix b/modules/home-manager/neovim/config/plugins/treesitter.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/config/plugins/treesitter.nix
rename to modules/home-manager/neovim/config/plugins/treesitter.nix
diff --git a/modules/home-manager/coding/neovim/config/plugins/undotree.nix b/modules/home-manager/neovim/config/plugins/undotree.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/config/plugins/undotree.nix
rename to modules/home-manager/neovim/config/plugins/undotree.nix
diff --git a/modules/home-manager/coding/neovim/config/plugins/vim-cool.nix b/modules/home-manager/neovim/config/plugins/vim-cool.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/config/plugins/vim-cool.nix
rename to modules/home-manager/neovim/config/plugins/vim-cool.nix
diff --git a/modules/home-manager/coding/neovim/config/plugins/vim-dadbod.nix b/modules/home-manager/neovim/config/plugins/vim-dadbod.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/config/plugins/vim-dadbod.nix
rename to modules/home-manager/neovim/config/plugins/vim-dadbod.nix
diff --git a/modules/home-manager/coding/neovim/config/plugins/vim-highlightedyank.nix b/modules/home-manager/neovim/config/plugins/vim-highlightedyank.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/config/plugins/vim-highlightedyank.nix
rename to modules/home-manager/neovim/config/plugins/vim-highlightedyank.nix
diff --git a/modules/home-manager/coding/neovim/config/plugins/vim-test.nix b/modules/home-manager/neovim/config/plugins/vim-test.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/config/plugins/vim-test.nix
rename to modules/home-manager/neovim/config/plugins/vim-test.nix
diff --git a/modules/home-manager/coding/neovim/config/plugins/web-devicons.nix b/modules/home-manager/neovim/config/plugins/web-devicons.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/config/plugins/web-devicons.nix
rename to modules/home-manager/neovim/config/plugins/web-devicons.nix
diff --git a/modules/home-manager/coding/neovim/default.nix b/modules/home-manager/neovim/default.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/default.nix
rename to modules/home-manager/neovim/default.nix
diff --git a/modules/home-manager/cli/node.nix b/modules/home-manager/node.nix
similarity index 100%
rename from modules/home-manager/cli/node.nix
rename to modules/home-manager/node.nix
diff --git a/modules/home-manager/cli/notes.nix b/modules/home-manager/notes.nix
similarity index 100%
rename from modules/home-manager/cli/notes.nix
rename to modules/home-manager/notes.nix
diff --git a/modules/home-manager/coding/phpactor/config/phpactor.yml b/modules/home-manager/phpactor/config/phpactor.yml
similarity index 100%
rename from modules/home-manager/coding/phpactor/config/phpactor.yml
rename to modules/home-manager/phpactor/config/phpactor.yml
diff --git a/modules/home-manager/coding/phpactor/config/templates/action/SourceCode.php.twig b/modules/home-manager/phpactor/config/templates/action/SourceCode.php.twig
similarity index 100%
rename from modules/home-manager/coding/phpactor/config/templates/action/SourceCode.php.twig
rename to modules/home-manager/phpactor/config/templates/action/SourceCode.php.twig
diff --git a/modules/home-manager/coding/phpactor/config/templates/collection/SourceCode.php.twig b/modules/home-manager/phpactor/config/templates/collection/SourceCode.php.twig
similarity index 100%
rename from modules/home-manager/coding/phpactor/config/templates/collection/SourceCode.php.twig
rename to modules/home-manager/phpactor/config/templates/collection/SourceCode.php.twig
diff --git a/modules/home-manager/coding/phpactor/config/templates/default/SourceCode.php.twig b/modules/home-manager/phpactor/config/templates/default/SourceCode.php.twig
similarity index 100%
rename from modules/home-manager/coding/phpactor/config/templates/default/SourceCode.php.twig
rename to modules/home-manager/phpactor/config/templates/default/SourceCode.php.twig
diff --git a/modules/home-manager/coding/phpactor/config/templates/drupal-functional-test/SourceCode.php.twig b/modules/home-manager/phpactor/config/templates/drupal-functional-test/SourceCode.php.twig
similarity index 100%
rename from modules/home-manager/coding/phpactor/config/templates/drupal-functional-test/SourceCode.php.twig
rename to modules/home-manager/phpactor/config/templates/drupal-functional-test/SourceCode.php.twig
diff --git a/modules/home-manager/coding/phpactor/config/templates/drupal-kernel-test/SourceCode.php.twig b/modules/home-manager/phpactor/config/templates/drupal-kernel-test/SourceCode.php.twig
similarity index 100%
rename from modules/home-manager/coding/phpactor/config/templates/drupal-kernel-test/SourceCode.php.twig
rename to modules/home-manager/phpactor/config/templates/drupal-kernel-test/SourceCode.php.twig
diff --git a/modules/home-manager/coding/phpactor/config/templates/drupal-unit-test/SourceCode.php.twig b/modules/home-manager/phpactor/config/templates/drupal-unit-test/SourceCode.php.twig
similarity index 100%
rename from modules/home-manager/coding/phpactor/config/templates/drupal-unit-test/SourceCode.php.twig
rename to modules/home-manager/phpactor/config/templates/drupal-unit-test/SourceCode.php.twig
diff --git a/modules/home-manager/coding/phpactor/default.nix b/modules/home-manager/phpactor/default.nix
similarity index 100%
rename from modules/home-manager/coding/phpactor/default.nix
rename to modules/home-manager/phpactor/default.nix
diff --git a/modules/home-manager/cli/ranger.nix b/modules/home-manager/ranger.nix
similarity index 100%
rename from modules/home-manager/cli/ranger.nix
rename to modules/home-manager/ranger.nix
diff --git a/modules/home-manager/desktop/redshift.nix b/modules/home-manager/redshift.nix
similarity index 100%
rename from modules/home-manager/desktop/redshift.nix
rename to modules/home-manager/redshift.nix
diff --git a/modules/home-manager/desktop/screenkey.nix b/modules/home-manager/screenkey.nix
similarity index 100%
rename from modules/home-manager/desktop/screenkey.nix
rename to modules/home-manager/screenkey.nix
diff --git a/modules/home-manager/cli/starship.nix b/modules/home-manager/starship.nix
similarity index 100%
rename from modules/home-manager/cli/starship.nix
rename to modules/home-manager/starship.nix
diff --git a/modules/home-manager/cli/sxhkd.nix b/modules/home-manager/sxhkd.nix
similarity index 100%
rename from modules/home-manager/cli/sxhkd.nix
rename to modules/home-manager/sxhkd.nix
diff --git a/modules/home-manager/cli/tmux-sessionizer.nix b/modules/home-manager/tmux-sessionizer.nix
similarity index 100%
rename from modules/home-manager/cli/tmux-sessionizer.nix
rename to modules/home-manager/tmux-sessionizer.nix
diff --git a/modules/home-manager/cli/tmux.nix b/modules/home-manager/tmux.nix
similarity index 100%
rename from modules/home-manager/cli/tmux.nix
rename to modules/home-manager/tmux.nix
diff --git a/modules/home-manager/cli/zsh/abbreviations.nix b/modules/home-manager/zsh/abbreviations.nix
similarity index 100%
rename from modules/home-manager/cli/zsh/abbreviations.nix
rename to modules/home-manager/zsh/abbreviations.nix
diff --git a/modules/home-manager/cli/zsh/aliases.nix b/modules/home-manager/zsh/aliases.nix
similarity index 100%
rename from modules/home-manager/cli/zsh/aliases.nix
rename to modules/home-manager/zsh/aliases.nix
diff --git a/modules/home-manager/cli/zsh/default.nix b/modules/home-manager/zsh/default.nix
similarity index 100%
rename from modules/home-manager/cli/zsh/default.nix
rename to modules/home-manager/zsh/default.nix
diff --git a/modules/home-manager/cli/zsh/global-abbreviations.nix b/modules/home-manager/zsh/global-abbreviations.nix
similarity index 100%
rename from modules/home-manager/cli/zsh/global-abbreviations.nix
rename to modules/home-manager/zsh/global-abbreviations.nix
diff --git a/modules/nixos/core/avahi.nix b/modules/nixos/avahi.nix
similarity index 100%
rename from modules/nixos/core/avahi.nix
rename to modules/nixos/avahi.nix
diff --git a/modules/nixos/core/bluetooth.nix b/modules/nixos/bluetooth.nix
similarity index 100%
rename from modules/nixos/core/bluetooth.nix
rename to modules/nixos/bluetooth.nix
diff --git a/modules/nixos/desktop/dconf.nix b/modules/nixos/dconf.nix
similarity index 100%
rename from modules/nixos/desktop/dconf.nix
rename to modules/nixos/dconf.nix
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 53f94a96..e44efd87 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -1,28 +1,24 @@
 {
   imports = [
-    ./cli/docker.nix
-    ./cli/kanata.nix
-    ./cli/podman.nix
-    ./cli/password-store.nix
-
-    ./core/avahi.nix
-    ./core/bluetooth.nix
-    ./core/gnupg.nix
-    ./core/openssh.nix
-    ./core/pipewire.nix
-    ./core/xbanish.nix
-    ./core/zram.nix
-
-    ./desktop/dconf.nix
-    ./desktop/dwm
-    ./desktop/fonts.nix
-    ./desktop/media
-    ./desktop/st.nix
-    ./desktop/thunar.nix
-
-    ./homelab/gitea-actions-runner.nix
-
+    ./avahi.nix
+    ./bluetooth.nix
+    ./dconf.nix
+    ./docker.nix
+    ./dwm
+    ./fonts.nix
+    ./gitea-actions-runner.nix
+    ./gnupg.nix
+    ./kanata.nix
+    ./media
     ./nix-index.nix
     ./nixpad
+    ./openssh.nix
+    ./password-store.nix
+    ./pipewire.nix
+    ./podman.nix
+    ./st.nix
+    ./thunar.nix
+    ./xbanish.nix
+    ./zram.nix
   ];
 }
diff --git a/modules/nixos/cli/docker.nix b/modules/nixos/docker.nix
similarity index 100%
rename from modules/nixos/cli/docker.nix
rename to modules/nixos/docker.nix
diff --git a/modules/nixos/desktop/dwm/default.nix b/modules/nixos/dwm/default.nix
similarity index 100%
rename from modules/nixos/desktop/dwm/default.nix
rename to modules/nixos/dwm/default.nix
diff --git a/modules/nixos/desktop/dwm/xinitrc b/modules/nixos/dwm/xinitrc
similarity index 100%
rename from modules/nixos/desktop/dwm/xinitrc
rename to modules/nixos/dwm/xinitrc
diff --git a/modules/nixos/desktop/fonts.nix b/modules/nixos/fonts.nix
similarity index 100%
rename from modules/nixos/desktop/fonts.nix
rename to modules/nixos/fonts.nix
diff --git a/modules/nixos/homelab/gitea-actions-runner.nix b/modules/nixos/gitea-actions-runner.nix
similarity index 100%
rename from modules/nixos/homelab/gitea-actions-runner.nix
rename to modules/nixos/gitea-actions-runner.nix
diff --git a/modules/nixos/core/gnupg.nix b/modules/nixos/gnupg.nix
similarity index 100%
rename from modules/nixos/core/gnupg.nix
rename to modules/nixos/gnupg.nix
diff --git a/modules/nixos/cli/kanata.nix b/modules/nixos/kanata.nix
similarity index 100%
rename from modules/nixos/cli/kanata.nix
rename to modules/nixos/kanata.nix
diff --git a/modules/nixos/desktop/media/default.nix b/modules/nixos/media/default.nix
similarity index 100%
rename from modules/nixos/desktop/media/default.nix
rename to modules/nixos/media/default.nix
diff --git a/modules/nixos/desktop/media/makemkv.nix b/modules/nixos/media/makemkv.nix
similarity index 100%
rename from modules/nixos/desktop/media/makemkv.nix
rename to modules/nixos/media/makemkv.nix
diff --git a/modules/nixos/core/openssh.nix b/modules/nixos/openssh.nix
similarity index 100%
rename from modules/nixos/core/openssh.nix
rename to modules/nixos/openssh.nix
diff --git a/modules/nixos/cli/password-store.nix b/modules/nixos/password-store.nix
similarity index 100%
rename from modules/nixos/cli/password-store.nix
rename to modules/nixos/password-store.nix
diff --git a/modules/nixos/core/pipewire.nix b/modules/nixos/pipewire.nix
similarity index 100%
rename from modules/nixos/core/pipewire.nix
rename to modules/nixos/pipewire.nix
diff --git a/modules/nixos/cli/podman.nix b/modules/nixos/podman.nix
similarity index 100%
rename from modules/nixos/cli/podman.nix
rename to modules/nixos/podman.nix
diff --git a/modules/nixos/desktop/st.nix b/modules/nixos/st.nix
similarity index 100%
rename from modules/nixos/desktop/st.nix
rename to modules/nixos/st.nix
diff --git a/modules/nixos/desktop/thunar.nix b/modules/nixos/thunar.nix
similarity index 100%
rename from modules/nixos/desktop/thunar.nix
rename to modules/nixos/thunar.nix
diff --git a/modules/nixos/core/xbanish.nix b/modules/nixos/xbanish.nix
similarity index 100%
rename from modules/nixos/core/xbanish.nix
rename to modules/nixos/xbanish.nix
diff --git a/modules/nixos/core/zram.nix b/modules/nixos/zram.nix
similarity index 100%
rename from modules/nixos/core/zram.nix
rename to modules/nixos/zram.nix