diff --git a/plugins/utils/alpha.nix b/plugins/by-name/alpha/default.nix
similarity index 100%
rename from plugins/utils/alpha.nix
rename to plugins/by-name/alpha/default.nix
diff --git a/plugins/utils/arrow.nix b/plugins/by-name/arrow/default.nix
similarity index 100%
rename from plugins/utils/arrow.nix
rename to plugins/by-name/arrow/default.nix
diff --git a/plugins/utils/auto-save.nix b/plugins/by-name/auto-save/default.nix
similarity index 100%
rename from plugins/utils/auto-save.nix
rename to plugins/by-name/auto-save/default.nix
diff --git a/plugins/utils/auto-session.nix b/plugins/by-name/auto-session/default.nix
similarity index 100%
rename from plugins/utils/auto-session.nix
rename to plugins/by-name/auto-session/default.nix
diff --git a/plugins/utils/autoclose.nix b/plugins/by-name/autoclose/default.nix
similarity index 100%
rename from plugins/utils/autoclose.nix
rename to plugins/by-name/autoclose/default.nix
diff --git a/plugins/utils/autosource.nix b/plugins/by-name/autosource/default.nix
similarity index 100%
rename from plugins/utils/autosource.nix
rename to plugins/by-name/autosource/default.nix
diff --git a/plugins/utils/bacon.nix b/plugins/by-name/bacon/default.nix
similarity index 100%
rename from plugins/utils/bacon.nix
rename to plugins/by-name/bacon/default.nix
diff --git a/plugins/utils/baleia.nix b/plugins/by-name/baleia/default.nix
similarity index 100%
rename from plugins/utils/baleia.nix
rename to plugins/by-name/baleia/default.nix
diff --git a/plugins/utils/better-escape.nix b/plugins/by-name/better-escape/default.nix
similarity index 100%
rename from plugins/utils/better-escape.nix
rename to plugins/by-name/better-escape/default.nix
diff --git a/plugins/utils/bufdelete.nix b/plugins/by-name/bufdelete/default.nix
similarity index 100%
rename from plugins/utils/bufdelete.nix
rename to plugins/by-name/bufdelete/default.nix
diff --git a/plugins/utils/ccc.nix b/plugins/by-name/ccc/default.nix
similarity index 100%
rename from plugins/utils/ccc.nix
rename to plugins/by-name/ccc/default.nix
diff --git a/plugins/utils/clipboard-image.nix b/plugins/by-name/clipboard-image/default.nix
similarity index 100%
rename from plugins/utils/clipboard-image.nix
rename to plugins/by-name/clipboard-image/default.nix
diff --git a/plugins/utils/cloak.nix b/plugins/by-name/cloak/default.nix
similarity index 100%
rename from plugins/utils/cloak.nix
rename to plugins/by-name/cloak/default.nix
diff --git a/plugins/utils/codesnap.nix b/plugins/by-name/codesnap/default.nix
similarity index 100%
rename from plugins/utils/codesnap.nix
rename to plugins/by-name/codesnap/default.nix
diff --git a/plugins/utils/comment-box.nix b/plugins/by-name/comment-box/default.nix
similarity index 100%
rename from plugins/utils/comment-box.nix
rename to plugins/by-name/comment-box/default.nix
diff --git a/plugins/utils/comment.nix b/plugins/by-name/comment/default.nix
similarity index 100%
rename from plugins/utils/comment.nix
rename to plugins/by-name/comment/default.nix
diff --git a/plugins/utils/commentary.nix b/plugins/by-name/commentary/default.nix
similarity index 100%
rename from plugins/utils/commentary.nix
rename to plugins/by-name/commentary/default.nix
diff --git a/plugins/utils/competitest.nix b/plugins/by-name/competitest/default.nix
similarity index 100%
rename from plugins/utils/competitest.nix
rename to plugins/by-name/competitest/default.nix
diff --git a/plugins/utils/conjure.nix b/plugins/by-name/conjure/default.nix
similarity index 100%
rename from plugins/utils/conjure.nix
rename to plugins/by-name/conjure/default.nix
diff --git a/plugins/utils/coverage.nix b/plugins/by-name/coverage/default.nix
similarity index 100%
rename from plugins/utils/coverage.nix
rename to plugins/by-name/coverage/default.nix
diff --git a/plugins/utils/cursorline.nix b/plugins/by-name/cursorline/default.nix
similarity index 100%
rename from plugins/utils/cursorline.nix
rename to plugins/by-name/cursorline/default.nix
diff --git a/plugins/utils/dashboard.nix b/plugins/by-name/dashboard/default.nix
similarity index 100%
rename from plugins/utils/dashboard.nix
rename to plugins/by-name/dashboard/default.nix
diff --git a/plugins/utils/direnv.nix b/plugins/by-name/direnv/default.nix
similarity index 100%
rename from plugins/utils/direnv.nix
rename to plugins/by-name/direnv/default.nix
diff --git a/plugins/utils/dressing.nix b/plugins/by-name/dressing/default.nix
similarity index 100%
rename from plugins/utils/dressing.nix
rename to plugins/by-name/dressing/default.nix
diff --git a/plugins/utils/easyescape.nix b/plugins/by-name/easyescape/default.nix
similarity index 100%
rename from plugins/utils/easyescape.nix
rename to plugins/by-name/easyescape/default.nix
diff --git a/plugins/utils/emmet.nix b/plugins/by-name/emmet/default.nix
similarity index 100%
rename from plugins/utils/emmet.nix
rename to plugins/by-name/emmet/default.nix
diff --git a/plugins/utils/endwise.nix b/plugins/by-name/endwise/default.nix
similarity index 100%
rename from plugins/utils/endwise.nix
rename to plugins/by-name/endwise/default.nix
diff --git a/plugins/utils/firenvim.nix b/plugins/by-name/firenvim/default.nix
similarity index 100%
rename from plugins/utils/firenvim.nix
rename to plugins/by-name/firenvim/default.nix
diff --git a/plugins/utils/flash.nix b/plugins/by-name/flash/default.nix
similarity index 100%
rename from plugins/utils/flash.nix
rename to plugins/by-name/flash/default.nix
diff --git a/plugins/utils/floaterm.nix b/plugins/by-name/floaterm/default.nix
similarity index 100%
rename from plugins/utils/floaterm.nix
rename to plugins/by-name/floaterm/default.nix
diff --git a/plugins/utils/fzf-lua.nix b/plugins/by-name/fzf-lua/default.nix
similarity index 100%
rename from plugins/utils/fzf-lua.nix
rename to plugins/by-name/fzf-lua/default.nix
diff --git a/plugins/utils/goyo.nix b/plugins/by-name/goyo/default.nix
similarity index 100%
rename from plugins/utils/goyo.nix
rename to plugins/by-name/goyo/default.nix
diff --git a/plugins/utils/guess-indent.nix b/plugins/by-name/guess-indent/default.nix
similarity index 100%
rename from plugins/utils/guess-indent.nix
rename to plugins/by-name/guess-indent/default.nix
diff --git a/plugins/utils/hardtime.nix b/plugins/by-name/hardtime/default.nix
similarity index 100%
rename from plugins/utils/hardtime.nix
rename to plugins/by-name/hardtime/default.nix
diff --git a/plugins/utils/harpoon.nix b/plugins/by-name/harpoon/default.nix
similarity index 100%
rename from plugins/utils/harpoon.nix
rename to plugins/by-name/harpoon/default.nix
diff --git a/plugins/utils/hop.nix b/plugins/by-name/hop/default.nix
similarity index 100%
rename from plugins/utils/hop.nix
rename to plugins/by-name/hop/default.nix
diff --git a/plugins/utils/hydra/default.nix b/plugins/by-name/hydra/default.nix
similarity index 92%
rename from plugins/utils/hydra/default.nix
rename to plugins/by-name/hydra/default.nix
index 7a4a04b8..bb2f26bb 100644
--- a/plugins/utils/hydra/default.nix
+++ b/plugins/by-name/hydra/default.nix
@@ -16,7 +16,7 @@ helpers.neovim-plugin.mkNeovimPlugin {
     hydras = import ./hydras-option.nix { inherit lib helpers; };
   };
 
-  settingsOptions = import ./hydra-config-opts.nix { inherit lib helpers; };
+  settingsOptions = import ./settings-options.nix { inherit lib helpers; };
 
   settingsExample = {
     exit = false;
diff --git a/plugins/utils/hydra/hydras-option.nix b/plugins/by-name/hydra/hydras-option.nix
similarity index 99%
rename from plugins/utils/hydra/hydras-option.nix
rename to plugins/by-name/hydra/hydras-option.nix
index 13e9372d..487ed2c9 100644
--- a/plugins/utils/hydra/hydras-option.nix
+++ b/plugins/by-name/hydra/hydras-option.nix
@@ -26,7 +26,7 @@ let
         for more information.
       '';
 
-      config = import ./hydra-config-opts.nix { inherit lib helpers; };
+      config = import ./settings-options.nix { inherit lib helpers; };
 
       heads =
         let
diff --git a/plugins/utils/hydra/hydra-config-opts.nix b/plugins/by-name/hydra/settings-options.nix
similarity index 100%
rename from plugins/utils/hydra/hydra-config-opts.nix
rename to plugins/by-name/hydra/settings-options.nix
diff --git a/plugins/utils/illuminate.nix b/plugins/by-name/illuminate/default.nix
similarity index 100%
rename from plugins/utils/illuminate.nix
rename to plugins/by-name/illuminate/default.nix
diff --git a/plugins/utils/improved-search.nix b/plugins/by-name/improved-search/default.nix
similarity index 100%
rename from plugins/utils/improved-search.nix
rename to plugins/by-name/improved-search/default.nix
diff --git a/plugins/utils/indent-blankline.nix b/plugins/by-name/indent-blankline/default.nix
similarity index 100%
rename from plugins/utils/indent-blankline.nix
rename to plugins/by-name/indent-blankline/default.nix
diff --git a/plugins/utils/indent-o-matic.nix b/plugins/by-name/indent-o-matic/default.nix
similarity index 100%
rename from plugins/utils/indent-o-matic.nix
rename to plugins/by-name/indent-o-matic/default.nix
diff --git a/plugins/utils/instant.nix b/plugins/by-name/instant/default.nix
similarity index 100%
rename from plugins/utils/instant.nix
rename to plugins/by-name/instant/default.nix
diff --git a/plugins/utils/intellitab.nix b/plugins/by-name/intellitab/default.nix
similarity index 100%
rename from plugins/utils/intellitab.nix
rename to plugins/by-name/intellitab/default.nix
diff --git a/plugins/utils/lastplace.nix b/plugins/by-name/lastplace/default.nix
similarity index 100%
rename from plugins/utils/lastplace.nix
rename to plugins/by-name/lastplace/default.nix
diff --git a/plugins/utils/leap.nix b/plugins/by-name/leap/default.nix
similarity index 100%
rename from plugins/utils/leap.nix
rename to plugins/by-name/leap/default.nix
diff --git a/plugins/utils/magma-nvim.nix b/plugins/by-name/magma-nvim/default.nix
similarity index 100%
rename from plugins/utils/magma-nvim.nix
rename to plugins/by-name/magma-nvim/default.nix
diff --git a/plugins/utils/mark-radar.nix b/plugins/by-name/mark-radar/default.nix
similarity index 100%
rename from plugins/utils/mark-radar.nix
rename to plugins/by-name/mark-radar/default.nix
diff --git a/plugins/utils/marks.nix b/plugins/by-name/marks/default.nix
similarity index 100%
rename from plugins/utils/marks.nix
rename to plugins/by-name/marks/default.nix
diff --git a/plugins/utils/mini.nix b/plugins/by-name/mini/default.nix
similarity index 100%
rename from plugins/utils/mini.nix
rename to plugins/by-name/mini/default.nix
diff --git a/plugins/utils/mkdnflow.nix b/plugins/by-name/mkdnflow/default.nix
similarity index 100%
rename from plugins/utils/mkdnflow.nix
rename to plugins/by-name/mkdnflow/default.nix
diff --git a/plugins/utils/molten.nix b/plugins/by-name/molten/default.nix
similarity index 100%
rename from plugins/utils/molten.nix
rename to plugins/by-name/molten/default.nix
diff --git a/plugins/utils/multicursors.nix b/plugins/by-name/multicursors/default.nix
similarity index 100%
rename from plugins/utils/multicursors.nix
rename to plugins/by-name/multicursors/default.nix
diff --git a/plugins/utils/navbuddy.nix b/plugins/by-name/navbuddy/default.nix
similarity index 100%
rename from plugins/utils/navbuddy.nix
rename to plugins/by-name/navbuddy/default.nix
diff --git a/plugins/utils/neoclip.nix b/plugins/by-name/neoclip/default.nix
similarity index 100%
rename from plugins/utils/neoclip.nix
rename to plugins/by-name/neoclip/default.nix
diff --git a/plugins/utils/neocord.nix b/plugins/by-name/neocord/default.nix
similarity index 100%
rename from plugins/utils/neocord.nix
rename to plugins/by-name/neocord/default.nix
diff --git a/plugins/utils/neogen.nix b/plugins/by-name/neogen/default.nix
similarity index 100%
rename from plugins/utils/neogen.nix
rename to plugins/by-name/neogen/default.nix
diff --git a/plugins/utils/neorg.nix b/plugins/by-name/neorg/default.nix
similarity index 100%
rename from plugins/utils/neorg.nix
rename to plugins/by-name/neorg/default.nix
diff --git a/plugins/utils/netman.nix b/plugins/by-name/netman/default.nix
similarity index 100%
rename from plugins/utils/netman.nix
rename to plugins/by-name/netman/default.nix
diff --git a/plugins/utils/nix-develop.nix b/plugins/by-name/nix-develop/default.nix
similarity index 100%
rename from plugins/utils/nix-develop.nix
rename to plugins/by-name/nix-develop/default.nix
diff --git a/plugins/utils/notify.nix b/plugins/by-name/notify/default.nix
similarity index 100%
rename from plugins/utils/notify.nix
rename to plugins/by-name/notify/default.nix
diff --git a/plugins/utils/nvim-autopairs.nix b/plugins/by-name/nvim-autopairs/default.nix
similarity index 100%
rename from plugins/utils/nvim-autopairs.nix
rename to plugins/by-name/nvim-autopairs/default.nix
diff --git a/plugins/utils/nvim-bqf.nix b/plugins/by-name/nvim-bqf/default.nix
similarity index 100%
rename from plugins/utils/nvim-bqf.nix
rename to plugins/by-name/nvim-bqf/default.nix
diff --git a/plugins/utils/nvim-colorizer.nix b/plugins/by-name/nvim-colorizer/default.nix
similarity index 100%
rename from plugins/utils/nvim-colorizer.nix
rename to plugins/by-name/nvim-colorizer/default.nix
diff --git a/plugins/utils/nvim-osc52.nix b/plugins/by-name/nvim-osc52/default.nix
similarity index 100%
rename from plugins/utils/nvim-osc52.nix
rename to plugins/by-name/nvim-osc52/default.nix
diff --git a/plugins/utils/nvim-ufo.nix b/plugins/by-name/nvim-ufo/default.nix
similarity index 100%
rename from plugins/utils/nvim-ufo.nix
rename to plugins/by-name/nvim-ufo/default.nix
diff --git a/plugins/utils/obsidian/default.nix b/plugins/by-name/obsidian/default.nix
similarity index 100%
rename from plugins/utils/obsidian/default.nix
rename to plugins/by-name/obsidian/default.nix
diff --git a/plugins/utils/obsidian/options.nix b/plugins/by-name/obsidian/options.nix
similarity index 100%
rename from plugins/utils/obsidian/options.nix
rename to plugins/by-name/obsidian/options.nix
diff --git a/plugins/utils/oil.nix b/plugins/by-name/oil/default.nix
similarity index 100%
rename from plugins/utils/oil.nix
rename to plugins/by-name/oil/default.nix
diff --git a/plugins/utils/ollama.nix b/plugins/by-name/ollama/default.nix
similarity index 100%
rename from plugins/utils/ollama.nix
rename to plugins/by-name/ollama/default.nix
diff --git a/plugins/utils/persistence.nix b/plugins/by-name/persistence/default.nix
similarity index 100%
rename from plugins/utils/persistence.nix
rename to plugins/by-name/persistence/default.nix
diff --git a/plugins/utils/presence-nvim.nix b/plugins/by-name/presence-nvim/default.nix
similarity index 100%
rename from plugins/utils/presence-nvim.nix
rename to plugins/by-name/presence-nvim/default.nix
diff --git a/plugins/utils/project-nvim.nix b/plugins/by-name/project-nvim/default.nix
similarity index 100%
rename from plugins/utils/project-nvim.nix
rename to plugins/by-name/project-nvim/default.nix
diff --git a/plugins/utils/quickmath.nix b/plugins/by-name/quickmath/default.nix
similarity index 100%
rename from plugins/utils/quickmath.nix
rename to plugins/by-name/quickmath/default.nix
diff --git a/plugins/utils/refactoring.nix b/plugins/by-name/refactoring/default.nix
similarity index 100%
rename from plugins/utils/refactoring.nix
rename to plugins/by-name/refactoring/default.nix
diff --git a/plugins/utils/repeat.nix b/plugins/by-name/repeat/default.nix
similarity index 100%
rename from plugins/utils/repeat.nix
rename to plugins/by-name/repeat/default.nix
diff --git a/plugins/utils/rest.nix b/plugins/by-name/rest/default.nix
similarity index 100%
rename from plugins/utils/rest.nix
rename to plugins/by-name/rest/default.nix
diff --git a/plugins/utils/sandwich.nix b/plugins/by-name/sandwich/default.nix
similarity index 100%
rename from plugins/utils/sandwich.nix
rename to plugins/by-name/sandwich/default.nix
diff --git a/plugins/utils/scope.nix b/plugins/by-name/scope/default.nix
similarity index 100%
rename from plugins/utils/scope.nix
rename to plugins/by-name/scope/default.nix
diff --git a/plugins/utils/sleuth.nix b/plugins/by-name/sleuth/default.nix
similarity index 100%
rename from plugins/utils/sleuth.nix
rename to plugins/by-name/sleuth/default.nix
diff --git a/plugins/utils/smart-splits.nix b/plugins/by-name/smart-splits/default.nix
similarity index 100%
rename from plugins/utils/smart-splits.nix
rename to plugins/by-name/smart-splits/default.nix
diff --git a/plugins/utils/spectre.nix b/plugins/by-name/spectre/default.nix
similarity index 100%
rename from plugins/utils/spectre.nix
rename to plugins/by-name/spectre/default.nix
diff --git a/plugins/utils/spider.nix b/plugins/by-name/spider/default.nix
similarity index 100%
rename from plugins/utils/spider.nix
rename to plugins/by-name/spider/default.nix
diff --git a/plugins/utils/startify/default.nix b/plugins/by-name/startify/default.nix
similarity index 100%
rename from plugins/utils/startify/default.nix
rename to plugins/by-name/startify/default.nix
diff --git a/plugins/utils/startify/options.nix b/plugins/by-name/startify/options.nix
similarity index 100%
rename from plugins/utils/startify/options.nix
rename to plugins/by-name/startify/options.nix
diff --git a/plugins/utils/startup.nix b/plugins/by-name/startup/default.nix
similarity index 100%
rename from plugins/utils/startup.nix
rename to plugins/by-name/startup/default.nix
diff --git a/plugins/utils/surround.nix b/plugins/by-name/surround/default.nix
similarity index 100%
rename from plugins/utils/surround.nix
rename to plugins/by-name/surround/default.nix
diff --git a/plugins/utils/tmux-navigator.nix b/plugins/by-name/tmux-navigator/default.nix
similarity index 100%
rename from plugins/utils/tmux-navigator.nix
rename to plugins/by-name/tmux-navigator/default.nix
diff --git a/plugins/utils/todo-comments.nix b/plugins/by-name/todo-comments/default.nix
similarity index 100%
rename from plugins/utils/todo-comments.nix
rename to plugins/by-name/todo-comments/default.nix
diff --git a/plugins/utils/toggleterm.nix b/plugins/by-name/toggleterm/default.nix
similarity index 100%
rename from plugins/utils/toggleterm.nix
rename to plugins/by-name/toggleterm/default.nix
diff --git a/plugins/utils/trim.nix b/plugins/by-name/trim/default.nix
similarity index 100%
rename from plugins/utils/trim.nix
rename to plugins/by-name/trim/default.nix
diff --git a/plugins/utils/undotree.nix b/plugins/by-name/undotree/default.nix
similarity index 100%
rename from plugins/utils/undotree.nix
rename to plugins/by-name/undotree/default.nix
diff --git a/plugins/utils/vim-bbye.nix b/plugins/by-name/vim-bbye/default.nix
similarity index 100%
rename from plugins/utils/vim-bbye.nix
rename to plugins/by-name/vim-bbye/default.nix
diff --git a/plugins/utils/vim-css-color.nix b/plugins/by-name/vim-css-color/default.nix
similarity index 100%
rename from plugins/utils/vim-css-color.nix
rename to plugins/by-name/vim-css-color/default.nix
diff --git a/plugins/utils/vim-matchup.nix b/plugins/by-name/vim-matchup/default.nix
similarity index 100%
rename from plugins/utils/vim-matchup.nix
rename to plugins/by-name/vim-matchup/default.nix
diff --git a/plugins/utils/wakatime.nix b/plugins/by-name/wakatime/default.nix
similarity index 100%
rename from plugins/utils/wakatime.nix
rename to plugins/by-name/wakatime/default.nix
diff --git a/plugins/utils/web-devicons.nix b/plugins/by-name/web-devicons/default.nix
similarity index 100%
rename from plugins/utils/web-devicons.nix
rename to plugins/by-name/web-devicons/default.nix
diff --git a/plugins/utils/which-key.nix b/plugins/by-name/which-key/default.nix
similarity index 100%
rename from plugins/utils/which-key.nix
rename to plugins/by-name/which-key/default.nix
diff --git a/plugins/utils/wilder.nix b/plugins/by-name/wilder/default.nix
similarity index 100%
rename from plugins/utils/wilder.nix
rename to plugins/by-name/wilder/default.nix
diff --git a/plugins/utils/yanky.nix b/plugins/by-name/yanky/default.nix
similarity index 100%
rename from plugins/utils/yanky.nix
rename to plugins/by-name/yanky/default.nix
diff --git a/plugins/utils/zellij.nix b/plugins/by-name/zellij/default.nix
similarity index 100%
rename from plugins/utils/zellij.nix
rename to plugins/by-name/zellij/default.nix
diff --git a/plugins/utils/zk.nix b/plugins/by-name/zk/default.nix
similarity index 100%
rename from plugins/utils/zk.nix
rename to plugins/by-name/zk/default.nix
diff --git a/plugins/default.nix b/plugins/default.nix
index e30a36d4..ee998355 100644
--- a/plugins/default.nix
+++ b/plugins/default.nix
@@ -148,106 +148,6 @@
     ./ui/virt-column.nix
     ./ui/zen-mode.nix
 
-    ./utils/alpha.nix
-    ./utils/arrow.nix
-    ./utils/auto-save.nix
-    ./utils/auto-session.nix
-    ./utils/autoclose.nix
-    ./utils/autosource.nix
-    ./utils/bacon.nix
-    ./utils/baleia.nix
-    ./utils/better-escape.nix
-    ./utils/bufdelete.nix
-    ./utils/ccc.nix
-    ./utils/clipboard-image.nix
-    ./utils/cloak.nix
-    ./utils/codesnap.nix
-    ./utils/comment.nix
-    ./utils/comment-box.nix
-    ./utils/commentary.nix
-    ./utils/competitest.nix
-    ./utils/conjure.nix
-    ./utils/coverage.nix
-    ./utils/cursorline.nix
-    ./utils/dashboard.nix
-    ./utils/direnv.nix
-    ./utils/dressing.nix
-    ./utils/easyescape.nix
-    ./utils/emmet.nix
-    ./utils/endwise.nix
-    ./utils/firenvim.nix
-    ./utils/flash.nix
-    ./utils/floaterm.nix
-    ./utils/fzf-lua.nix
-    ./utils/goyo.nix
-    ./utils/guess-indent.nix
-    ./utils/hardtime.nix
-    ./utils/harpoon.nix
-    ./utils/hop.nix
-    ./utils/hydra
-    ./utils/illuminate.nix
-    ./utils/improved-search.nix
-    ./utils/indent-blankline.nix
-    ./utils/indent-o-matic.nix
-    ./utils/instant.nix
-    ./utils/intellitab.nix
-    ./utils/lastplace.nix
-    ./utils/leap.nix
-    ./utils/magma-nvim.nix
-    ./utils/mark-radar.nix
-    ./utils/marks.nix
-    ./utils/mini.nix
-    ./utils/mkdnflow.nix
-    ./utils/molten.nix
-    ./utils/multicursors.nix
-    ./utils/navbuddy.nix
-    ./utils/neoclip.nix
-    ./utils/neocord.nix
-    ./utils/neogen.nix
-    ./utils/neorg.nix
-    ./utils/netman.nix
-    ./utils/nix-develop.nix
-    ./utils/notify.nix
-    ./utils/nvim-autopairs.nix
-    ./utils/nvim-bqf.nix
-    ./utils/nvim-colorizer.nix
-    ./utils/nvim-osc52.nix
-    ./utils/nvim-ufo.nix
-    ./utils/obsidian
-    ./utils/oil.nix
-    ./utils/ollama.nix
-    ./utils/persistence.nix
-    ./utils/presence-nvim.nix
-    ./utils/project-nvim.nix
-    ./utils/quickmath.nix
-    ./utils/refactoring.nix
-    ./utils/repeat.nix
-    ./utils/rest.nix
-    ./utils/sandwich.nix
-    ./utils/scope.nix
-    ./utils/sleuth.nix
-    ./utils/smart-splits.nix
-    ./utils/spectre.nix
-    ./utils/spider.nix
-    ./utils/startify
-    ./utils/startup.nix
-    ./utils/surround.nix
-    ./utils/tmux-navigator.nix
-    ./utils/todo-comments.nix
-    ./utils/toggleterm.nix
-    ./utils/trim.nix
-    ./utils/undotree.nix
-    ./utils/vim-bbye.nix
-    ./utils/vim-css-color.nix
-    ./utils/vim-matchup.nix
-    ./utils/wakatime.nix
-    ./utils/web-devicons.nix
-    ./utils/which-key.nix
-    ./utils/wilder.nix
-    ./utils/yanky.nix
-    ./utils/zellij.nix
-    ./utils/zk.nix
-
     ./deprecation.nix
   ];
 }
diff --git a/tests/test-sources/plugins/utils/alpha.nix b/tests/test-sources/plugins/by-name/alpha/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/alpha.nix
rename to tests/test-sources/plugins/by-name/alpha/default.nix
diff --git a/tests/test-sources/plugins/utils/arrow.nix b/tests/test-sources/plugins/by-name/arrow/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/arrow.nix
rename to tests/test-sources/plugins/by-name/arrow/default.nix
diff --git a/tests/test-sources/plugins/utils/auto-save.nix b/tests/test-sources/plugins/by-name/auto-save/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/auto-save.nix
rename to tests/test-sources/plugins/by-name/auto-save/default.nix
diff --git a/tests/test-sources/plugins/utils/auto-session.nix b/tests/test-sources/plugins/by-name/auto-session/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/auto-session.nix
rename to tests/test-sources/plugins/by-name/auto-session/default.nix
diff --git a/tests/test-sources/plugins/utils/autoclose-nvim.nix b/tests/test-sources/plugins/by-name/autoclose-nvim/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/autoclose-nvim.nix
rename to tests/test-sources/plugins/by-name/autoclose-nvim/default.nix
diff --git a/tests/test-sources/plugins/utils/autosource.nix b/tests/test-sources/plugins/by-name/autosource/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/autosource.nix
rename to tests/test-sources/plugins/by-name/autosource/default.nix
diff --git a/tests/test-sources/plugins/utils/bacon.nix b/tests/test-sources/plugins/by-name/bacon/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/bacon.nix
rename to tests/test-sources/plugins/by-name/bacon/default.nix
diff --git a/tests/test-sources/plugins/utils/baleia.nix b/tests/test-sources/plugins/by-name/baleia/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/baleia.nix
rename to tests/test-sources/plugins/by-name/baleia/default.nix
diff --git a/tests/test-sources/plugins/utils/better-escape.nix b/tests/test-sources/plugins/by-name/better-escape/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/better-escape.nix
rename to tests/test-sources/plugins/by-name/better-escape/default.nix
diff --git a/tests/test-sources/plugins/utils/bufdelete.nix b/tests/test-sources/plugins/by-name/bufdelete/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/bufdelete.nix
rename to tests/test-sources/plugins/by-name/bufdelete/default.nix
diff --git a/tests/test-sources/plugins/utils/ccc.nix b/tests/test-sources/plugins/by-name/ccc/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/ccc.nix
rename to tests/test-sources/plugins/by-name/ccc/default.nix
diff --git a/tests/test-sources/plugins/utils/clipboard-image.nix b/tests/test-sources/plugins/by-name/clipboard-image/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/clipboard-image.nix
rename to tests/test-sources/plugins/by-name/clipboard-image/default.nix
diff --git a/tests/test-sources/plugins/utils/cloak.nix b/tests/test-sources/plugins/by-name/cloak/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/cloak.nix
rename to tests/test-sources/plugins/by-name/cloak/default.nix
diff --git a/tests/test-sources/plugins/utils/codesnap.nix b/tests/test-sources/plugins/by-name/codesnap/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/codesnap.nix
rename to tests/test-sources/plugins/by-name/codesnap/default.nix
diff --git a/tests/test-sources/plugins/utils/comment-box.nix b/tests/test-sources/plugins/by-name/comment-box/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/comment-box.nix
rename to tests/test-sources/plugins/by-name/comment-box/default.nix
diff --git a/tests/test-sources/plugins/utils/comment.nix b/tests/test-sources/plugins/by-name/comment/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/comment.nix
rename to tests/test-sources/plugins/by-name/comment/default.nix
diff --git a/tests/test-sources/plugins/utils/competitest.nix b/tests/test-sources/plugins/by-name/competitest/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/competitest.nix
rename to tests/test-sources/plugins/by-name/competitest/default.nix
diff --git a/tests/test-sources/plugins/utils/conjure.nix b/tests/test-sources/plugins/by-name/conjure/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/conjure.nix
rename to tests/test-sources/plugins/by-name/conjure/default.nix
diff --git a/tests/test-sources/plugins/utils/coverage.nix b/tests/test-sources/plugins/by-name/coverage/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/coverage.nix
rename to tests/test-sources/plugins/by-name/coverage/default.nix
diff --git a/tests/test-sources/plugins/utils/cursorline.nix b/tests/test-sources/plugins/by-name/cursorline/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/cursorline.nix
rename to tests/test-sources/plugins/by-name/cursorline/default.nix
diff --git a/tests/test-sources/plugins/utils/dashboard.nix b/tests/test-sources/plugins/by-name/dashboard/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/dashboard.nix
rename to tests/test-sources/plugins/by-name/dashboard/default.nix
diff --git a/tests/test-sources/plugins/utils/direnv.nix b/tests/test-sources/plugins/by-name/direnv/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/direnv.nix
rename to tests/test-sources/plugins/by-name/direnv/default.nix
diff --git a/tests/test-sources/plugins/utils/dressing.nix b/tests/test-sources/plugins/by-name/dressing/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/dressing.nix
rename to tests/test-sources/plugins/by-name/dressing/default.nix
diff --git a/tests/test-sources/plugins/utils/emmet.nix b/tests/test-sources/plugins/by-name/emmet/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/emmet.nix
rename to tests/test-sources/plugins/by-name/emmet/default.nix
diff --git a/tests/test-sources/plugins/utils/endwise.nix b/tests/test-sources/plugins/by-name/endwise/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/endwise.nix
rename to tests/test-sources/plugins/by-name/endwise/default.nix
diff --git a/tests/test-sources/plugins/utils/firenvim.nix b/tests/test-sources/plugins/by-name/firenvim/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/firenvim.nix
rename to tests/test-sources/plugins/by-name/firenvim/default.nix
diff --git a/tests/test-sources/plugins/utils/flash.nix b/tests/test-sources/plugins/by-name/flash/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/flash.nix
rename to tests/test-sources/plugins/by-name/flash/default.nix
diff --git a/tests/test-sources/plugins/utils/fzf-lua.nix b/tests/test-sources/plugins/by-name/fzf-lua/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/fzf-lua.nix
rename to tests/test-sources/plugins/by-name/fzf-lua/default.nix
diff --git a/tests/test-sources/plugins/utils/goyo.nix b/tests/test-sources/plugins/by-name/goyo/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/goyo.nix
rename to tests/test-sources/plugins/by-name/goyo/default.nix
diff --git a/tests/test-sources/plugins/utils/guess-indent.nix b/tests/test-sources/plugins/by-name/guess-indent/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/guess-indent.nix
rename to tests/test-sources/plugins/by-name/guess-indent/default.nix
diff --git a/tests/test-sources/plugins/utils/hardtime.nix b/tests/test-sources/plugins/by-name/hardtime/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/hardtime.nix
rename to tests/test-sources/plugins/by-name/hardtime/default.nix
diff --git a/tests/test-sources/plugins/utils/harpoon.nix b/tests/test-sources/plugins/by-name/harpoon/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/harpoon.nix
rename to tests/test-sources/plugins/by-name/harpoon/default.nix
diff --git a/tests/test-sources/plugins/utils/hop.nix b/tests/test-sources/plugins/by-name/hop/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/hop.nix
rename to tests/test-sources/plugins/by-name/hop/default.nix
diff --git a/tests/test-sources/plugins/utils/hydra.nix b/tests/test-sources/plugins/by-name/hydra/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/hydra.nix
rename to tests/test-sources/plugins/by-name/hydra/default.nix
diff --git a/tests/test-sources/plugins/utils/illuminate.nix b/tests/test-sources/plugins/by-name/illuminate/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/illuminate.nix
rename to tests/test-sources/plugins/by-name/illuminate/default.nix
diff --git a/tests/test-sources/plugins/utils/improved-search.nix b/tests/test-sources/plugins/by-name/improved-search/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/improved-search.nix
rename to tests/test-sources/plugins/by-name/improved-search/default.nix
diff --git a/tests/test-sources/plugins/utils/indent-blankline.nix b/tests/test-sources/plugins/by-name/indent-blankline/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/indent-blankline.nix
rename to tests/test-sources/plugins/by-name/indent-blankline/default.nix
diff --git a/tests/test-sources/plugins/utils/indent-o-matic.nix b/tests/test-sources/plugins/by-name/indent-o-matic/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/indent-o-matic.nix
rename to tests/test-sources/plugins/by-name/indent-o-matic/default.nix
diff --git a/tests/test-sources/plugins/utils/instant.nix b/tests/test-sources/plugins/by-name/instant/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/instant.nix
rename to tests/test-sources/plugins/by-name/instant/default.nix
diff --git a/tests/test-sources/plugins/utils/lastplace.nix b/tests/test-sources/plugins/by-name/lastplace/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/lastplace.nix
rename to tests/test-sources/plugins/by-name/lastplace/default.nix
diff --git a/tests/test-sources/plugins/utils/leap.nix b/tests/test-sources/plugins/by-name/leap/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/leap.nix
rename to tests/test-sources/plugins/by-name/leap/default.nix
diff --git a/tests/test-sources/plugins/utils/magma-nvim.nix b/tests/test-sources/plugins/by-name/magma-nvim/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/magma-nvim.nix
rename to tests/test-sources/plugins/by-name/magma-nvim/default.nix
diff --git a/tests/test-sources/plugins/utils/mark-radar.nix b/tests/test-sources/plugins/by-name/mark-radar/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/mark-radar.nix
rename to tests/test-sources/plugins/by-name/mark-radar/default.nix
diff --git a/tests/test-sources/plugins/utils/marks.nix b/tests/test-sources/plugins/by-name/marks/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/marks.nix
rename to tests/test-sources/plugins/by-name/marks/default.nix
diff --git a/tests/test-sources/plugins/utils/mini.nix b/tests/test-sources/plugins/by-name/mini/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/mini.nix
rename to tests/test-sources/plugins/by-name/mini/default.nix
diff --git a/tests/test-sources/plugins/utils/mkdnflow.nix b/tests/test-sources/plugins/by-name/mkdnflow/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/mkdnflow.nix
rename to tests/test-sources/plugins/by-name/mkdnflow/default.nix
diff --git a/tests/test-sources/plugins/utils/molten.nix b/tests/test-sources/plugins/by-name/molten/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/molten.nix
rename to tests/test-sources/plugins/by-name/molten/default.nix
diff --git a/tests/test-sources/plugins/utils/multicursors.nix b/tests/test-sources/plugins/by-name/multicursors/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/multicursors.nix
rename to tests/test-sources/plugins/by-name/multicursors/default.nix
diff --git a/tests/test-sources/plugins/utils/navbuddy.nix b/tests/test-sources/plugins/by-name/navbuddy/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/navbuddy.nix
rename to tests/test-sources/plugins/by-name/navbuddy/default.nix
diff --git a/tests/test-sources/plugins/utils/neoclip.nix b/tests/test-sources/plugins/by-name/neoclip/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/neoclip.nix
rename to tests/test-sources/plugins/by-name/neoclip/default.nix
diff --git a/tests/test-sources/plugins/utils/neocord.nix b/tests/test-sources/plugins/by-name/neocord/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/neocord.nix
rename to tests/test-sources/plugins/by-name/neocord/default.nix
diff --git a/tests/test-sources/plugins/utils/neogen.nix b/tests/test-sources/plugins/by-name/neogen/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/neogen.nix
rename to tests/test-sources/plugins/by-name/neogen/default.nix
diff --git a/tests/test-sources/plugins/utils/neorg.nix b/tests/test-sources/plugins/by-name/neorg/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/neorg.nix
rename to tests/test-sources/plugins/by-name/neorg/default.nix
diff --git a/tests/test-sources/plugins/utils/netman.nix b/tests/test-sources/plugins/by-name/netman/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/netman.nix
rename to tests/test-sources/plugins/by-name/netman/default.nix
diff --git a/tests/test-sources/plugins/utils/nix-develop.nix b/tests/test-sources/plugins/by-name/nix-develop/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/nix-develop.nix
rename to tests/test-sources/plugins/by-name/nix-develop/default.nix
diff --git a/tests/test-sources/plugins/utils/notify.nix b/tests/test-sources/plugins/by-name/notify/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/notify.nix
rename to tests/test-sources/plugins/by-name/notify/default.nix
diff --git a/tests/test-sources/plugins/utils/nvim-autopairs.nix b/tests/test-sources/plugins/by-name/nvim-autopairs/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/nvim-autopairs.nix
rename to tests/test-sources/plugins/by-name/nvim-autopairs/default.nix
diff --git a/tests/test-sources/plugins/utils/nvim-osc52.nix b/tests/test-sources/plugins/by-name/nvim-osc52/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/nvim-osc52.nix
rename to tests/test-sources/plugins/by-name/nvim-osc52/default.nix
diff --git a/tests/test-sources/plugins/utils/nvim-ufo.nix b/tests/test-sources/plugins/by-name/nvim-ufo/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/nvim-ufo.nix
rename to tests/test-sources/plugins/by-name/nvim-ufo/default.nix
diff --git a/tests/test-sources/plugins/utils/obsidian.nix b/tests/test-sources/plugins/by-name/obsidian/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/obsidian.nix
rename to tests/test-sources/plugins/by-name/obsidian/default.nix
diff --git a/tests/test-sources/plugins/utils/oil.nix b/tests/test-sources/plugins/by-name/oil/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/oil.nix
rename to tests/test-sources/plugins/by-name/oil/default.nix
diff --git a/tests/test-sources/plugins/utils/ollama.nix b/tests/test-sources/plugins/by-name/ollama/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/ollama.nix
rename to tests/test-sources/plugins/by-name/ollama/default.nix
diff --git a/tests/test-sources/plugins/utils/persistence.nix b/tests/test-sources/plugins/by-name/persistence/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/persistence.nix
rename to tests/test-sources/plugins/by-name/persistence/default.nix
diff --git a/tests/test-sources/plugins/utils/presence-nvim.nix b/tests/test-sources/plugins/by-name/presence-nvim/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/presence-nvim.nix
rename to tests/test-sources/plugins/by-name/presence-nvim/default.nix
diff --git a/tests/test-sources/plugins/utils/project-nvim.nix b/tests/test-sources/plugins/by-name/project-nvim/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/project-nvim.nix
rename to tests/test-sources/plugins/by-name/project-nvim/default.nix
diff --git a/tests/test-sources/plugins/utils/quickmath.nix b/tests/test-sources/plugins/by-name/quickmath/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/quickmath.nix
rename to tests/test-sources/plugins/by-name/quickmath/default.nix
diff --git a/tests/test-sources/plugins/utils/refactoring.nix b/tests/test-sources/plugins/by-name/refactoring/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/refactoring.nix
rename to tests/test-sources/plugins/by-name/refactoring/default.nix
diff --git a/tests/test-sources/plugins/utils/repeat.nix b/tests/test-sources/plugins/by-name/repeat/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/repeat.nix
rename to tests/test-sources/plugins/by-name/repeat/default.nix
diff --git a/tests/test-sources/plugins/utils/rest.nix b/tests/test-sources/plugins/by-name/rest/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/rest.nix
rename to tests/test-sources/plugins/by-name/rest/default.nix
diff --git a/tests/test-sources/plugins/utils/sandwich.nix b/tests/test-sources/plugins/by-name/sandwich/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/sandwich.nix
rename to tests/test-sources/plugins/by-name/sandwich/default.nix
diff --git a/tests/test-sources/plugins/utils/scope.nix b/tests/test-sources/plugins/by-name/scope/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/scope.nix
rename to tests/test-sources/plugins/by-name/scope/default.nix
diff --git a/tests/test-sources/plugins/utils/sleuth.nix b/tests/test-sources/plugins/by-name/sleuth/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/sleuth.nix
rename to tests/test-sources/plugins/by-name/sleuth/default.nix
diff --git a/tests/test-sources/plugins/utils/smart-splits.nix b/tests/test-sources/plugins/by-name/smart-splits/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/smart-splits.nix
rename to tests/test-sources/plugins/by-name/smart-splits/default.nix
diff --git a/tests/test-sources/plugins/utils/spectre.nix b/tests/test-sources/plugins/by-name/spectre/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/spectre.nix
rename to tests/test-sources/plugins/by-name/spectre/default.nix
diff --git a/tests/test-sources/plugins/utils/spider.nix b/tests/test-sources/plugins/by-name/spider/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/spider.nix
rename to tests/test-sources/plugins/by-name/spider/default.nix
diff --git a/tests/test-sources/plugins/utils/startify.nix b/tests/test-sources/plugins/by-name/startify/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/startify.nix
rename to tests/test-sources/plugins/by-name/startify/default.nix
diff --git a/tests/test-sources/plugins/utils/startup.nix b/tests/test-sources/plugins/by-name/startup/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/startup.nix
rename to tests/test-sources/plugins/by-name/startup/default.nix
diff --git a/tests/test-sources/plugins/utils/tmux-navigator.nix b/tests/test-sources/plugins/by-name/tmux-navigator/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/tmux-navigator.nix
rename to tests/test-sources/plugins/by-name/tmux-navigator/default.nix
diff --git a/tests/test-sources/plugins/utils/todo-comments.nix b/tests/test-sources/plugins/by-name/todo-comments/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/todo-comments.nix
rename to tests/test-sources/plugins/by-name/todo-comments/default.nix
diff --git a/tests/test-sources/plugins/utils/toggleterm.nix b/tests/test-sources/plugins/by-name/toggleterm/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/toggleterm.nix
rename to tests/test-sources/plugins/by-name/toggleterm/default.nix
diff --git a/tests/test-sources/plugins/utils/trim.nix b/tests/test-sources/plugins/by-name/trim/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/trim.nix
rename to tests/test-sources/plugins/by-name/trim/default.nix
diff --git a/tests/test-sources/plugins/utils/undotree.nix b/tests/test-sources/plugins/by-name/undotree/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/undotree.nix
rename to tests/test-sources/plugins/by-name/undotree/default.nix
diff --git a/tests/test-sources/plugins/utils/vim-bbye.nix b/tests/test-sources/plugins/by-name/vim-bbye/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/vim-bbye.nix
rename to tests/test-sources/plugins/by-name/vim-bbye/default.nix
diff --git a/tests/test-sources/plugins/utils/vim-css-color.nix b/tests/test-sources/plugins/by-name/vim-css-color/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/vim-css-color.nix
rename to tests/test-sources/plugins/by-name/vim-css-color/default.nix
diff --git a/tests/test-sources/plugins/utils/wakatime.nix b/tests/test-sources/plugins/by-name/wakatime/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/wakatime.nix
rename to tests/test-sources/plugins/by-name/wakatime/default.nix
diff --git a/tests/test-sources/plugins/utils/web-devicons.nix b/tests/test-sources/plugins/by-name/web-devicons/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/web-devicons.nix
rename to tests/test-sources/plugins/by-name/web-devicons/default.nix
diff --git a/tests/test-sources/plugins/utils/which-key.nix b/tests/test-sources/plugins/by-name/which-key/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/which-key.nix
rename to tests/test-sources/plugins/by-name/which-key/default.nix
diff --git a/tests/test-sources/plugins/utils/wilder.nix b/tests/test-sources/plugins/by-name/wilder/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/wilder.nix
rename to tests/test-sources/plugins/by-name/wilder/default.nix
diff --git a/tests/test-sources/plugins/utils/yanky.nix b/tests/test-sources/plugins/by-name/yanky/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/yanky.nix
rename to tests/test-sources/plugins/by-name/yanky/default.nix
diff --git a/tests/test-sources/plugins/utils/zellij.nix b/tests/test-sources/plugins/by-name/zellij/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/zellij.nix
rename to tests/test-sources/plugins/by-name/zellij/default.nix
diff --git a/tests/test-sources/plugins/utils/zk.nix b/tests/test-sources/plugins/by-name/zk/default.nix
similarity index 100%
rename from tests/test-sources/plugins/utils/zk.nix
rename to tests/test-sources/plugins/by-name/zk/default.nix