diff --git a/site/docs/external.md b/site/docs/external.md
index 34ffe1b9a2ef31..de935d33be3122 100644
--- a/site/docs/external.md
+++ b/site/docs/external.md
@@ -37,14 +37,14 @@ Bazel provides a tool to help generate these expansive `WORKSPACE` files, called
 `generate_workspace`. Run the following to build the tool and see usage:
 
 ```
-bazel run src/main/java/com/google/devtools/build/workspace:generate_workspace
+bazel run //src/tools/generate_workspace
 ```
 
 You can either specify directories containing Bazel projects (i.e., `WORKSPACE`
 files) or Maven projects (i.e., `pom.xml` files).  For example:
 
 ```bash
-$ bazel run src/main/java/com/google/devtools/build/workspace:generate_workspace -- \
+$ bazel run //src/tools/generate_workspace -- \
 >    --maven_project=/path/to/my/project \
 >    --bazel_project=/path/to/skunkworks \
 >    --bazel_project=/path/to/teleporter/project
diff --git a/src/BUILD b/src/BUILD
index e9c0f3d8518e77..3d672ad8f76f6a 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -10,8 +10,8 @@ filegroup(
         "//conditions:default": ["//src/main/native:libunix.so"],
     }),
     visibility = [
-        "//src/main/java/com/google/devtools/build/workspace:__pkg__",
         "//src/test/java:__pkg__",
+        "//src/tools/generate_workspace:__pkg__",
     ],
 )
 
diff --git a/src/main/java/BUILD b/src/main/java/BUILD
index 357f84386753f3..5b2be772ea1983 100644
--- a/src/main/java/BUILD
+++ b/src/main/java/BUILD
@@ -419,8 +419,8 @@ java_library(
         "//third_party:jquery",
     ],
     visibility = [
-        "//src/main/java/com/google/devtools/build/workspace:__pkg__",
         "//src/test/java:__subpackages__",
+        "//src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace:__pkg__",
     ],
     runtime_deps = [
         "//third_party:aether",
diff --git a/src/main/java/com/google/devtools/build/workspace/BUILD b/src/main/java/com/google/devtools/build/workspace/BUILD
deleted file mode 100644
index d503e3895cc727..00000000000000
--- a/src/main/java/com/google/devtools/build/workspace/BUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-java_binary(
-    name = "generate_workspace",
-    data = ["//src:libunix"],
-    jvm_flags = ["-Djava.library.path=$(GENDIR)/src/main/native"],
-    main_class = "com.google.devtools.build.workspace.GenerateWorkspace",
-    visibility = ["//visibility:public"],
-    runtime_deps = [":workspace"],
-)
-
-java_library(
-    name = "workspace",
-    srcs = glob(["*.java"]),
-    deps = [
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:bazel-core",
-        "//src/main/java:buildtool-runtime",
-        "//src/main/java:events",
-        "//src/main/java:options",
-        "//src/main/java:packages",
-        "//src/main/java:vfs",
-        "//src/main/java/com/google/devtools/build/workspace/maven",
-        "//src/main/java/com/google/devtools/build/workspace/maven:rule",
-        "//third_party:guava",
-        "//third_party:maven_model",
-    ],
-)
diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD
index fff3bb4cbf50c1..67879a50d807c2 100644
--- a/src/test/shell/bazel/BUILD
+++ b/src/test/shell/bazel/BUILD
@@ -174,7 +174,7 @@ sh_test(
     srcs = ["generate_workspace_test.sh"],
     data = [
         ":test-deps",
-        "//src/main/java/com/google/devtools/build/workspace:generate_workspace",
+        "//src/tools/generate_workspace",
     ],
 )
 
diff --git a/src/test/shell/bazel/generate_workspace_test.sh b/src/test/shell/bazel/generate_workspace_test.sh
index 893c4b502ddc73..ddfc41aa4316cb 100755
--- a/src/test/shell/bazel/generate_workspace_test.sh
+++ b/src/test/shell/bazel/generate_workspace_test.sh
@@ -41,7 +41,7 @@ function tear_down() {
 }
 
 function generate_workspace() {
-  ${bazel_data}/src/main/java/com/google/devtools/build/workspace/generate_workspace $@
+  ${bazel_data}/src/tools/generate_workspace/generate_workspace $@
 }
 
 # Takes: groupId, artifactId, and version.
@@ -123,8 +123,8 @@ function test_pom() {
 </project>
 EOF
 
-  ${bazel_data}/src/main/java/com/google/devtools/build/workspace/generate_workspace \
-    --maven_project=$TEST_TMPDIR &> $TEST_log || fail "generating workspace failed"
+  generate_workspace --maven_project=$TEST_TMPDIR &> $TEST_log \
+    || fail "generating workspace failed"
 
   cat $(cat $TEST_log | tail -n 2 | head -n 1) > ws
   cat $(cat $TEST_log | tail -n 1) > build
@@ -169,8 +169,8 @@ function test_profile() {
 </project>
 EOF
 
-  ${bazel_data}/src/main/java/com/google/devtools/build/workspace/generate_workspace \
-    --maven_project=$TEST_TMPDIR &> $TEST_log || fail "generating workspace failed"
+  generate_workspace --maven_project=$TEST_TMPDIR &> $TEST_log \
+    || fail "generating workspace failed"
 }
 
 function test_submodules() {
diff --git a/src/tools/generate_workspace/BUILD b/src/tools/generate_workspace/BUILD
new file mode 100644
index 00000000000000..749c97fba49992
--- /dev/null
+++ b/src/tools/generate_workspace/BUILD
@@ -0,0 +1,8 @@
+java_binary(
+    name = "generate_workspace",
+    data = ["//src:libunix"],
+    jvm_flags = ["-Djava.library.path=$(GENDIR)/src/main/native"],
+    main_class = "com.google.devtools.build.workspace.GenerateWorkspace",
+    visibility = ["//visibility:public"],
+    runtime_deps = ["//src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace"],
+)
diff --git a/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/BUILD b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/BUILD
new file mode 100644
index 00000000000000..0c3211662a3d80
--- /dev/null
+++ b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/BUILD
@@ -0,0 +1,18 @@
+java_library(
+    name = "workspace",
+    srcs = glob(["*.java"]),
+    visibility = ["//src/tools/generate_workspace:__pkg__"],
+    deps = [
+        "//src/main/java:analysis-exec-rules-skyframe",
+        "//src/main/java:bazel-core",
+        "//src/main/java:buildtool-runtime",
+        "//src/main/java:events",
+        "//src/main/java:options",
+        "//src/main/java:packages",
+        "//src/main/java:vfs",
+        "//src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven",
+        "//src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven:rule",
+        "//third_party:guava",
+        "//third_party:maven_model",
+    ],
+)
diff --git a/src/main/java/com/google/devtools/build/workspace/GenerateWorkspace.java b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/GenerateWorkspace.java
similarity index 100%
rename from src/main/java/com/google/devtools/build/workspace/GenerateWorkspace.java
rename to src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/GenerateWorkspace.java
diff --git a/src/main/java/com/google/devtools/build/workspace/GenerateWorkspaceOptions.java b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/GenerateWorkspaceOptions.java
similarity index 100%
rename from src/main/java/com/google/devtools/build/workspace/GenerateWorkspaceOptions.java
rename to src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/GenerateWorkspaceOptions.java
diff --git a/src/main/java/com/google/devtools/build/workspace/Resolver.java b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/Resolver.java
similarity index 100%
rename from src/main/java/com/google/devtools/build/workspace/Resolver.java
rename to src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/Resolver.java
diff --git a/src/main/java/com/google/devtools/build/workspace/maven/BUILD b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/BUILD
similarity index 73%
rename from src/main/java/com/google/devtools/build/workspace/maven/BUILD
rename to src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/BUILD
index 8844f937a117fc..b7dc566e41641e 100644
--- a/src/main/java/com/google/devtools/build/workspace/maven/BUILD
+++ b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/BUILD
@@ -5,8 +5,8 @@ java_library(
         "Resolver.java",
     ],
     visibility = [
-        "//src/main/java/com/google/devtools/build/workspace:__pkg__",
-        "//src/test/java/com/google/devtools/build/workspace:__pkg__",
+        "//src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace:__pkg__",
+        "//src/tools/generate_workspace/src/test/java/com/google/devtools/build/workspace:__pkg__",
     ],
     runtime_deps = [
         "//third_party:maven_model",
@@ -28,7 +28,7 @@ java_library(
     name = "rule",
     srcs = ["Rule.java"],
     visibility = [
-        "//src/main/java/com/google/devtools/build:__subpackages__",
+        "//src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace:__pkg__",
     ],
     deps = [
         "//src/main/java:events",
diff --git a/src/main/java/com/google/devtools/build/workspace/maven/DefaultModelResolver.java b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/DefaultModelResolver.java
similarity index 100%
rename from src/main/java/com/google/devtools/build/workspace/maven/DefaultModelResolver.java
rename to src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/DefaultModelResolver.java
diff --git a/src/main/java/com/google/devtools/build/workspace/maven/Resolver.java b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/Resolver.java
similarity index 100%
rename from src/main/java/com/google/devtools/build/workspace/maven/Resolver.java
rename to src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/Resolver.java
diff --git a/src/main/java/com/google/devtools/build/workspace/maven/Rule.java b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/Rule.java
similarity index 100%
rename from src/main/java/com/google/devtools/build/workspace/maven/Rule.java
rename to src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/Rule.java