diff --git a/plugins/default.nix b/plugins/default.nix
index fe4d33de..db30268b 100644
--- a/plugins/default.nix
+++ b/plugins/default.nix
@@ -45,14 +45,14 @@
     ./languages/vimtex.nix
     ./languages/zig.nix
 
-    ./null-ls
+    ./lsp
+    ./lsp/inc-rename.nix
+    ./lsp/lspsaga.nix
+    ./lsp/lsp-lines.nix
+    ./lsp/nvim-lightbulb.nix
+    ./lsp/trouble.nix
 
-    ./nvim-lsp
-    ./nvim-lsp/inc-rename.nix
-    ./nvim-lsp/lspsaga.nix
-    ./nvim-lsp/lsp-lines.nix
-    ./nvim-lsp/nvim-lightbulb.nix
-    ./nvim-lsp/trouble.nix
+    ./null-ls
 
     ./pluginmanagers/packer.nix
 
diff --git a/plugins/languages/rust.nix b/plugins/languages/rust.nix
index 3f4c52bc..e7b33c26 100644
--- a/plugins/languages/rust.nix
+++ b/plugins/languages/rust.nix
@@ -131,7 +131,7 @@ in {
               setting it to false may improve startup time
             '';
           }
-          // (import ../nvim-lsp/language-servers/rust-analyzer-config.nix lib));
+          // (import ../lsp/language-servers/rust-analyzer-config.nix lib));
     };
   config = mkIf cfg.enable {
     extraPlugins = with pkgs.vimPlugins; [nvim-lspconfig cfg.package];
diff --git a/plugins/nvim-lsp/default.nix b/plugins/lsp/default.nix
similarity index 100%
rename from plugins/nvim-lsp/default.nix
rename to plugins/lsp/default.nix
diff --git a/plugins/nvim-lsp/helpers.nix b/plugins/lsp/helpers.nix
similarity index 100%
rename from plugins/nvim-lsp/helpers.nix
rename to plugins/lsp/helpers.nix
diff --git a/plugins/nvim-lsp/inc-rename.nix b/plugins/lsp/inc-rename.nix
similarity index 100%
rename from plugins/nvim-lsp/inc-rename.nix
rename to plugins/lsp/inc-rename.nix
diff --git a/plugins/nvim-lsp/language-servers/default.nix b/plugins/lsp/language-servers/default.nix
similarity index 100%
rename from plugins/nvim-lsp/language-servers/default.nix
rename to plugins/lsp/language-servers/default.nix
diff --git a/plugins/nvim-lsp/language-servers/pylsp.nix b/plugins/lsp/language-servers/pylsp.nix
similarity index 100%
rename from plugins/nvim-lsp/language-servers/pylsp.nix
rename to plugins/lsp/language-servers/pylsp.nix
diff --git a/plugins/nvim-lsp/language-servers/rust-analyzer-config.nix b/plugins/lsp/language-servers/rust-analyzer-config.nix
similarity index 100%
rename from plugins/nvim-lsp/language-servers/rust-analyzer-config.nix
rename to plugins/lsp/language-servers/rust-analyzer-config.nix
diff --git a/plugins/nvim-lsp/language-servers/update_ra.md b/plugins/lsp/language-servers/update_ra.md
similarity index 100%
rename from plugins/nvim-lsp/language-servers/update_ra.md
rename to plugins/lsp/language-servers/update_ra.md
diff --git a/plugins/nvim-lsp/lsp-lines.nix b/plugins/lsp/lsp-lines.nix
similarity index 100%
rename from plugins/nvim-lsp/lsp-lines.nix
rename to plugins/lsp/lsp-lines.nix
diff --git a/plugins/nvim-lsp/lspsaga.nix b/plugins/lsp/lspsaga.nix
similarity index 100%
rename from plugins/nvim-lsp/lspsaga.nix
rename to plugins/lsp/lspsaga.nix
diff --git a/plugins/nvim-lsp/nvim-lightbulb.nix b/plugins/lsp/nvim-lightbulb.nix
similarity index 100%
rename from plugins/nvim-lsp/nvim-lightbulb.nix
rename to plugins/lsp/nvim-lightbulb.nix
diff --git a/plugins/nvim-lsp/trouble.nix b/plugins/lsp/trouble.nix
similarity index 100%
rename from plugins/nvim-lsp/trouble.nix
rename to plugins/lsp/trouble.nix
diff --git a/tests/test-sources/plugins/nvim-lsp/inc-rename.nix b/tests/test-sources/plugins/lsp/inc-rename.nix
similarity index 100%
rename from tests/test-sources/plugins/nvim-lsp/inc-rename.nix
rename to tests/test-sources/plugins/lsp/inc-rename.nix
diff --git a/tests/test-sources/plugins/nvim-lsp/lsp-lines.nix b/tests/test-sources/plugins/lsp/lsp-lines.nix
similarity index 100%
rename from tests/test-sources/plugins/nvim-lsp/lsp-lines.nix
rename to tests/test-sources/plugins/lsp/lsp-lines.nix
diff --git a/tests/test-sources/plugins/nvim-lsp/nvim-lsp.nix b/tests/test-sources/plugins/lsp/nvim-lsp.nix
similarity index 100%
rename from tests/test-sources/plugins/nvim-lsp/nvim-lsp.nix
rename to tests/test-sources/plugins/lsp/nvim-lsp.nix
diff --git a/tests/test-sources/plugins/nvim-lsp/trouble.nix b/tests/test-sources/plugins/lsp/trouble.nix
similarity index 100%
rename from tests/test-sources/plugins/nvim-lsp/trouble.nix
rename to tests/test-sources/plugins/lsp/trouble.nix