diff --git a/.github/labeler.yml b/.github/labeler.yml
index f0a8e854b026..f199f9037eca 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -551,7 +551,6 @@
               - pkgs/by-name/*/*tree-sitter*/**/*
               - pkgs/by-name/ne/neovim-unwrapped/treesitter-parsers.nix
               - pkgs/development/python-modules/*tree-sitter*/**/*
-              - pkgs/development/tools/parsing/tree-sitter/**/*
 
 "6.topic: updaters":
   - any:
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/README.md b/pkgs/by-name/tr/tree-sitter/grammars/README.md
similarity index 96%
rename from pkgs/development/tools/parsing/tree-sitter/grammars/README.md
rename to pkgs/by-name/tr/tree-sitter/grammars/README.md
index e2b0e8750d39..c52ebea5d442 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/README.md
+++ b/pkgs/by-name/tr/tree-sitter/grammars/README.md
@@ -40,7 +40,7 @@ This will expand to an element in `pkgs.tree-sitter.grammars` at build time:
 }
 ```
 
-Each entry is passed to [buildGrammar](../build-grammar.nix), which in turn populates `pkgs.tree-sitter-grammars`.
+Each entry is passed to [buildGrammar](build-grammar.nix), which in turn populates `pkgs.tree-sitter-grammars`.
 
 Attempt to build the new grammar: `nix-build -A tree-sitter-grammars.tree-sitter-latex`.
 This will fail due to the invalid hash.
@@ -123,4 +123,3 @@ Or, to update all grammars:
 ```shell
 nix-shell maintainers/scripts/update.nix --argstr path tree-sitter-grammars --argstr keep-going true
 ```
-
diff --git a/pkgs/development/tools/parsing/tree-sitter/build-grammar.nix b/pkgs/by-name/tr/tree-sitter/grammars/build-grammar.nix
similarity index 100%
rename from pkgs/development/tools/parsing/tree-sitter/build-grammar.nix
rename to pkgs/by-name/tr/tree-sitter/grammars/build-grammar.nix
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/by-name/tr/tree-sitter/grammars/default.nix
similarity index 96%
rename from pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
rename to pkgs/by-name/tr/tree-sitter/grammars/default.nix
index 77d154c0d95a..da1c049d0d7e 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/default.nix
@@ -53,7 +53,7 @@ lib.mapAttrs' (
       passthru.updateScript = nix-update-script {
         extraArgs = [
           "--override-filename"
-          "pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix"
+          "pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix"
         ]
         ++ (
           if (isUnstable attrs.version) then
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
similarity index 100%
rename from pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
rename to pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/by-name/tr/tree-sitter/package.nix
similarity index 99%
rename from pkgs/development/tools/parsing/tree-sitter/default.nix
rename to pkgs/by-name/tr/tree-sitter/package.nix
index a0683acf66ad..1ae410255fc0 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/by-name/tr/tree-sitter/package.nix
@@ -37,7 +37,7 @@ let
     };
     ```
   */
-  buildGrammar = callPackage ./build-grammar.nix { };
+  buildGrammar = callPackage ./grammars/build-grammar.nix { };
 
   /**
     Attrset of grammar sources.
diff --git a/pkgs/development/tools/parsing/tree-sitter/remove-web-interface.patch b/pkgs/by-name/tr/tree-sitter/remove-web-interface.patch
similarity index 100%
rename from pkgs/development/tools/parsing/tree-sitter/remove-web-interface.patch
rename to pkgs/by-name/tr/tree-sitter/remove-web-interface.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b9d5402e0aee..7fe28b8d0d2a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5961,8 +5961,6 @@ with pkgs;
 
   tflint-plugins = recurseIntoAttrs (callPackage ../development/tools/analysis/tflint-plugins { });
 
-  tree-sitter = makeOverridable (callPackage ../development/tools/parsing/tree-sitter) { };
-
   tree-sitter-grammars = recurseIntoAttrs tree-sitter.builtGrammars;
 
   uhdMinimal = uhd.override {