diff --git a/plugins/languages/treesitter/hmts.nix b/plugins/by-name/hmts/default.nix
similarity index 100%
rename from plugins/languages/treesitter/hmts.nix
rename to plugins/by-name/hmts/default.nix
diff --git a/plugins/languages/treesitter/rainbow-delimiters.nix b/plugins/by-name/rainbow-delimiters/default.nix
similarity index 100%
rename from plugins/languages/treesitter/rainbow-delimiters.nix
rename to plugins/by-name/rainbow-delimiters/default.nix
diff --git a/plugins/languages/treesitter/treesitter-context.nix b/plugins/by-name/treesitter-context/default.nix
similarity index 100%
rename from plugins/languages/treesitter/treesitter-context.nix
rename to plugins/by-name/treesitter-context/default.nix
diff --git a/plugins/languages/treesitter/treesitter-refactor.nix b/plugins/by-name/treesitter-refactor/default.nix
similarity index 100%
rename from plugins/languages/treesitter/treesitter-refactor.nix
rename to plugins/by-name/treesitter-refactor/default.nix
diff --git a/plugins/languages/treesitter/treesitter-textobjects.nix b/plugins/by-name/treesitter-textobjects/default.nix
similarity index 100%
rename from plugins/languages/treesitter/treesitter-textobjects.nix
rename to plugins/by-name/treesitter-textobjects/default.nix
diff --git a/plugins/languages/treesitter/treesitter.nix b/plugins/by-name/treesitter/default.nix
similarity index 100%
rename from plugins/languages/treesitter/treesitter.nix
rename to plugins/by-name/treesitter/default.nix
diff --git a/plugins/languages/treesitter/injections.scm b/plugins/by-name/treesitter/injections.scm
similarity index 100%
rename from plugins/languages/treesitter/injections.scm
rename to plugins/by-name/treesitter/injections.scm
diff --git a/plugins/languages/treesitter/ts-autotag.nix b/plugins/by-name/ts-autotag/default.nix
similarity index 100%
rename from plugins/languages/treesitter/ts-autotag.nix
rename to plugins/by-name/ts-autotag/default.nix
diff --git a/plugins/languages/treesitter/ts-context-commentstring.nix b/plugins/by-name/ts-context-commentstring/default.nix
similarity index 100%
rename from plugins/languages/treesitter/ts-context-commentstring.nix
rename to plugins/by-name/ts-context-commentstring/default.nix
diff --git a/plugins/default.nix b/plugins/default.nix
index c5d06a93..43ad28c2 100644
--- a/plugins/default.nix
+++ b/plugins/default.nix
@@ -85,14 +85,6 @@
     ./languages/sniprun.nix
     ./languages/tagbar.nix
     ./languages/texpresso.nix
-    ./languages/treesitter/hmts.nix
-    ./languages/treesitter/rainbow-delimiters.nix
-    ./languages/treesitter/treesitter-context.nix
-    ./languages/treesitter/treesitter-refactor.nix
-    ./languages/treesitter/treesitter-textobjects.nix
-    ./languages/treesitter/treesitter.nix
-    ./languages/treesitter/ts-autotag.nix
-    ./languages/treesitter/ts-context-commentstring.nix
     ./languages/typescript-tools.nix
     ./languages/typst/typst-vim.nix
     ./languages/vim-slime.nix
diff --git a/tests/test-sources/plugins/languages/treesitter/hmts.nix b/tests/test-sources/plugins/by-name/hmts/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/treesitter/hmts.nix
rename to tests/test-sources/plugins/by-name/hmts/default.nix
diff --git a/tests/test-sources/plugins/languages/treesitter/rainbow-delimiters.nix b/tests/test-sources/plugins/by-name/rainbow-delimiters/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/treesitter/rainbow-delimiters.nix
rename to tests/test-sources/plugins/by-name/rainbow-delimiters/default.nix
diff --git a/tests/test-sources/plugins/languages/treesitter/treesitter-context.nix b/tests/test-sources/plugins/by-name/treesitter-context/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/treesitter/treesitter-context.nix
rename to tests/test-sources/plugins/by-name/treesitter-context/default.nix
diff --git a/tests/test-sources/plugins/languages/treesitter/treesitter-textobjects.nix b/tests/test-sources/plugins/by-name/treesitter-textobjects/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/treesitter/treesitter-textobjects.nix
rename to tests/test-sources/plugins/by-name/treesitter-textobjects/default.nix
diff --git a/tests/test-sources/plugins/languages/treesitter/combine-plugins.nix b/tests/test-sources/plugins/by-name/treesitter/combine-plugins.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/treesitter/combine-plugins.nix
rename to tests/test-sources/plugins/by-name/treesitter/combine-plugins.nix
diff --git a/tests/test-sources/plugins/languages/treesitter/treesitter.nix b/tests/test-sources/plugins/by-name/treesitter/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/treesitter/treesitter.nix
rename to tests/test-sources/plugins/by-name/treesitter/default.nix
diff --git a/tests/test-sources/plugins/languages/treesitter/ts-autotag.nix b/tests/test-sources/plugins/by-name/ts-autotag/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/treesitter/ts-autotag.nix
rename to tests/test-sources/plugins/by-name/ts-autotag/default.nix
diff --git a/tests/test-sources/plugins/languages/treesitter/ts-context-commentstring.nix b/tests/test-sources/plugins/by-name/ts-context-commentstring/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/treesitter/ts-context-commentstring.nix
rename to tests/test-sources/plugins/by-name/ts-context-commentstring/default.nix