diff --git a/misc/bazel/workspace.bzl b/misc/bazel/workspace.bzl
index 2c68fdd430e1..39be2cddb6cd 100644
--- a/misc/bazel/workspace.bzl
+++ b/misc/bazel/workspace.bzl
@@ -22,14 +22,14 @@ def codeql_workspace(repository_name = "codeql"):
                 _swift_prebuilt_version,
                 repo_arch,
             ),
-            build_file = "@%s//swift/tools/prebuilt:BUILD.swift-prebuilt.bazel" % repository_name,
+            build_file = "@%s//swift/third_party/swift-llvm-support:BUILD.swift-prebuilt.bazel" % repository_name,
             sha256 = sha256,
         )
 
     http_archive(
         name = "fishhook",
         url = "https://github.com/facebook/fishhook/archive/aadc161ac3b80db07a9908851839a17ba63a9eb1.zip",
-        build_file = "@%s//swift/tools/fishhook:BUILD.fishhook.bazel" % repository_name,
+        build_file = "@%s//swift/third_party/fishhook:BUILD.fishhook.bazel" % repository_name,
         strip_prefix = "fishhook-aadc161ac3b80db07a9908851839a17ba63a9eb1",
         sha256 = "9f2cdee6dcc2039d4c47d25ab5141fe0678ce6ed27ef482cab17fe9fa38a30ce",
     )
diff --git a/swift/BUILD.bazel b/swift/BUILD.bazel
index d82e1d43a4b6..446d021a6aaa 100644
--- a/swift/BUILD.bazel
+++ b/swift/BUILD.bazel
@@ -52,7 +52,7 @@ pkg_runfiles(
 
 pkg_files(
     name = "swift-test-sdk-arch",
-    srcs = ["//swift/tools/prebuilt:swift-test-sdk"],
+    srcs = ["//swift/third_party/swift-llvm-support:swift-test-sdk"],
     prefix = "qltest/" + codeql_platform,
     strip_prefix = strip_prefix.from_pkg(),
 )
diff --git a/swift/extractor/BUILD.bazel b/swift/extractor/BUILD.bazel
index d6103350905b..f3b49fdb2755 100644
--- a/swift/extractor/BUILD.bazel
+++ b/swift/extractor/BUILD.bazel
@@ -12,7 +12,7 @@ swift_cc_binary(
         "//swift/extractor/infra",
         "//swift/extractor/remapping",
         "//swift/extractor/visitors",
-        "//swift/tools/prebuilt:swift-llvm-support",
+        "//swift/third_party/swift-llvm-support",
     ],
 )
 
diff --git a/swift/extractor/infra/BUILD.bazel b/swift/extractor/infra/BUILD.bazel
index 115fb06b7458..0fdc08401ff5 100644
--- a/swift/extractor/infra/BUILD.bazel
+++ b/swift/extractor/infra/BUILD.bazel
@@ -7,6 +7,6 @@ swift_cc_library(
     visibility = ["//swift:__subpackages__"],
     deps = [
         "//swift/extractor/trap",
-        "//swift/tools/prebuilt:swift-llvm-support",
+        "//swift/third_party/swift-llvm-support",
     ],
 )
diff --git a/swift/extractor/remapping/BUILD.bazel b/swift/extractor/remapping/BUILD.bazel
index 87c8a5e79f0a..2da728d55cc1 100644
--- a/swift/extractor/remapping/BUILD.bazel
+++ b/swift/extractor/remapping/BUILD.bazel
@@ -2,7 +2,7 @@ load("//swift:rules.bzl", "swift_cc_library")
 
 swift_cc_library(
     name = "remapping",
-    srcs = ['SwiftOutputRewrite.cpp'] + select({
+    srcs = ["SwiftOutputRewrite.cpp"] + select({
         "@platforms//os:linux": [
             "SwiftOpenInterception.Linux.cpp",
         ],
@@ -13,7 +13,7 @@ swift_cc_library(
     hdrs = glob(["*.h"]),
     visibility = ["//swift:__subpackages__"],
     deps = [
-        "//swift/tools/prebuilt:swift-llvm-support",
+        "//swift/third_party/swift-llvm-support",
     ] + select({
         "@platforms//os:linux": [],
         "@platforms//os:macos": [
diff --git a/swift/extractor/visitors/BUILD.bazel b/swift/extractor/visitors/BUILD.bazel
index 47ff082ea0dd..1c8c184a8bf2 100644
--- a/swift/extractor/visitors/BUILD.bazel
+++ b/swift/extractor/visitors/BUILD.bazel
@@ -7,6 +7,6 @@ swift_cc_library(
     visibility = ["//swift:__subpackages__"],
     deps = [
         "//swift/extractor/infra",
-        "//swift/tools/prebuilt:swift-llvm-support",
+        "//swift/third_party/swift-llvm-support",
     ],
 )
diff --git a/swift/tools/fishhook/BUILD.bazel b/swift/third_party/fishhook/BUILD.bazel
similarity index 100%
rename from swift/tools/fishhook/BUILD.bazel
rename to swift/third_party/fishhook/BUILD.bazel
diff --git a/swift/tools/fishhook/BUILD.fishhook.bazel b/swift/third_party/fishhook/BUILD.fishhook.bazel
similarity index 100%
rename from swift/tools/fishhook/BUILD.fishhook.bazel
rename to swift/third_party/fishhook/BUILD.fishhook.bazel
diff --git a/swift/tools/prebuilt/BUILD.bazel b/swift/third_party/swift-llvm-support/BUILD.bazel
similarity index 100%
rename from swift/tools/prebuilt/BUILD.bazel
rename to swift/third_party/swift-llvm-support/BUILD.bazel
diff --git a/swift/tools/prebuilt/BUILD.swift-prebuilt.bazel b/swift/third_party/swift-llvm-support/BUILD.swift-prebuilt.bazel
similarity index 100%
rename from swift/tools/prebuilt/BUILD.swift-prebuilt.bazel
rename to swift/third_party/swift-llvm-support/BUILD.swift-prebuilt.bazel