diff --git a/plugins/none-ls/_mk-source-plugin.nix b/plugins/by-name/none-ls/_mk-source-plugin.nix
similarity index 100%
rename from plugins/none-ls/_mk-source-plugin.nix
rename to plugins/by-name/none-ls/_mk-source-plugin.nix
diff --git a/plugins/none-ls/default.nix b/plugins/by-name/none-ls/default.nix
similarity index 100%
rename from plugins/none-ls/default.nix
rename to plugins/by-name/none-ls/default.nix
diff --git a/plugins/none-ls/packages.nix b/plugins/by-name/none-ls/packages.nix
similarity index 98%
rename from plugins/none-ls/packages.nix
rename to plugins/by-name/none-ls/packages.nix
index bf22a55c..f6c0e563 100644
--- a/plugins/none-ls/packages.nix
+++ b/plugins/by-name/none-ls/packages.nix
@@ -1,6 +1,6 @@
 lib:
 let
-  inherit (import ../../lib/pkg-lists.nix lib) topLevel scoped nullAttrs;
+  inherit (import ../../../lib/pkg-lists.nix lib) topLevel scoped nullAttrs;
 in
 {
   # builtin sources that don't require a package
diff --git a/plugins/none-ls/prettier.nix b/plugins/by-name/none-ls/prettier.nix
similarity index 100%
rename from plugins/none-ls/prettier.nix
rename to plugins/by-name/none-ls/prettier.nix
diff --git a/plugins/none-ls/settings.nix b/plugins/by-name/none-ls/settings.nix
similarity index 100%
rename from plugins/none-ls/settings.nix
rename to plugins/by-name/none-ls/settings.nix
diff --git a/plugins/none-ls/sources.nix b/plugins/by-name/none-ls/sources.nix
similarity index 89%
rename from plugins/none-ls/sources.nix
rename to plugins/by-name/none-ls/sources.nix
index 16a47023..176dd92c 100644
--- a/plugins/none-ls/sources.nix
+++ b/plugins/by-name/none-ls/sources.nix
@@ -1,6 +1,6 @@
 { config, lib, ... }:
 let
-  noneLsBuiltins = import ../../generated/none-ls.nix;
+  noneLsBuiltins = import ../../../generated/none-ls.nix;
   mkSourcePlugin = import ./_mk-source-plugin.nix;
 in
 {
diff --git a/plugins/default.nix b/plugins/default.nix
index c19c59db..ee890ddf 100644
--- a/plugins/default.nix
+++ b/plugins/default.nix
@@ -26,8 +26,6 @@
 
     ./lsp
 
-    ./none-ls
-
     ./pluginmanagers/packer.nix
     ./pluginmanagers/lazy.nix
     ./pluginmanagers/lz-n.nix
diff --git a/tests/generated.nix b/tests/generated.nix
index a82b2a3d..3f4eaff7 100644
--- a/tests/generated.nix
+++ b/tests/generated.nix
@@ -40,11 +40,11 @@ let
   errors = lib.concatStringsSep "\n" (
     checkDeclarations (
       let
-        inherit (import ../plugins/none-ls/packages.nix lib) noPackage packaged;
+        inherit (import ../plugins/by-name/none-ls/packages.nix lib) noPackage packaged;
       in
       {
         name = "none-ls";
-        declarationFile = "plugins/none-ls/packages.nix";
+        declarationFile = "plugins/by-name/none-ls/packages.nix";
 
         packages = builtins.filter (pkg: pkg != null) (builtins.attrValues packaged);
 
diff --git a/tests/test-sources/plugins/none-ls.nix b/tests/test-sources/plugins/by-name/none-ls/default.nix
similarity index 100%
rename from tests/test-sources/plugins/none-ls.nix
rename to tests/test-sources/plugins/by-name/none-ls/default.nix