diff --git a/java/google/registry/BUILD b/java/google/registry/BUILD
index 6e173e6f1..3358eb688 100644
--- a/java/google/registry/BUILD
+++ b/java/google/registry/BUILD
@@ -16,6 +16,15 @@ package_group(
     ],
 )
 
+# Visibility group for rules that are //visibility:public on GitHub but project
+# scoped in Google's internal repository.
+package_group(
+    name = "public",
+    packages = [
+        "//visibility:public",
+    ],
+)
+
 
 
 
diff --git a/java/google/registry/backup/BUILD b/java/google/registry/backup/BUILD
index 0240f1ec8..aa8be5faa 100644
--- a/java/google/registry/backup/BUILD
+++ b/java/google/registry/backup/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
diff --git a/java/google/registry/batch/BUILD b/java/google/registry/batch/BUILD
index 14c257aa0..e4cb5468e 100644
--- a/java/google/registry/batch/BUILD
+++ b/java/google/registry/batch/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
diff --git a/java/google/registry/bigquery/BUILD b/java/google/registry/bigquery/BUILD
index 7838a343c..b7d6ed0c8 100644
--- a/java/google/registry/bigquery/BUILD
+++ b/java/google/registry/bigquery/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
@@ -8,7 +8,6 @@ licenses(["notice"])  # Apache 2.0
 java_library(
     name = "bigquery",
     srcs = glob(["*.java"]),
-    visibility = ["//visibility:public"],
     deps = [
         "//apiserving/discoverydata/bigquery:bigqueryv2",
         "//java/com/google/api/client/extensions/appengine/http",
diff --git a/java/google/registry/braintree/BUILD b/java/google/registry/braintree/BUILD
index 0d73f04cd..129bdf567 100644
--- a/java/google/registry/braintree/BUILD
+++ b/java/google/registry/braintree/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
@@ -8,7 +8,6 @@ licenses(["notice"])  # Apache 2.0
 java_library(
     name = "braintree",
     srcs = glob(["*.java"]),
-    visibility = ["//visibility:public"],
     deps = [
         "//java/com/google/common/base",
         "//third_party/java/braintree",
diff --git a/java/google/registry/config/BUILD b/java/google/registry/config/BUILD
index 77c763103..977adbdc8 100644
--- a/java/google/registry/config/BUILD
+++ b/java/google/registry/config/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
@@ -8,7 +8,6 @@ licenses(["notice"])  # Apache 2.0
 java_library(
     name = "config",
     srcs = glob(["*.java"]),
-    visibility = ["//visibility:public"],
     deps = [
         "//java/com/google/common/annotations",
         "//java/com/google/common/base",
diff --git a/java/google/registry/cron/BUILD b/java/google/registry/cron/BUILD
index 1c3110777..ee7b48a80 100644
--- a/java/google/registry/cron/BUILD
+++ b/java/google/registry/cron/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
diff --git a/java/google/registry/dns/BUILD b/java/google/registry/dns/BUILD
index eb3af1047..ca6c914a5 100644
--- a/java/google/registry/dns/BUILD
+++ b/java/google/registry/dns/BUILD
@@ -2,7 +2,7 @@
 #   Routines to publish authoritative DNS.
 
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
diff --git a/java/google/registry/dns/writer/BUILD b/java/google/registry/dns/writer/BUILD
index 258362341..a47cc0694 100644
--- a/java/google/registry/dns/writer/BUILD
+++ b/java/google/registry/dns/writer/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
@@ -7,9 +7,7 @@ licenses(["notice"])  # Apache 2.0
 
 java_library(
     name = "writer",
-    srcs = glob(
-        ["*.java"],
-    ),
+    srcs = glob(["*.java"]),
     deps = [
         "//java/com/google/common/annotations",
         "//java/com/google/common/base",
diff --git a/java/google/registry/dns/writer/clouddns/BUILD b/java/google/registry/dns/writer/clouddns/BUILD
index 6c6be6b24..88b6e5fb4 100644
--- a/java/google/registry/dns/writer/clouddns/BUILD
+++ b/java/google/registry/dns/writer/clouddns/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
diff --git a/java/google/registry/dns/writer/dnsupdate/BUILD b/java/google/registry/dns/writer/dnsupdate/BUILD
index ee7bfecf4..5161e3439 100644
--- a/java/google/registry/dns/writer/dnsupdate/BUILD
+++ b/java/google/registry/dns/writer/dnsupdate/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
diff --git a/java/google/registry/export/BUILD b/java/google/registry/export/BUILD
index 9a0c99540..255aa99bf 100644
--- a/java/google/registry/export/BUILD
+++ b/java/google/registry/export/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
diff --git a/java/google/registry/export/sheet/BUILD b/java/google/registry/export/sheet/BUILD
index 8bbb2f608..671504f2c 100644
--- a/java/google/registry/export/sheet/BUILD
+++ b/java/google/registry/export/sheet/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
diff --git a/java/google/registry/gcs/BUILD b/java/google/registry/gcs/BUILD
index 34fe76f48..51e188599 100644
--- a/java/google/registry/gcs/BUILD
+++ b/java/google/registry/gcs/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
@@ -8,7 +8,6 @@ licenses(["notice"])  # Apache 2.0
 java_library(
     name = "gcs",
     srcs = glob(["*.java"]),
-    visibility = ["//visibility:public"],
     deps = [
         "//java/com/google/common/base",
         "//java/com/google/common/collect",
diff --git a/java/google/registry/groups/BUILD b/java/google/registry/groups/BUILD
index 7c4616408..eeaf5bbf6 100644
--- a/java/google/registry/groups/BUILD
+++ b/java/google/registry/groups/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
diff --git a/java/google/registry/keyring/api/BUILD b/java/google/registry/keyring/api/BUILD
index fb0697803..f8f20cda2 100644
--- a/java/google/registry/keyring/api/BUILD
+++ b/java/google/registry/keyring/api/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
@@ -9,7 +9,6 @@ java_library(
     name = "api",
     srcs = glob(["*.java"]),
     resources = glob(["*.asc"]),
-    visibility = ["//visibility:public"],
     deps = [
         "//java/com/google/common/base",
         "//java/com/google/common/io",
diff --git a/java/google/registry/loadtest/BUILD b/java/google/registry/loadtest/BUILD
index 848512f5d..4e5438596 100644
--- a/java/google/registry/loadtest/BUILD
+++ b/java/google/registry/loadtest/BUILD
@@ -1,19 +1,14 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
 
 
-filegroup(
-    name = "templates",
-    srcs = glob(["templates/*.xml"]),
-)
-
 java_library(
     name = "loadtest",
     srcs = glob(["*.java"]),
-    resources = [":templates"],
+    resources = glob(["templates/*.xml"]),
     deps = [
         "//java/com/google/common/base",
         "//java/com/google/common/collect",
diff --git a/java/google/registry/mapreduce/BUILD b/java/google/registry/mapreduce/BUILD
index a29762578..d468180a4 100644
--- a/java/google/registry/mapreduce/BUILD
+++ b/java/google/registry/mapreduce/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
@@ -8,7 +8,6 @@ licenses(["notice"])  # Apache 2.0
 java_library(
     name = "mapreduce",
     srcs = glob(["*.java"]),
-    visibility = ["//visibility:public"],
     deps = [
         "//java/com/google/common/annotations",
         "//java/com/google/common/base",
diff --git a/java/google/registry/mapreduce/inputs/BUILD b/java/google/registry/mapreduce/inputs/BUILD
index 9bf93c56b..8d8ea494f 100644
--- a/java/google/registry/mapreduce/inputs/BUILD
+++ b/java/google/registry/mapreduce/inputs/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
@@ -8,7 +8,6 @@ licenses(["notice"])  # Apache 2.0
 java_library(
     name = "inputs",
     srcs = glob(["*.java"]),
-    visibility = ["//visibility:public"],
     deps = [
         "//java/com/google/common/annotations",
         "//java/com/google/common/base",
diff --git a/java/google/registry/model/BUILD b/java/google/registry/model/BUILD
index 714adc27a..bc53204a9 100644
--- a/java/google/registry/model/BUILD
+++ b/java/google/registry/model/BUILD
@@ -4,65 +4,6 @@ package(
 
 licenses(["notice"])  # Apache 2.0
 
-FIELD_EXPOSERS = [
-    "FieldExposer.java",
-    "billing/FieldExposer.java",
-    "common/FieldExposer.java",
-    "contact/FieldExposer.java",
-    "dns/FieldExposer.java",
-    "domain/FieldExposer.java",
-    "domain/allocate/FieldExposer.java",
-    "domain/fee/FieldExposer.java",
-    "domain/fee06/FieldExposer.java",
-    "domain/fee11/FieldExposer.java",
-    "domain/fee12/FieldExposer.java",
-    "domain/flags/FieldExposer.java",
-    "domain/launch/FieldExposer.java",
-    "domain/rgp/FieldExposer.java",
-    "domain/secdns/FieldExposer.java",
-    "eppcommon/FieldExposer.java",
-    "eppinput/FieldExposer.java",
-    "eppoutput/FieldExposer.java",
-    "export/FieldExposer.java",
-    "host/FieldExposer.java",
-    "index/FieldExposer.java",
-    "mark/FieldExposer.java",
-    "ofy/FieldExposer.java",
-    "poll/FieldExposer.java",
-    "registrar/FieldExposer.java",
-    "registry/FieldExposer.java",
-    "registry/label/FieldExposer.java",
-    "reporting/FieldExposer.java",
-    "server/FieldExposer.java",
-    "rde/FieldExposer.java",
-    "smd/FieldExposer.java",
-    "tmch/FieldExposer.java",
-    "transfer/FieldExposer.java",
-    "translators/FieldExposer.java",
-]
-
-
-# Generate FieldExposer classes to work around AppEngine's security limitations.
-genrule(
-    name = "field_exposers",
-    srcs = ["generate_field_exposer.sh"],
-    outs = FIELD_EXPOSERS,
-    cmd = "for FILE in $(OUTS); do " +
-          "./$(location generate_field_exposer.sh) $$FILE >> $$FILE;" +
-          "done",
-    visibility = ["//visibility:private"],
-)
-
-# Generate a registry of FieldExposers.
-genrule(
-    name = "field_exposer_registry",
-    srcs = ["generate_field_exposer_registry.sh"],
-    outs = ["FieldExposerRegistry.java"],
-    cmd = "./$(location generate_field_exposer_registry.sh) \"" +
-          ", ".join(FIELD_EXPOSERS) +
-          ");\" >\"$@\"",
-    visibility = ["//visibility:private"],
-)
 
 java_library(
     name = "model",
@@ -70,11 +11,12 @@ java_library(
         "*.java",
         "*/*.java",
         "*/*/*.java",
-    ]) + ["FieldExposerRegistry.java"] + FIELD_EXPOSERS,
+    ]) + [
+        "FieldExposerRegistry.java",
+        ":field_exposers",
+    ],
     visibility = ["//visibility:public"],
     deps = [
-        ":field_exposer_registry",
-        ":field_exposers",
         "//java/com/google/common/annotations",
         "//java/com/google/common/base",
         "//java/com/google/common/cache",
@@ -100,3 +42,57 @@ java_library(
         "//java/google/registry/xml",
     ],
 )
+
+# Generate FieldExposer classes to work around AppEngine's security limitations.
+genrule(
+    name = "field_exposers",
+    srcs = ["generate_field_exposer.sh"],
+    outs = [
+        "FieldExposer.java",
+        "billing/FieldExposer.java",
+        "common/FieldExposer.java",
+        "contact/FieldExposer.java",
+        "dns/FieldExposer.java",
+        "domain/FieldExposer.java",
+        "domain/allocate/FieldExposer.java",
+        "domain/fee/FieldExposer.java",
+        "domain/fee06/FieldExposer.java",
+        "domain/fee11/FieldExposer.java",
+        "domain/fee12/FieldExposer.java",
+        "domain/flags/FieldExposer.java",
+        "domain/launch/FieldExposer.java",
+        "domain/rgp/FieldExposer.java",
+        "domain/secdns/FieldExposer.java",
+        "eppcommon/FieldExposer.java",
+        "eppinput/FieldExposer.java",
+        "eppoutput/FieldExposer.java",
+        "export/FieldExposer.java",
+        "host/FieldExposer.java",
+        "index/FieldExposer.java",
+        "mark/FieldExposer.java",
+        "ofy/FieldExposer.java",
+        "poll/FieldExposer.java",
+        "rde/FieldExposer.java",
+        "registrar/FieldExposer.java",
+        "registry/FieldExposer.java",
+        "registry/label/FieldExposer.java",
+        "reporting/FieldExposer.java",
+        "server/FieldExposer.java",
+        "smd/FieldExposer.java",
+        "tmch/FieldExposer.java",
+        "transfer/FieldExposer.java",
+        "translators/FieldExposer.java",
+    ],
+    cmd = "for FILE in $(OUTS); do\n" +
+          "  $(location generate_field_exposer.sh) $$FILE >> $$FILE\n" +
+          "done",
+)
+
+# Generate a registry of FieldExposers.
+genrule(
+    name = "field_exposer_registry",
+    srcs = [":field_exposers"],
+    outs = ["FieldExposerRegistry.java"],
+    cmd = "$(location generate_field_exposer_registry.sh) $(SRCS) >$@",
+    tools = ["generate_field_exposer_registry.sh"],
+)
diff --git a/java/google/registry/model/generate_field_exposer_registry.sh b/java/google/registry/model/generate_field_exposer_registry.sh
index 78b362a03..3e5d314ec 100755
--- a/java/google/registry/model/generate_field_exposer_registry.sh
+++ b/java/google/registry/model/generate_field_exposer_registry.sh
@@ -22,10 +22,11 @@ import com.google.common.collect.ImmutableList;\n\n\
 /** A registry of all {@link AbstractFieldExposer} impls. */\n\
 class FieldExposerRegistry {\n\
   static ImmutableList<AbstractFieldExposer> getFieldExposers() {\n\
-    return ImmutableList.of(\n"
+    return new ImmutableList.Builder<AbstractFieldExposer>()\n"
 for FILE in $@; do
   echo $FILE | sed \
-      -e 's/\(.*\).java/        new google.registry.model.\1()/' \
-      -e 's/\//./g'
+      -e 's!^.*/java/\(.*\)\.java$!        .add(new \1())!' \
+      -e 's!/!.!g'
 done
+printf "        .build();\n"
 printf "  }\n}\n"
diff --git a/java/google/registry/monitoring/metrics/BUILD b/java/google/registry/monitoring/metrics/BUILD
index 2b58e2426..a5d91aeaa 100644
--- a/java/google/registry/monitoring/metrics/BUILD
+++ b/java/google/registry/monitoring/metrics/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
diff --git a/java/google/registry/monitoring/whitebox/BUILD b/java/google/registry/monitoring/whitebox/BUILD
index 4c62b40e8..c03d5374f 100644
--- a/java/google/registry/monitoring/whitebox/BUILD
+++ b/java/google/registry/monitoring/whitebox/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
diff --git a/java/google/registry/pricing/BUILD b/java/google/registry/pricing/BUILD
index d11a79a06..ca667132c 100644
--- a/java/google/registry/pricing/BUILD
+++ b/java/google/registry/pricing/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
diff --git a/java/google/registry/rdap/BUILD b/java/google/registry/rdap/BUILD
index c607814bc..312efc2b1 100644
--- a/java/google/registry/rdap/BUILD
+++ b/java/google/registry/rdap/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
diff --git a/java/google/registry/rde/BUILD b/java/google/registry/rde/BUILD
index b36f27e8e..2c3125c0a 100644
--- a/java/google/registry/rde/BUILD
+++ b/java/google/registry/rde/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
diff --git a/java/google/registry/request/BUILD b/java/google/registry/request/BUILD
index 0f540d9f2..6fd7efb3b 100644
--- a/java/google/registry/request/BUILD
+++ b/java/google/registry/request/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
@@ -11,7 +11,6 @@ java_library(
         ["*.java"],
         exclude = ["Modules.java"],
     ),
-    visibility = ["//visibility:public"],
     deps = [
         "//java/com/google/common/annotations",
         "//java/com/google/common/base",
@@ -35,7 +34,6 @@ java_library(
 java_library(
     name = "modules",
     srcs = ["Modules.java"],
-    visibility = ["//visibility:public"],
     deps = [
         "//java/com/google/api/client/extensions/appengine/http",
         "//java/com/google/api/client/googleapis/auth/oauth2",
diff --git a/java/google/registry/security/BUILD b/java/google/registry/security/BUILD
index 4fc35b51a..1100907d5 100644
--- a/java/google/registry/security/BUILD
+++ b/java/google/registry/security/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
@@ -11,7 +11,6 @@ java_library(
         ["*.java"],
         exclude = glob(["*Servlet.java"]),
     ),
-    visibility = ["//visibility:public"],
     deps = [
         "//java/com/google/common/base",
         "//java/com/google/common/collect",
diff --git a/java/google/registry/storage/drive/BUILD b/java/google/registry/storage/drive/BUILD
index bc8ddc7ad..bb3bb6cce 100644
--- a/java/google/registry/storage/drive/BUILD
+++ b/java/google/registry/storage/drive/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
diff --git a/java/google/registry/tmch/BUILD b/java/google/registry/tmch/BUILD
index 8e78780e4..f3e59395c 100644
--- a/java/google/registry/tmch/BUILD
+++ b/java/google/registry/tmch/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
diff --git a/java/google/registry/tools/BUILD b/java/google/registry/tools/BUILD
index d029ff1dc..58349dcbc 100644
--- a/java/google/registry/tools/BUILD
+++ b/java/google/registry/tools/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
diff --git a/java/google/registry/tools/params/BUILD b/java/google/registry/tools/params/BUILD
index a727ab9d7..24ee98a7d 100644
--- a/java/google/registry/tools/params/BUILD
+++ b/java/google/registry/tools/params/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
diff --git a/java/google/registry/tools/server/BUILD b/java/google/registry/tools/server/BUILD
index 514cbff8e..460040b1b 100644
--- a/java/google/registry/tools/server/BUILD
+++ b/java/google/registry/tools/server/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
@@ -7,9 +7,7 @@ licenses(["notice"])  # Apache 2.0
 
 java_library(
     name = "server",
-    srcs = glob([
-        "*.java",
-    ]),
+    srcs = glob(["*.java"]),
     deps = [
         "//java/com/google/common/annotations",
         "//java/com/google/common/base",
diff --git a/java/google/registry/ui/BUILD b/java/google/registry/ui/BUILD
index e6f5aff80..652c9ad13 100644
--- a/java/google/registry/ui/BUILD
+++ b/java/google/registry/ui/BUILD
@@ -69,6 +69,7 @@ zip_file(
 java_library(
     name = "ui",
     srcs = glob(["*.java"]),
+    visibility = ["//visibility:public"],
     deps = [
         "//java/com/google/common/base",
         "//third_party/java/appengine:appengine-api",
diff --git a/java/google/registry/ui/forms/BUILD b/java/google/registry/ui/forms/BUILD
index 226429d81..57f2b5ad3 100644
--- a/java/google/registry/ui/forms/BUILD
+++ b/java/google/registry/ui/forms/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
@@ -8,7 +8,6 @@ licenses(["notice"])  # Apache 2.0
 java_library(
     name = "forms",
     srcs = glob(["*.java"]),
-    visibility = ["//visibility:public"],
     deps = [
         "//java/com/google/common/annotations",
         "//java/com/google/common/base",
diff --git a/java/google/registry/ui/server/registrar/BUILD b/java/google/registry/ui/server/registrar/BUILD
index dc7933085..c54308f57 100644
--- a/java/google/registry/ui/server/registrar/BUILD
+++ b/java/google/registry/ui/server/registrar/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
@@ -12,7 +12,6 @@ java_library(
         "//java/google/registry/ui/css:registrar_bin.css.js",
         "//java/google/registry/ui/css:registrar_dbg.css.js",
     ],
-    visibility = ["//visibility:public"],
     deps = [
         "//java/com/google/common/annotations",
         "//java/com/google/common/base",
diff --git a/java/google/registry/util/BUILD b/java/google/registry/util/BUILD
index 116a47140..e79160007 100644
--- a/java/google/registry/util/BUILD
+++ b/java/google/registry/util/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
@@ -8,7 +8,6 @@ licenses(["notice"])  # Apache 2.0
 java_library(
     name = "util",
     srcs = glob(["*.java"]),
-    visibility = ["//visibility:public"],
     deps = [
         "//java/com/google/common/annotations",
         "//java/com/google/common/base",
diff --git a/java/google/registry/whois/BUILD b/java/google/registry/whois/BUILD
index 4ee051528..2fb9b717a 100644
--- a/java/google/registry/whois/BUILD
+++ b/java/google/registry/whois/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
@@ -8,7 +8,6 @@ licenses(["notice"])  # Apache 2.0
 java_library(
     name = "whois",
     srcs = glob(["*.java"]),
-    visibility = ["//visibility:public"],
     deps = [
         "//java/com/google/common/annotations",
         "//java/com/google/common/base",
diff --git a/java/google/registry/xjc/BUILD b/java/google/registry/xjc/BUILD
index f4eeb8d21..1fb67f89d 100644
--- a/java/google/registry/xjc/BUILD
+++ b/java/google/registry/xjc/BUILD
@@ -7,6 +7,18 @@ licenses(["notice"])  # Apache 2.0
 load("//java/google/registry/xjc:generated_files.bzl", "pkginfo_generated_files", "xjc_generated_files")
 
 
+java_library(
+    name = "xjc",
+    srcs = glob(["*.java"]) + xjc_generated_files + pkginfo_generated_files,
+    visibility = ["//visibility:public"],
+    deps = [
+        "//java/com/google/common/collect",
+        "//third_party/java/joda_time",
+        "//third_party/java/jsr305_annotations",
+        "//java/google/registry/xml",
+    ],
+)
+
 sh_binary(
     name = "list_generated_files",
     srcs = ["list_generated_files.sh"],
@@ -15,7 +27,6 @@ sh_binary(
         "//third_party/java/jaxb:jaxb-xjc",
         "//java/google/registry/xml:xml_schema_files",
     ],
-    visibility = ["//visibility:private"],
 )
 
 genrule(
@@ -42,13 +53,11 @@ genrule(
         "rm -rf $$TMP",
     ]),
     tools = ["//third_party/java/jaxb:jaxb-xjc"],
-    visibility = ["//visibility:private"],
 )
 
 sh_binary(
     name = "make_pkginfo",
     srcs = ["make_pkginfo.sh"],
-    visibility = ["//visibility:private"],
 )
 
 genrule(
@@ -60,16 +69,4 @@ genrule(
         ":jaxb_srcs",
         ":make_pkginfo",
     ],
-    visibility = ["//visibility:private"],
-)
-
-java_library(
-    name = "xjc",
-    srcs = glob(["*.java"]) + xjc_generated_files + pkginfo_generated_files,
-    deps = [
-        "//java/com/google/common/collect",
-        "//third_party/java/joda_time",
-        "//third_party/java/jsr305_annotations",
-        "//java/google/registry/xml",
-    ],
 )
diff --git a/java/google/registry/xml/BUILD b/java/google/registry/xml/BUILD
index f843d5958..8d8dc0292 100644
--- a/java/google/registry/xml/BUILD
+++ b/java/google/registry/xml/BUILD
@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
diff --git a/javatests/google/registry/server/BUILD b/javatests/google/registry/server/BUILD
index 8f96b546b..8ad85c69f 100644
--- a/javatests/google/registry/server/BUILD
+++ b/javatests/google/registry/server/BUILD
@@ -1,6 +1,6 @@
 package(
     default_testonly = 1,
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
diff --git a/javatests/google/registry/testing/BUILD b/javatests/google/registry/testing/BUILD
index 71fb7b840..2da6f2cec 100644
--- a/javatests/google/registry/testing/BUILD
+++ b/javatests/google/registry/testing/BUILD
@@ -1,6 +1,6 @@
 package(
     default_testonly = 1,
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
@@ -20,7 +20,6 @@ java_library(
         "//java/google/registry:env/common/default/WEB-INF/datastore-indexes.xml",
         "//java/google/registry:env/common/default/WEB-INF/queue.xml",
     ] + glob(["*.csv"]),
-    visibility = ["//visibility:public"],
     deps = [
         "//java/com/google/common/annotations",
         "//java/com/google/common/base",
diff --git a/javatests/google/registry/testing/mapreduce/BUILD b/javatests/google/registry/testing/mapreduce/BUILD
index 799edcaff..36ae79c1f 100644
--- a/javatests/google/registry/testing/mapreduce/BUILD
+++ b/javatests/google/registry/testing/mapreduce/BUILD
@@ -1,6 +1,6 @@
 package(
     default_testonly = 1,
-    default_visibility = ["//java/google/registry:registry_project"],
+    default_visibility = ["//visibility:public"],
 )
 
 licenses(["notice"])  # Apache 2.0
@@ -11,7 +11,6 @@ load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules")
 java_library(
     name = "mapreduce",
     srcs = glob(["*.java"]),
-    visibility = ["//visibility:public"],
     deps = [
         "//java/com/google/common/base",
         "//java/com/google/common/collect",