diff --git a/plugins/default.nix b/plugins/default.nix
index 0a0c7d2d..7e6ff848 100644
--- a/plugins/default.nix
+++ b/plugins/default.nix
@@ -36,10 +36,10 @@
     ./languages/rust.nix
     ./languages/sniprun.nix
     ./languages/tagbar.nix
-    ./languages/treesitter.nix
-    ./languages/treesitter-context.nix
-    ./languages/treesitter-playground.nix
-    ./languages/treesitter-refactor.nix
+    ./languages/treesitter/treesitter.nix
+    ./languages/treesitter/treesitter-context.nix
+    ./languages/treesitter/treesitter-playground.nix
+    ./languages/treesitter/treesitter-refactor.nix
     ./languages/vimtex.nix
     ./languages/zig.nix
 
diff --git a/plugins/languages/treesitter-context.nix b/plugins/languages/treesitter/treesitter-context.nix
similarity index 96%
rename from plugins/languages/treesitter-context.nix
rename to plugins/languages/treesitter/treesitter-context.nix
index dc8a42f2..077e6423 100644
--- a/plugins/languages/treesitter-context.nix
+++ b/plugins/languages/treesitter/treesitter-context.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib; let
-  helpers = import ../helpers.nix {inherit lib;};
+  helpers = import ../../helpers.nix {inherit lib;};
 in {
   options.plugins.treesitter-context = {
     enable = mkEnableOption "nvim-treesitter-context";
diff --git a/plugins/languages/treesitter-playground.nix b/plugins/languages/treesitter/treesitter-playground.nix
similarity index 97%
rename from plugins/languages/treesitter-playground.nix
rename to plugins/languages/treesitter/treesitter-playground.nix
index 7882b43d..32d95e3e 100644
--- a/plugins/languages/treesitter-playground.nix
+++ b/plugins/languages/treesitter/treesitter-playground.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib; let
-  helpers = import ../helpers.nix {inherit lib;};
+  helpers = import ../../helpers.nix {inherit lib;};
 
   inherit (helpers) mkPackageOption mkCompositeOption;
   inherit (helpers.defaultNullOpts) mkInt mkBool mkStr mkNullable;
diff --git a/plugins/languages/treesitter-refactor.nix b/plugins/languages/treesitter/treesitter-refactor.nix
similarity index 95%
rename from plugins/languages/treesitter-refactor.nix
rename to plugins/languages/treesitter/treesitter-refactor.nix
index 1ff04b6f..1b4978b7 100644
--- a/plugins/languages/treesitter-refactor.nix
+++ b/plugins/languages/treesitter/treesitter-refactor.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib; let
-  helpers = import ../helpers.nix {inherit lib;};
+  helpers = import ../../helpers.nix {inherit lib;};
 in {
   options.plugins.treesitter-refactor = let
     disable = mkOption {
@@ -104,6 +104,10 @@ in {
     cfg = config.plugins.treesitter-refactor;
   in
     mkIf cfg.enable {
+      warnings = mkIf (!config.plugins.treesitter.enable) [
+        "Nixvim: treesitter-refactor needs treesitter to function as intended"
+      ];
+
       extraPlugins = [cfg.package];
 
       plugins.treesitter.moduleConfig.refactor = {
diff --git a/plugins/languages/treesitter.nix b/plugins/languages/treesitter/treesitter.nix
similarity index 98%
rename from plugins/languages/treesitter.nix
rename to plugins/languages/treesitter/treesitter.nix
index f1a3ce24..1b7988dd 100644
--- a/plugins/languages/treesitter.nix
+++ b/plugins/languages/treesitter/treesitter.nix
@@ -6,7 +6,7 @@
 }:
 with lib; let
   cfg = config.plugins.treesitter;
-  helpers = import ../helpers.nix {inherit lib;};
+  helpers = import ../../helpers.nix {inherit lib;};
 in {
   options = {
     plugins.treesitter = {
diff --git a/tests/test-sources/plugins/languages/treesitter-playground.nix b/tests/test-sources/plugins/languages/treesitter/treesitter-playground.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/treesitter-playground.nix
rename to tests/test-sources/plugins/languages/treesitter/treesitter-playground.nix
diff --git a/tests/test-sources/plugins/languages/treesitter.nix b/tests/test-sources/plugins/languages/treesitter/treesitter.nix
similarity index 100%
rename from tests/test-sources/plugins/languages/treesitter.nix
rename to tests/test-sources/plugins/languages/treesitter/treesitter.nix