diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f4107880b2..c4165a5ea8 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -62,12 +62,12 @@ repos:
       - id: sync-downloader-configs
         name: Sync downloader configs
         language: system
-        entry: ./tools/private/sync_downloader_configs.py
+        entry: ./dev/sync_downloader_configs.py
         files: downloader_config\.cfg$
         pass_filenames: false
       - id: gazelle
         name: Run Gazelle
         language: system
-        entry: bazel run //tools/private/gazelle
+        entry: bazel run //dev/gazelle
         files: (\.bzl|\.bazel|BUILD|WORKSPACE(\.bzlmod)?)$
         pass_filenames: false
diff --git a/tools/private/debug/print_defined_toolchains.sh b/dev/debug/print_defined_toolchains.sh
similarity index 100%
rename from tools/private/debug/print_defined_toolchains.sh
rename to dev/debug/print_defined_toolchains.sh
diff --git a/tools/private/gazelle/BUILD.bazel b/dev/gazelle/BUILD.bazel
similarity index 100%
rename from tools/private/gazelle/BUILD.bazel
rename to dev/gazelle/BUILD.bazel
diff --git a/tools/private/sync_downloader_configs.py b/dev/sync_downloader_configs.py
similarity index 93%
rename from tools/private/sync_downloader_configs.py
rename to dev/sync_downloader_configs.py
index 7e8527b989..e9551f0d8b 100755
--- a/tools/private/sync_downloader_configs.py
+++ b/dev/sync_downloader_configs.py
@@ -7,7 +7,7 @@
 
 
 def main():
-    repo_root = Path(__file__).resolve().parent.parent.parent
+    repo_root = Path(__file__).resolve().parent.parent
     canonical = repo_root / "downloader_config.cfg"
 
     subworkspaces = [
diff --git a/tools/private/update_deps/BUILD.bazel b/dev/update_deps/BUILD.bazel
similarity index 93%
rename from tools/private/update_deps/BUILD.bazel
rename to dev/update_deps/BUILD.bazel
index 5ebb8550c1..7c0fcb6abe 100644
--- a/tools/private/update_deps/BUILD.bazel
+++ b/dev/update_deps/BUILD.bazel
@@ -21,14 +21,14 @@ licenses(["notice"])
 py_library(
     name = "args",
     srcs = ["args.py"],
-    imports = ["../../.."],
+    imports = ["../.."],
     deps = ["//python/runfiles"],
 )
 
 py_library(
     name = "update_file",
     srcs = ["update_file.py"],
-    imports = ["../../.."],
+    imports = ["../.."],
 )
 
 py_binary(
@@ -40,7 +40,7 @@ py_binary(
     env = {
         "UPDATE_FILE": "$(rlocationpath //python/private:coverage_deps_filegroup)",
     },
-    imports = ["../../.."],
+    imports = ["../.."],
     deps = [
         ":args",
         ":update_file",
@@ -58,7 +58,7 @@ py_binary(
         "DEPS_BZL": "$(rlocationpath //python/private/pypi:deps.bzl)",
         "REQUIREMENTS_TXT": "$(rlocationpath //python/private/pypi:requirements_txt)",
     },
-    imports = ["../../.."],
+    imports = ["../.."],
     visibility = ["//:__subpackages__"],
     deps = [
         ":args",
@@ -69,7 +69,7 @@ py_binary(
 pytest_test(
     name = "update_file_test",
     srcs = ["update_file_test.py"],
-    imports = ["../../.."],
+    imports = ["../.."],
     target_compatible_with = SUPPORTS_BZLMOD,
     deps = [
         ":update_file",
diff --git a/tools/private/update_deps/args.py b/dev/update_deps/args.py
similarity index 94%
rename from tools/private/update_deps/args.py
rename to dev/update_deps/args.py
index 610b1abc72..5525c1653d 100644
--- a/tools/private/update_deps/args.py
+++ b/dev/update_deps/args.py
@@ -28,8 +28,7 @@ def path_from_runfiles(input: str) -> pathlib.Path:
     Returns:
         the pathlib.Path path to a file which is verified to exist.
     """
-    rf = runfiles.Create()
-    assert rf is not None  # type assert
+    rf = runfiles.CreateOrRaise()
     rlocation_path = rf.Rlocation(input)
     assert rlocation_path is not None  # type assert
     path = pathlib.Path(rlocation_path)
diff --git a/tools/private/update_deps/update_coverage_deps.py b/dev/update_deps/update_coverage_deps.py
similarity index 94%
rename from tools/private/update_deps/update_coverage_deps.py
rename to dev/update_deps/update_coverage_deps.py
index 74ac657bad..fde2f0b54c 100755
--- a/tools/private/update_deps/update_coverage_deps.py
+++ b/dev/update_deps/update_coverage_deps.py
@@ -28,8 +28,8 @@
 from typing import Any
 from urllib import request
 
-from tools.private.update_deps.args import path_from_runfiles
-from tools.private.update_deps.update_file import update_file
+from dev.update_deps.args import path_from_runfiles
+from dev.update_deps.update_file import update_file
 
 # This should be kept in sync with //python:versions.bzl
 _supported_platforms = {
@@ -208,8 +208,8 @@ def main():
                 "",
             ]
         ),
-        start_marker="# START: maintained by 'bazel run //tools/private/update_deps:update_coverage_deps <version>'",
-        end_marker="# END: maintained by 'bazel run //tools/private/update_deps:update_coverage_deps <version>'",
+        start_marker="# START: maintained by 'bazel run //dev/update_deps:update_coverage_deps <version>'",
+        end_marker="# END: maintained by 'bazel run //dev/update_deps:update_coverage_deps <version>'",
         dry_run=args.dry_run,
     )
 
diff --git a/tools/private/update_deps/update_file.py b/dev/update_deps/update_file.py
similarity index 97%
rename from tools/private/update_deps/update_file.py
rename to dev/update_deps/update_file.py
index cbf4c32bd1..d1b25b24f9 100644
--- a/tools/private/update_deps/update_file.py
+++ b/dev/update_deps/update_file.py
@@ -101,9 +101,7 @@ def update_file(
         _writelines(path, out)
         return
 
-    relative = path.relative_to(
-        pathlib.Path(__file__).resolve().parent.parent.parent.parent
-    )
+    relative = path.relative_to(pathlib.Path(__file__).resolve().parent.parent.parent)
     name = f"{relative}"
     diff = unified_diff(name, current, out)
     if diff:
diff --git a/tools/private/update_deps/update_file_test.py b/dev/update_deps/update_file_test.py
similarity index 96%
rename from tools/private/update_deps/update_file_test.py
rename to dev/update_deps/update_file_test.py
index b1d6545ead..6f63350640 100644
--- a/tools/private/update_deps/update_file_test.py
+++ b/dev/update_deps/update_file_test.py
@@ -14,7 +14,7 @@
 
 import pytest
 
-from tools.private.update_deps.update_file import replace_snippet, unified_diff
+from dev.update_deps.update_file import replace_snippet, unified_diff
 
 
 def test_replace_simple():
diff --git a/tools/private/update_deps/update_pip_deps.py b/dev/update_deps/update_pip_deps.py
similarity index 92%
rename from tools/private/update_deps/update_pip_deps.py
rename to dev/update_deps/update_pip_deps.py
index 9951a7abbb..020064aadf 100755
--- a/tools/private/update_deps/update_pip_deps.py
+++ b/dev/update_deps/update_pip_deps.py
@@ -29,8 +29,8 @@
 
 from pip._internal.cli.main import main as pip_main  # pyrefly: ignore[missing-import]
 
-from tools.private.update_deps.args import path_from_runfiles
-from tools.private.update_deps.update_file import update_file
+from dev.update_deps.args import path_from_runfiles
+from dev.update_deps.update_file import update_file
 
 
 @dataclass
@@ -111,13 +111,13 @@ def main():
     parser.add_argument(
         "--start",
         type=str,
-        default="# START: maintained by 'bazel run //tools/private/update_deps:update_pip_deps'",
+        default="# START: maintained by 'bazel run //dev/update_deps:update_pip_deps'",
         help="The text to match in a file when updating them.",
     )
     parser.add_argument(
         "--end",
         type=str,
-        default="# END: maintained by 'bazel run //tools/private/update_deps:update_pip_deps'",
+        default="# END: maintained by 'bazel run //dev/update_deps:update_pip_deps'",
         help="The text to match in a file when updating them.",
     )
     parser.add_argument(
diff --git a/docs/devguide.md b/docs/devguide.md
index 80ce6d61f2..96cf5cda9b 100644
--- a/docs/devguide.md
+++ b/docs/devguide.md
@@ -95,7 +95,7 @@ integration test.
 
 1. Modify the `./python/private/pypi/requirements.txt` file and run:
    ```
-   bazel run //tools/private/update_deps:update_pip_deps
+   bazel run //dev/update_deps:update_pip_deps
    ```
 1. Run the following target to update `twine` dependencies:
    ```
@@ -103,9 +103,9 @@ integration test.
    ```
 1. Bump the coverage dependencies using the script using:
    ```
-   bazel run //tools/private/update_deps:update_coverage_deps <VERSION>
+   bazel run //dev/update_deps:update_coverage_deps <VERSION>
    # for example:
-   # bazel run //tools/private/update_deps:update_coverage_deps 7.10.7
+   # bazel run //dev/update_deps:update_coverage_deps 7.10.7
    ```
 
 ## Updating tool dependencies
diff --git a/python/private/BUILD.bazel b/python/private/BUILD.bazel
index 72bf7138f8..9e4313d1f8 100644
--- a/python/private/BUILD.bazel
+++ b/python/private/BUILD.bazel
@@ -54,7 +54,7 @@ filegroup(
 filegroup(
     name = "coverage_deps_filegroup",
     srcs = ["coverage_deps.bzl"],
-    visibility = ["//tools/private/update_deps:__pkg__"],
+    visibility = ["//:__subpackages__"],
 )
 
 # Filegroup of bzl files that can be used by downstream rules for documentation generation
diff --git a/python/private/coverage_deps.bzl b/python/private/coverage_deps.bzl
index 001146c3d4..8ee5935307 100644
--- a/python/private/coverage_deps.bzl
+++ b/python/private/coverage_deps.bzl
@@ -19,7 +19,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 load("//python/private:version_label.bzl", "version_label")
 
-# START: maintained by 'bazel run //tools/private/update_deps:update_coverage_deps <version>'
+# START: maintained by 'bazel run //dev/update_deps:update_coverage_deps <version>'
 _default = (
     "https://files.pythonhosted.org/packages/ec/16/114df1c291c22cac3b0c127a73e0af5c12ed7bbb6558d310429a0ae24023/coverage-7.10.7-py3-none-any.whl",
     "f7941f6f2fe6dd6807a1208737b8a0cbcf1cc6d7b07d24998ad2d63590868260",
@@ -166,7 +166,7 @@ _coverage_deps = {
         ),
     },
 }
-# END: maintained by 'bazel run //tools/private/update_deps:update_coverage_deps <version>'
+# END: maintained by 'bazel run //dev/update_deps:update_coverage_deps <version>'
 
 _coverage_patch = Label("//python/private:coverage.patch")
 
diff --git a/python/private/pypi/BUILD.bazel b/python/private/pypi/BUILD.bazel
index 35286c5deb..eb87c63717 100644
--- a/python/private/pypi/BUILD.bazel
+++ b/python/private/pypi/BUILD.bazel
@@ -67,7 +67,7 @@ alias(
 
 exports_files(
     srcs = ["deps.bzl"],
-    visibility = ["//tools/private/update_deps:__pkg__"],
+    visibility = ["//:__subpackages__"],
 )
 
 filegroup(
@@ -86,16 +86,13 @@ filegroup(
 filegroup(
     name = "bzl",
     srcs = glob(["**/*.bzl"]),
-    visibility = [
-        "//python/private:__pkg__",
-        "//tools/private:__pkg__",
-    ],
+    visibility = ["//:__subpackages__"],
 )
 
 filegroup(
     name = "requirements_txt",
     srcs = ["requirements.txt"],
-    visibility = ["//tools/private/update_deps:__pkg__"],
+    visibility = ["//:__subpackages__"],
 )
 
 bzl_library(
diff --git a/python/private/pypi/deps.bzl b/python/private/pypi/deps.bzl
index 5d0507cb98..264446bece 100644
--- a/python/private/pypi/deps.bzl
+++ b/python/private/pypi/deps.bzl
@@ -18,7 +18,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
 _RULE_DEPS = [
-    # START: maintained by 'bazel run //tools/private/update_deps:update_pip_deps'
+    # START: maintained by 'bazel run //dev/update_deps:update_pip_deps'
     (
         "pypi__build",
         "https://files.pythonhosted.org/packages/c5/0d/84a4380f930db0010168e0aa7b7a8fed9ba1835a8fbb1472bc6d0201d529/build-1.4.0-py3-none-any.whl",
@@ -94,7 +94,7 @@ _RULE_DEPS = [
         "https://files.pythonhosted.org/packages/2e/54/647ade08bf0db230bfea292f893923872fd20be6ac6f53b2b936ba839d75/zipp-3.23.0-py3-none-any.whl",
         "071652d6115ed432f5ce1d34c336c0adfd6a884660d1e9712a256d3d3bd4b14e",
     ),
-    # END: maintained by 'bazel run //tools/private/update_deps:update_pip_deps'
+    # END: maintained by 'bazel run //dev/update_deps:update_pip_deps'
 ]
 
 _GENERIC_WHEEL = """\
diff --git a/python/uv/private/BUILD.bazel b/python/uv/private/BUILD.bazel
index cb73482ad8..e1d520408e 100644
--- a/python/uv/private/BUILD.bazel
+++ b/python/uv/private/BUILD.bazel
@@ -63,8 +63,7 @@ bzl_library(
     name = "lock",
     srcs = ["lock.bzl"],
     visibility = [
-        "//python/uv:__subpackages__",
-        "//tools/private:__subpackages__",
+        "//:__subpackages__",
     ],
     deps = [
         ":toolchain_types",
diff --git a/tools/private/BUILD.bazel b/tools/private/BUILD.bazel
index b395b2c541..b66eac3490 100644
--- a/tools/private/BUILD.bazel
+++ b/tools/private/BUILD.bazel
@@ -12,5 +12,5 @@ filegroup(
 bzl_library(
     name = "publish_deps",
     srcs = ["publish_deps.bzl"],
-    deps = ["//python/uv/private:lock"],
+    deps = ["//python/uv:lock"],
 )
diff --git a/tools/private/publish_deps.bzl b/tools/private/publish_deps.bzl
index a9b0dbc562..cd72733769 100644
--- a/tools/private/publish_deps.bzl
+++ b/tools/private/publish_deps.bzl
@@ -15,7 +15,7 @@
 """A simple macro to lock the requirements for twine
 """
 
-load("//python/uv/private:lock.bzl", "lock")  # buildifier: disable=bzl-visibility
+load("//python/uv:lock.bzl", "lock")
 
 def publish_deps(*, name, args, outs, **kwargs):
     """Generate all of the requirements files for all platforms.
@@ -27,9 +27,9 @@ def publish_deps(*, name, args, outs, **kwargs):
             for each requirement file to be generated.
         **kwargs: Extra args passed to the {rule}`lock` rule.
     """
-    all_args = args
+    all_args = list(args or [])
     for out, platform in outs.items():
-        args = [] + all_args
+        args = list(all_args)
         if platform:
             args.append("--python-platform=" + platform)
         else: