diff --git a/plugins/languages/clangd-extensions.nix b/plugins/by-name/clangd-extensions/default.nix
similarity index 100%
rename from plugins/languages/clangd-extensions.nix
rename to plugins/by-name/clangd-extensions/default.nix
diff --git a/plugins/languages/cmake-tools.nix b/plugins/by-name/cmake-tools/default.nix
similarity index 100%
rename from plugins/languages/cmake-tools.nix
rename to plugins/by-name/cmake-tools/default.nix
diff --git a/plugins/languages/debugprint.nix b/plugins/by-name/debugprint/default.nix
similarity index 100%
rename from plugins/languages/debugprint.nix
rename to plugins/by-name/debugprint/default.nix
diff --git a/plugins/languages/markdown/glow.nix b/plugins/by-name/glow/default.nix
similarity index 100%
rename from plugins/languages/markdown/glow.nix
rename to plugins/by-name/glow/default.nix
diff --git a/plugins/languages/godot.nix b/plugins/by-name/godot/default.nix
similarity index 100%
rename from plugins/languages/godot.nix
rename to plugins/by-name/godot/default.nix
diff --git a/plugins/languages/haskell-scope-highlighting.nix b/plugins/by-name/haskell-scope-highlighting/default.nix
similarity index 100%
rename from plugins/languages/haskell-scope-highlighting.nix
rename to plugins/by-name/haskell-scope-highlighting/default.nix
diff --git a/plugins/languages/helm.nix b/plugins/by-name/helm/default.nix
similarity index 100%
rename from plugins/languages/helm.nix
rename to plugins/by-name/helm/default.nix
diff --git a/plugins/languages/julia/julia-cell.nix b/plugins/by-name/julia-cell/default.nix
similarity index 100%
rename from plugins/languages/julia/julia-cell.nix
rename to plugins/by-name/julia-cell/default.nix
diff --git a/plugins/languages/python/jupytext.nix b/plugins/by-name/jupytext/default.nix
similarity index 100%
rename from plugins/languages/python/jupytext.nix
rename to plugins/by-name/jupytext/default.nix
diff --git a/plugins/languages/lean.nix b/plugins/by-name/lean/default.nix
similarity index 100%
rename from plugins/languages/lean.nix
rename to plugins/by-name/lean/default.nix
diff --git a/plugins/languages/ledger.nix b/plugins/by-name/ledger/default.nix
similarity index 100%
rename from plugins/languages/ledger.nix
rename to plugins/by-name/ledger/default.nix
diff --git a/plugins/languages/lint.nix b/plugins/by-name/lint/default.nix
similarity index 100%
rename from plugins/languages/lint.nix
rename to plugins/by-name/lint/default.nix
diff --git a/plugins/languages/ltex-extra.nix b/plugins/by-name/ltex-extra/default.nix
similarity index 100%
rename from plugins/languages/ltex-extra.nix
rename to plugins/by-name/ltex-extra/default.nix
diff --git a/plugins/languages/markdown/markdown-preview.nix b/plugins/by-name/markdown-preview/default.nix
similarity index 100%
rename from plugins/languages/markdown/markdown-preview.nix
rename to plugins/by-name/markdown-preview/default.nix
diff --git a/plugins/languages/markdown/markview.nix b/plugins/by-name/markview/default.nix
similarity index 100%
rename from plugins/languages/markdown/markview.nix
rename to plugins/by-name/markview/default.nix
diff --git a/plugins/languages/nix.nix b/plugins/by-name/nix/default.nix
similarity index 100%
rename from plugins/languages/nix.nix
rename to plugins/by-name/nix/default.nix
diff --git a/plugins/languages/nvim-jdtls.nix b/plugins/by-name/nvim-jdtls/default.nix
similarity index 100%
rename from plugins/languages/nvim-jdtls.nix
rename to plugins/by-name/nvim-jdtls/default.nix
diff --git a/plugins/languages/openscad.nix b/plugins/by-name/openscad/default.nix
similarity index 100%
rename from plugins/languages/openscad.nix
rename to plugins/by-name/openscad/default.nix
diff --git a/plugins/languages/nvim-orgmode.nix b/plugins/by-name/orgmode/default.nix
similarity index 100%
rename from plugins/languages/nvim-orgmode.nix
rename to plugins/by-name/orgmode/default.nix
diff --git a/plugins/languages/otter.nix b/plugins/by-name/otter/default.nix
similarity index 100%
rename from plugins/languages/otter.nix
rename to plugins/by-name/otter/default.nix
diff --git a/plugins/languages/parinfer-rust.nix b/plugins/by-name/parinfer-rust/default.nix
similarity index 100%
rename from plugins/languages/parinfer-rust.nix
rename to plugins/by-name/parinfer-rust/default.nix
diff --git a/plugins/languages/plantuml-syntax.nix b/plugins/by-name/plantuml-syntax/default.nix
similarity index 100%
rename from plugins/languages/plantuml-syntax.nix
rename to plugins/by-name/plantuml-syntax/default.nix
diff --git a/plugins/languages/markdown/preview.nix b/plugins/by-name/preview/default.nix
similarity index 100%
rename from plugins/languages/markdown/preview.nix
rename to plugins/by-name/preview/default.nix
diff --git a/plugins/languages/qmk.nix b/plugins/by-name/qmk/default.nix
similarity index 100%
rename from plugins/languages/qmk.nix
rename to plugins/by-name/qmk/default.nix
diff --git a/plugins/languages/rust/rust-tools.nix b/plugins/by-name/rust-tools/default.nix
similarity index 100%
rename from plugins/languages/rust/rust-tools.nix
rename to plugins/by-name/rust-tools/default.nix
diff --git a/plugins/languages/rust/rustaceanvim/default.nix b/plugins/by-name/rustaceanvim/default.nix
similarity index 100%
rename from plugins/languages/rust/rustaceanvim/default.nix
rename to plugins/by-name/rustaceanvim/default.nix
diff --git a/plugins/languages/rust/rustaceanvim/renamed-options.nix b/plugins/by-name/rustaceanvim/renamed-options.nix
similarity index 100%
rename from plugins/languages/rust/rustaceanvim/renamed-options.nix
rename to plugins/by-name/rustaceanvim/renamed-options.nix
diff --git a/plugins/languages/rust/rustaceanvim/settings-options.nix b/plugins/by-name/rustaceanvim/settings-options.nix
similarity index 98%
rename from plugins/languages/rust/rustaceanvim/settings-options.nix
rename to plugins/by-name/rustaceanvim/settings-options.nix
index 5333dfd2..d0a9891e 100644
--- a/plugins/languages/rust/rustaceanvim/settings-options.nix
+++ b/plugins/by-name/rustaceanvim/settings-options.nix
@@ -257,7 +257,7 @@ with lib;
     default_settings =
       helpers.mkNullOrStrLuaFnOr
         (types.submodule {
-          options.rust-analyzer = import ../../../lsp/language-servers/rust-analyzer-config.nix lib helpers;
+          options.rust-analyzer = import ../../lsp/language-servers/rust-analyzer-config.nix lib helpers;
           freeformType = with types; attrsOf anything;
         })
         ''
diff --git a/plugins/languages/sniprun.nix b/plugins/by-name/sniprun/default.nix
similarity index 100%
rename from plugins/languages/sniprun.nix
rename to plugins/by-name/sniprun/default.nix
diff --git a/plugins/languages/tagbar.nix b/plugins/by-name/tagbar/default.nix
similarity index 100%
rename from plugins/languages/tagbar.nix
rename to plugins/by-name/tagbar/default.nix
diff --git a/plugins/languages/texpresso.nix b/plugins/by-name/texpresso/default.nix
similarity index 100%
rename from plugins/languages/texpresso.nix
rename to plugins/by-name/texpresso/default.nix
diff --git a/plugins/languages/typescript-tools.nix b/plugins/by-name/typescript-tools/default.nix
similarity index 100%
rename from plugins/languages/typescript-tools.nix
rename to plugins/by-name/typescript-tools/default.nix
diff --git a/plugins/languages/typst/typst-vim.nix b/plugins/by-name/typst-vim/default.nix
similarity index 100%
rename from plugins/languages/typst/typst-vim.nix
rename to plugins/by-name/typst-vim/default.nix
diff --git a/plugins/languages/vim-slime.nix b/plugins/by-name/vim-slime/default.nix
similarity index 100%
rename from plugins/languages/vim-slime.nix
rename to plugins/by-name/vim-slime/default.nix
diff --git a/plugins/languages/vimtex.nix b/plugins/by-name/vimtex/default.nix
similarity index 100%
rename from plugins/languages/vimtex.nix
rename to plugins/by-name/vimtex/default.nix
diff --git a/plugins/languages/zig.nix b/plugins/by-name/zig/default.nix
similarity index 100%
rename from plugins/languages/zig.nix
rename to plugins/by-name/zig/default.nix
diff --git a/plugins/default.nix b/plugins/default.nix
index fb5c8a15..c19c59db 100644
--- a/plugins/default.nix
+++ b/plugins/default.nix
@@ -24,41 +24,6 @@
     ./colorschemes/tokyonight.nix
     ./colorschemes/vscode.nix
 
-    ./languages/clangd-extensions.nix
-    ./languages/cmake-tools.nix
-    ./languages/debugprint.nix
-    ./languages/godot.nix
-    ./languages/haskell-scope-highlighting.nix
-    ./languages/helm.nix
-    ./languages/julia/julia-cell.nix
-    ./languages/lean.nix
-    ./languages/ledger.nix
-    ./languages/lint.nix
-    ./languages/ltex-extra.nix
-    ./languages/markdown/glow.nix
-    ./languages/markdown/markdown-preview.nix
-    ./languages/markdown/markview.nix
-    ./languages/markdown/preview.nix
-    ./languages/nix.nix
-    ./languages/nvim-jdtls.nix
-    ./languages/nvim-orgmode.nix
-    ./languages/openscad.nix
-    ./languages/otter.nix
-    ./languages/parinfer-rust.nix
-    ./languages/plantuml-syntax.nix
-    ./languages/python/jupytext.nix
-    ./languages/qmk.nix
-    ./languages/rust/rust-tools.nix
-    ./languages/rust/rustaceanvim
-    ./languages/sniprun.nix
-    ./languages/tagbar.nix
-    ./languages/texpresso.nix
-    ./languages/typescript-tools.nix
-    ./languages/typst/typst-vim.nix
-    ./languages/vim-slime.nix
-    ./languages/vimtex.nix
-    ./languages/zig.nix
-
     ./lsp
 
     ./none-ls
diff --git a/tests/test-sources/plugins/languages/clangd-extensions.nix b/tests/test-sources/plugins/by-name/clangd-extensions/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/clangd-extensions.nix
rename to tests/test-sources/plugins/by-name/clangd-extensions/default.nix
diff --git a/tests/test-sources/plugins/languages/cmake-tools.nix b/tests/test-sources/plugins/by-name/cmake-tools/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/cmake-tools.nix
rename to tests/test-sources/plugins/by-name/cmake-tools/default.nix
diff --git a/tests/test-sources/plugins/languages/debugprint.nix b/tests/test-sources/plugins/by-name/debugprint/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/debugprint.nix
rename to tests/test-sources/plugins/by-name/debugprint/default.nix
diff --git a/tests/test-sources/plugins/languages/markdown/glow.nix b/tests/test-sources/plugins/by-name/glow/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/markdown/glow.nix
rename to tests/test-sources/plugins/by-name/glow/default.nix
diff --git a/tests/test-sources/plugins/languages/godot.nix b/tests/test-sources/plugins/by-name/godot/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/godot.nix
rename to tests/test-sources/plugins/by-name/godot/default.nix
diff --git a/tests/test-sources/plugins/languages/haskell-scope-highlighting.nix b/tests/test-sources/plugins/by-name/haskell-scope-highlighting/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/haskell-scope-highlighting.nix
rename to tests/test-sources/plugins/by-name/haskell-scope-highlighting/default.nix
diff --git a/tests/test-sources/plugins/languages/helm.nix b/tests/test-sources/plugins/by-name/helm/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/helm.nix
rename to tests/test-sources/plugins/by-name/helm/default.nix
diff --git a/tests/test-sources/plugins/languages/julia/julia-cell.nix b/tests/test-sources/plugins/by-name/julia-cell/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/julia/julia-cell.nix
rename to tests/test-sources/plugins/by-name/julia-cell/default.nix
diff --git a/tests/test-sources/plugins/languages/python/jupytext.nix b/tests/test-sources/plugins/by-name/jupytext/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/python/jupytext.nix
rename to tests/test-sources/plugins/by-name/jupytext/default.nix
diff --git a/tests/test-sources/plugins/languages/lean.nix b/tests/test-sources/plugins/by-name/lean/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/lean.nix
rename to tests/test-sources/plugins/by-name/lean/default.nix
diff --git a/tests/test-sources/plugins/languages/ledger.nix b/tests/test-sources/plugins/by-name/ledger/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/ledger.nix
rename to tests/test-sources/plugins/by-name/ledger/default.nix
diff --git a/tests/test-sources/plugins/languages/lint.nix b/tests/test-sources/plugins/by-name/lint/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/lint.nix
rename to tests/test-sources/plugins/by-name/lint/default.nix
diff --git a/tests/test-sources/plugins/by-name/ltex-extra/default.nix b/tests/test-sources/plugins/by-name/ltex-extra/default.nix
new file mode 100644
index 00000000..582236ab
--- /dev/null
+++ b/tests/test-sources/plugins/by-name/ltex-extra/default.nix
@@ -0,0 +1,8 @@
+{
+  empty = {
+    plugins = {
+      lsp.enable = true;
+      ltex-extra.enable = true;
+    };
+  };
+}
diff --git a/tests/test-sources/plugins/languages/markdown/markdown-preview.nix b/tests/test-sources/plugins/by-name/markdown-preview/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/markdown/markdown-preview.nix
rename to tests/test-sources/plugins/by-name/markdown-preview/default.nix
diff --git a/tests/test-sources/plugins/languages/markdown/markview.nix b/tests/test-sources/plugins/by-name/markview/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/markdown/markview.nix
rename to tests/test-sources/plugins/by-name/markview/default.nix
diff --git a/tests/test-sources/plugins/by-name/nix/default.nix b/tests/test-sources/plugins/by-name/nix/default.nix
new file mode 100644
index 00000000..f76af8a2
--- /dev/null
+++ b/tests/test-sources/plugins/by-name/nix/default.nix
@@ -0,0 +1,5 @@
+{
+  empty = {
+    plugins.nix.enable = true;
+  };
+}
diff --git a/tests/test-sources/plugins/languages/nvim-jdtls.nix b/tests/test-sources/plugins/by-name/nvim-jdtls/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/nvim-jdtls.nix
rename to tests/test-sources/plugins/by-name/nvim-jdtls/default.nix
diff --git a/tests/test-sources/plugins/languages/openscad.nix b/tests/test-sources/plugins/by-name/openscad/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/openscad.nix
rename to tests/test-sources/plugins/by-name/openscad/default.nix
diff --git a/tests/test-sources/plugins/languages/orgmode.nix b/tests/test-sources/plugins/by-name/orgmode/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/orgmode.nix
rename to tests/test-sources/plugins/by-name/orgmode/default.nix
diff --git a/tests/test-sources/plugins/languages/otter.nix b/tests/test-sources/plugins/by-name/otter/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/otter.nix
rename to tests/test-sources/plugins/by-name/otter/default.nix
diff --git a/tests/test-sources/plugins/languages/parinfer-rust.nix b/tests/test-sources/plugins/by-name/parinfer-rust/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/parinfer-rust.nix
rename to tests/test-sources/plugins/by-name/parinfer-rust/default.nix
diff --git a/tests/test-sources/plugins/by-name/plantuml-syntax/default.nix b/tests/test-sources/plugins/by-name/plantuml-syntax/default.nix
new file mode 100644
index 00000000..580b4ebe
--- /dev/null
+++ b/tests/test-sources/plugins/by-name/plantuml-syntax/default.nix
@@ -0,0 +1,5 @@
+{
+  empty = {
+    plugins.plantuml-syntax.enable = true;
+  };
+}
diff --git a/tests/test-sources/plugins/languages/markdown/preview.nix b/tests/test-sources/plugins/by-name/preview/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/markdown/preview.nix
rename to tests/test-sources/plugins/by-name/preview/default.nix
diff --git a/tests/test-sources/plugins/languages/qmk.nix b/tests/test-sources/plugins/by-name/qmk/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/qmk.nix
rename to tests/test-sources/plugins/by-name/qmk/default.nix
diff --git a/tests/test-sources/plugins/languages/rust/rust-tools.nix b/tests/test-sources/plugins/by-name/rust-tools/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/rust/rust-tools.nix
rename to tests/test-sources/plugins/by-name/rust-tools/default.nix
diff --git a/tests/test-sources/plugins/languages/rust/rustaceanvim.nix b/tests/test-sources/plugins/by-name/rustaceanvim/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/rust/rustaceanvim.nix
rename to tests/test-sources/plugins/by-name/rustaceanvim/default.nix
diff --git a/tests/test-sources/plugins/languages/sniprun.nix b/tests/test-sources/plugins/by-name/sniprun/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/sniprun.nix
rename to tests/test-sources/plugins/by-name/sniprun/default.nix
diff --git a/tests/test-sources/plugins/languages/tagbar.nix b/tests/test-sources/plugins/by-name/tagbar/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/tagbar.nix
rename to tests/test-sources/plugins/by-name/tagbar/default.nix
diff --git a/tests/test-sources/plugins/languages/texpresso.nix b/tests/test-sources/plugins/by-name/texpresso/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/texpresso.nix
rename to tests/test-sources/plugins/by-name/texpresso/default.nix
diff --git a/tests/test-sources/plugins/languages/typescript-tools.nix b/tests/test-sources/plugins/by-name/typescript-tools/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/typescript-tools.nix
rename to tests/test-sources/plugins/by-name/typescript-tools/default.nix
diff --git a/tests/test-sources/plugins/languages/typst/typst-vim.nix b/tests/test-sources/plugins/by-name/typst-vim/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/typst/typst-vim.nix
rename to tests/test-sources/plugins/by-name/typst-vim/default.nix
diff --git a/tests/test-sources/plugins/languages/vim-slime.nix b/tests/test-sources/plugins/by-name/vim-slime/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/vim-slime.nix
rename to tests/test-sources/plugins/by-name/vim-slime/default.nix
diff --git a/tests/test-sources/plugins/languages/vimtex.nix b/tests/test-sources/plugins/by-name/vimtex/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/vimtex.nix
rename to tests/test-sources/plugins/by-name/vimtex/default.nix
diff --git a/tests/test-sources/plugins/languages/zig.nix b/tests/test-sources/plugins/by-name/zig/default.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/zig.nix
rename to tests/test-sources/plugins/by-name/zig/default.nix