diff --git a/plugins/languages/rust.nix b/plugins/languages/rust.nix
index 4e0a260b..2153de3d 100644
--- a/plugins/languages/rust.nix
+++ b/plugins/languages/rust.nix
@@ -152,7 +152,7 @@ in {
           setting it to false may improve startup time
         '';
       }
-      // (import ../nvim-lsp/rust-analyzer-config.nix lib);
+      // (import ../nvim-lsp/language-servers/rust-analyzer-config.nix lib);
   };
   config = let
     cfg = config.plugins.rust-tools;
diff --git a/plugins/nvim-lsp/default.nix b/plugins/nvim-lsp/default.nix
index c621d9e7..e3eb1b4b 100644
--- a/plugins/nvim-lsp/default.nix
+++ b/plugins/nvim-lsp/default.nix
@@ -9,7 +9,7 @@ with lib; let
   helpers = import ../helpers.nix {inherit lib;};
 in {
   imports = [
-    ./basic-servers.nix
+    ./language-servers
   ];
 
   options = {
diff --git a/plugins/nvim-lsp/basic-servers.nix b/plugins/nvim-lsp/language-servers/default.nix
similarity index 98%
rename from plugins/nvim-lsp/basic-servers.nix
rename to plugins/nvim-lsp/language-servers/default.nix
index e877b3fb..18738b6a 100644
--- a/plugins/nvim-lsp/basic-servers.nix
+++ b/plugins/nvim-lsp/language-servers/default.nix
@@ -5,9 +5,9 @@
   ...
 } @ args:
 with lib; let
-  helpers = import ./helpers.nix args;
+  helpers = import ../helpers.nix args;
 
-  optionWarnings = import ../../lib/option-warnings.nix args;
+  optionWarnings = import ../../../lib/option-warnings.nix args;
   basePluginPath = ["plugins" "lsp" "servers"];
 
   servers = [
diff --git a/plugins/nvim-lsp/rust-analyzer-config.nix b/plugins/nvim-lsp/language-servers/rust-analyzer-config.nix
similarity index 100%
rename from plugins/nvim-lsp/rust-analyzer-config.nix
rename to plugins/nvim-lsp/language-servers/rust-analyzer-config.nix
diff --git a/plugins/nvim-lsp/update_ra.md b/plugins/nvim-lsp/language-servers/update_ra.md
similarity index 100%
rename from plugins/nvim-lsp/update_ra.md
rename to plugins/nvim-lsp/language-servers/update_ra.md