diff --git a/google-cloud-clients/google-cloud-automl/pom.xml b/google-cloud-clients/google-cloud-automl/pom.xml
index 95c762495c7e..dd91f77d1e87 100644
--- a/google-cloud-clients/google-cloud-automl/pom.xml
+++ b/google-cloud-clients/google-cloud-automl/pom.xml
@@ -5,7 +5,7 @@
   <version>0.55.2-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-automl:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Auto ML</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-automl</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-automl</url>
   <description>
     Java idiomatic client for Google Cloud Auto ML
   </description>
diff --git a/google-cloud-clients/google-cloud-bigquery/pom.xml b/google-cloud-clients/google-cloud-bigquery/pom.xml
index 933e08bd1c6b..f9a1be68bb43 100644
--- a/google-cloud-clients/google-cloud-bigquery/pom.xml
+++ b/google-cloud-clients/google-cloud-bigquery/pom.xml
@@ -5,7 +5,7 @@
   <version>1.37.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquery:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud BigQuery</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bigquery</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-bigquery</url>
   <description>
     Java idiomatic client for Google Cloud BigQuery.
   </description>
diff --git a/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml b/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml
index b892fa1d0ed7..edbddb9d2c8b 100644
--- a/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml
+++ b/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml
@@ -5,7 +5,7 @@
   <version>0.55.2-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquerydatatransfer:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Bigquery Data Transfer</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bigquerydatatransfer</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-bigquerydatatransfer</url>
   <description>
     Java idiomatic client for Google Cloud Bigquery Data Transfer.
   </description>
diff --git a/google-cloud-clients/google-cloud-bigtable/pom.xml b/google-cloud-clients/google-cloud-bigtable/pom.xml
index 9500d9296634..7895bc9f949b 100644
--- a/google-cloud-clients/google-cloud-bigtable/pom.xml
+++ b/google-cloud-clients/google-cloud-bigtable/pom.xml
@@ -5,7 +5,7 @@
   <version>0.55.2-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Bigtable</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bigtable</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-bigtable</url>
   <description>
     Java idiomatic client for Google Cloud Bigtable.
   </description>
diff --git a/google-cloud-clients/google-cloud-compute/pom.xml b/google-cloud-clients/google-cloud-compute/pom.xml
index aa627b08bc54..95b077fc4e1e 100644
--- a/google-cloud-clients/google-cloud-compute/pom.xml
+++ b/google-cloud-clients/google-cloud-compute/pom.xml
@@ -5,7 +5,7 @@
   <version>0.55.2-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-compute:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Compute</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-compute</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-compute</url>
   <description>
     Java idiomatic client for Google Cloud Compute Engine.
   </description>
diff --git a/google-cloud-clients/google-cloud-container/pom.xml b/google-cloud-clients/google-cloud-container/pom.xml
index c977e3f52214..7b273af35149 100644
--- a/google-cloud-clients/google-cloud-container/pom.xml
+++ b/google-cloud-clients/google-cloud-container/pom.xml
@@ -5,7 +5,7 @@
   <version>0.55.2-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-container:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Container</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-container</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-container</url>
   <description>
     Java idiomatic client for Google Cloud Container.
   </description>
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/pom.xml b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/pom.xml
index c9905bf1a23d..f727e0444f78 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback/pom.xml
@@ -8,7 +8,7 @@
   <version>0.55.2-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging-logback:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Logging Logback Appender</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib/google-cloud-logging-logback</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-contrib/google-cloud-logging-logback</url>
   <description>
     Logback support for Google Cloud Logging
   </description>
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml b/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml
index 2e2f54fe22c2..e1964856d7ca 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml
@@ -5,7 +5,7 @@
   <version>0.55.2-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-nio-examples:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud NIO Examples</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib/google-cloud-nio-examples</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples</url>
   <description>
     Demonstrates how to use the google-cloud-nio jar to add Google Cloud Storage functionality to legacy code.
   </description>
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
index 354eff42cab0..cc2a4e0c6fc3 100644
--- a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
@@ -5,7 +5,7 @@
   <version>0.55.2-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-nio:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud NIO</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib/google-cloud-nio</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-contrib/google-cloud-nio</url>
   <description>
     FileSystemProvider for Java NIO to access Google Cloud Storage transparently.
   </description>
diff --git a/google-cloud-clients/google-cloud-contrib/pom.xml b/google-cloud-clients/google-cloud-contrib/pom.xml
index 55eec0ca9b79..2511ff85bdfd 100644
--- a/google-cloud-clients/google-cloud-contrib/pom.xml
+++ b/google-cloud-clients/google-cloud-contrib/pom.xml
@@ -5,7 +5,7 @@
   <version>0.55.2-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-contrib:current} -->
   <packaging>pom</packaging>
   <name>Google Cloud Contributions</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-contrib</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-contrib</url>
   <description>
     Contains packages that provide higher-level abstraction/functionality for common Google Cloud use cases.
   </description>
diff --git a/google-cloud-clients/google-cloud-core-grpc/pom.xml b/google-cloud-clients/google-cloud-core-grpc/pom.xml
index a5b74748dd29..7b007eb15ec8 100644
--- a/google-cloud-clients/google-cloud-core-grpc/pom.xml
+++ b/google-cloud-clients/google-cloud-core-grpc/pom.xml
@@ -5,7 +5,7 @@
   <version>1.37.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-core-grpc:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Core gRPC</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-grpc</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-grpc</url>
   <description>
     Core gRPC module for the google-cloud.
   </description>
diff --git a/google-cloud-clients/google-cloud-core-http/pom.xml b/google-cloud-clients/google-cloud-core-http/pom.xml
index e1e218082e30..bfd68f3d5ec9 100644
--- a/google-cloud-clients/google-cloud-core-http/pom.xml
+++ b/google-cloud-clients/google-cloud-core-http/pom.xml
@@ -5,7 +5,7 @@
   <version>1.37.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-core-http:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Core HTTP</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-http</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-http</url>
   <description>
     Core http module for the google-cloud.
   </description>
diff --git a/google-cloud-clients/google-cloud-core/pom.xml b/google-cloud-clients/google-cloud-core/pom.xml
index a54d1f548677..60fed4a2afe0 100644
--- a/google-cloud-clients/google-cloud-core/pom.xml
+++ b/google-cloud-clients/google-cloud-core/pom.xml
@@ -5,7 +5,7 @@
   <version>1.37.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-core:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Core</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core</url>
   <description>
     Core module for the google-cloud.
   </description>
diff --git a/google-cloud-clients/google-cloud-dataproc/pom.xml b/google-cloud-clients/google-cloud-dataproc/pom.xml
index de96f10fb280..2a396e703587 100644
--- a/google-cloud-clients/google-cloud-dataproc/pom.xml
+++ b/google-cloud-clients/google-cloud-dataproc/pom.xml
@@ -5,7 +5,7 @@
   <version>0.55.2-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-dataproc:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Dataproc</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dataproc</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-dataproc</url>
   <description>
     Java idiomatic client for Google Cloud Dataproc.
   </description>
diff --git a/google-cloud-clients/google-cloud-datastore/pom.xml b/google-cloud-clients/google-cloud-datastore/pom.xml
index f2eb038c65f8..8c1918c3f8e0 100644
--- a/google-cloud-clients/google-cloud-datastore/pom.xml
+++ b/google-cloud-clients/google-cloud-datastore/pom.xml
@@ -5,7 +5,7 @@
   <version>1.37.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Datastore</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore</url>
   <description>
     Java idiomatic client for Google Cloud Datastore.
   </description>
diff --git a/google-cloud-clients/google-cloud-dialogflow/pom.xml b/google-cloud-clients/google-cloud-dialogflow/pom.xml
index 2c138e026539..7216ca06127a 100644
--- a/google-cloud-clients/google-cloud-dialogflow/pom.xml
+++ b/google-cloud-clients/google-cloud-dialogflow/pom.xml
@@ -5,7 +5,7 @@
   <version>0.55.2-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-dialogflow:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Dialog Flow API</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dialogflow</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-dialogflow</url>
   <description>
     Java idiomatic client for Cloud Dialog Flow API.
   </description>
diff --git a/google-cloud-clients/google-cloud-dlp/pom.xml b/google-cloud-clients/google-cloud-dlp/pom.xml
index 41e369a82715..e3d0a85fb6c4 100644
--- a/google-cloud-clients/google-cloud-dlp/pom.xml
+++ b/google-cloud-clients/google-cloud-dlp/pom.xml
@@ -5,7 +5,7 @@
   <version>0.55.2-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-dlp:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Data Loss Prevention API</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dlp</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-dlp</url>
   <description>
     Java idiomatic client for Cloud Data Loss Prevention API v2.
   </description>
diff --git a/google-cloud-clients/google-cloud-dns/pom.xml b/google-cloud-clients/google-cloud-dns/pom.xml
index 8f8a676db0c2..9ad044aa9210 100644
--- a/google-cloud-clients/google-cloud-dns/pom.xml
+++ b/google-cloud-clients/google-cloud-dns/pom.xml
@@ -7,7 +7,7 @@
   <version>0.55.2-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-dns:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud DNS</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dns</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-dns</url>
   <description>
     Java idiomatic client for Google Cloud DNS.
   </description>
diff --git a/google-cloud-clients/google-cloud-errorreporting/pom.xml b/google-cloud-clients/google-cloud-errorreporting/pom.xml
index 361e8f3c4d20..267d8a8fb89e 100644
--- a/google-cloud-clients/google-cloud-errorreporting/pom.xml
+++ b/google-cloud-clients/google-cloud-errorreporting/pom.xml
@@ -5,7 +5,7 @@
   <version>0.55.2-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-errorreporting:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Error Reporting</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-errorreporting</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-errorreporting</url>
   <description>
     Java idiomatic client for Google Cloud Error Reporting.
   </description>
diff --git a/google-cloud-clients/google-cloud-firestore/pom.xml b/google-cloud-clients/google-cloud-firestore/pom.xml
index 944952110b4c..66a0bae34411 100644
--- a/google-cloud-clients/google-cloud-firestore/pom.xml
+++ b/google-cloud-clients/google-cloud-firestore/pom.xml
@@ -7,7 +7,7 @@
   <version>0.55.2-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Firestore</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-firestore
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-firestore
   </url>
   <description>
     Java idiomatic client for Google Cloud Firestore.
diff --git a/google-cloud-clients/google-cloud-iot/pom.xml b/google-cloud-clients/google-cloud-iot/pom.xml
index 85e4330b43d6..d5604c83a2fb 100644
--- a/google-cloud-clients/google-cloud-iot/pom.xml
+++ b/google-cloud-clients/google-cloud-iot/pom.xml
@@ -5,7 +5,7 @@
   <version>0.55.2-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-iot:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud IoT</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-iot</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-iot</url>
   <description>
     Java idiomatic client for Google Cloud IoT Core
   </description>
diff --git a/google-cloud-clients/google-cloud-kms/pom.xml b/google-cloud-clients/google-cloud-kms/pom.xml
index 78b6ea1b0141..6c2f51cb0dbe 100644
--- a/google-cloud-clients/google-cloud-kms/pom.xml
+++ b/google-cloud-clients/google-cloud-kms/pom.xml
@@ -5,7 +5,7 @@
   <version>0.55.2-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-kms:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud KMS</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-kms</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-kms</url>
   <description>
     Java idiomatic client for Google Cloud KMS
   </description>
diff --git a/google-cloud-clients/google-cloud-language/pom.xml b/google-cloud-clients/google-cloud-language/pom.xml
index 5be2f463b708..ea2810c720ee 100644
--- a/google-cloud-clients/google-cloud-language/pom.xml
+++ b/google-cloud-clients/google-cloud-language/pom.xml
@@ -7,7 +7,7 @@
   <version>1.37.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-language:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Natural Language</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-language
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-language
   </url>
   <description>
     Java idiomatic client for Google Cloud Natural Language.
diff --git a/google-cloud-clients/google-cloud-logging/pom.xml b/google-cloud-clients/google-cloud-logging/pom.xml
index 4ff901e23b79..5efe1a3133e2 100644
--- a/google-cloud-clients/google-cloud-logging/pom.xml
+++ b/google-cloud-clients/google-cloud-logging/pom.xml
@@ -5,7 +5,7 @@
   <version>1.37.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Logging</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-logging</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-logging</url>
   <description>
     Java idiomatic client for Stackdriver Logging.
   </description>
diff --git a/google-cloud-clients/google-cloud-monitoring/pom.xml b/google-cloud-clients/google-cloud-monitoring/pom.xml
index 04b745b098ff..26e507719a18 100644
--- a/google-cloud-clients/google-cloud-monitoring/pom.xml
+++ b/google-cloud-clients/google-cloud-monitoring/pom.xml
@@ -5,7 +5,7 @@
   <version>1.37.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-monitoring:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Monitoring</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-monitoring</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-monitoring</url>
   <description>
     Java idiomatic client for Stackdriver Monitoring.
   </description>
diff --git a/google-cloud-clients/google-cloud-notification/pom.xml b/google-cloud-clients/google-cloud-notification/pom.xml
index 4e61a17f9911..2f791010ad3a 100644
--- a/google-cloud-clients/google-cloud-notification/pom.xml
+++ b/google-cloud-clients/google-cloud-notification/pom.xml
@@ -7,7 +7,7 @@
   <version>0.55.2-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-notification:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Pub/Sub Notifications for GCS</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-notification
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-notification
   </url>
   <description>
     Java idiomatic client for Google Cloud Notification.
diff --git a/google-cloud-clients/google-cloud-os-login/pom.xml b/google-cloud-clients/google-cloud-os-login/pom.xml
index b32bd42fa9b2..40c86736fe5f 100644
--- a/google-cloud-clients/google-cloud-os-login/pom.xml
+++ b/google-cloud-clients/google-cloud-os-login/pom.xml
@@ -5,7 +5,7 @@
   <version>0.55.2-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-os-login:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud OS Login</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-os-login</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-os-login</url>
   <description>
     Java idiomatic client for Google Cloud OS Login.
   </description>
diff --git a/google-cloud-clients/google-cloud-pubsub/pom.xml b/google-cloud-clients/google-cloud-pubsub/pom.xml
index e054d4cd3d64..0504f021db44 100644
--- a/google-cloud-clients/google-cloud-pubsub/pom.xml
+++ b/google-cloud-clients/google-cloud-pubsub/pom.xml
@@ -5,7 +5,7 @@
   <version>1.37.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Pub/Sub</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-pubsub</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-pubsub</url>
   <description>
     Java idiomatic client for Google Cloud Pub/Sub.
   </description>
diff --git a/google-cloud-clients/google-cloud-redis/pom.xml b/google-cloud-clients/google-cloud-redis/pom.xml
index 65648a27c63c..4452ea25521a 100644
--- a/google-cloud-clients/google-cloud-redis/pom.xml
+++ b/google-cloud-clients/google-cloud-redis/pom.xml
@@ -5,7 +5,7 @@
   <version>0.55.2-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-redis:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Redis</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-redis</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-redis</url>
   <description>
     Java idiomatic client for Google Cloud Redis.
   </description>
diff --git a/google-cloud-clients/google-cloud-resourcemanager/pom.xml b/google-cloud-clients/google-cloud-resourcemanager/pom.xml
index dfb3f66d6400..248922c31aaf 100644
--- a/google-cloud-clients/google-cloud-resourcemanager/pom.xml
+++ b/google-cloud-clients/google-cloud-resourcemanager/pom.xml
@@ -5,7 +5,7 @@
   <version>0.55.2-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-resourcemanager:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Resource Manager</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-resourcemanager</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-resourcemanager</url>
   <description>
     Java idiomatic client for Google Cloud Resource Manager.
   </description>
diff --git a/google-cloud-clients/google-cloud-spanner/pom.xml b/google-cloud-clients/google-cloud-spanner/pom.xml
index 5f228397602d..041a65d7c496 100644
--- a/google-cloud-clients/google-cloud-spanner/pom.xml
+++ b/google-cloud-clients/google-cloud-spanner/pom.xml
@@ -7,7 +7,7 @@
   <version>0.55.2-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Spanner</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-spanner</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-spanner</url>
   <description>
     Java idiomatic client for Google Cloud Spanner.
   </description>
diff --git a/google-cloud-clients/google-cloud-speech/pom.xml b/google-cloud-clients/google-cloud-speech/pom.xml
index bfd83fe3d248..5053d64b0819 100644
--- a/google-cloud-clients/google-cloud-speech/pom.xml
+++ b/google-cloud-clients/google-cloud-speech/pom.xml
@@ -5,7 +5,7 @@
   <version>0.55.2-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-speech:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Speech</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-speech</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-speech</url>
   <description>
     Java idiomatic client for Google Cloud Speech.
   </description>
diff --git a/google-cloud-clients/google-cloud-storage/pom.xml b/google-cloud-clients/google-cloud-storage/pom.xml
index aa64dfd22118..d58fbbfa083f 100644
--- a/google-cloud-clients/google-cloud-storage/pom.xml
+++ b/google-cloud-clients/google-cloud-storage/pom.xml
@@ -5,7 +5,7 @@
   <version>1.37.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Storage</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-storage</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-storage</url>
   <description>
     Java idiomatic client for Google Cloud Storage.
   </description>
diff --git a/google-cloud-clients/google-cloud-tasks/pom.xml b/google-cloud-clients/google-cloud-tasks/pom.xml
index 14fcf50f6afe..087a592eda03 100644
--- a/google-cloud-clients/google-cloud-tasks/pom.xml
+++ b/google-cloud-clients/google-cloud-tasks/pom.xml
@@ -5,7 +5,7 @@
   <version>0.55.2-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-tasks:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Tasks</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-tasks</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-tasks</url>
   <description>
     Java idiomatic client for Google Cloud Tasks
   </description>
diff --git a/google-cloud-clients/google-cloud-texttospeech/pom.xml b/google-cloud-clients/google-cloud-texttospeech/pom.xml
index 0bdadfb95974..f93b1304f5d5 100644
--- a/google-cloud-clients/google-cloud-texttospeech/pom.xml
+++ b/google-cloud-clients/google-cloud-texttospeech/pom.xml
@@ -5,7 +5,7 @@
   <version>0.55.2-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-texttospeech:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Text-to-Speech</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-texttospeech</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-texttospeech</url>
   <description>
     Java idiomatic client for Google Cloud Text-to-Speech
   </description>
diff --git a/google-cloud-clients/google-cloud-trace/pom.xml b/google-cloud-clients/google-cloud-trace/pom.xml
index 32fd367c35a4..b8a3a1efff64 100644
--- a/google-cloud-clients/google-cloud-trace/pom.xml
+++ b/google-cloud-clients/google-cloud-trace/pom.xml
@@ -5,7 +5,7 @@
   <version>0.55.2-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-trace:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Trace</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-trace</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-trace</url>
   <description>
     Java idiomatic client for Stackdriver Trace.
   </description>
diff --git a/google-cloud-clients/google-cloud-translate/pom.xml b/google-cloud-clients/google-cloud-translate/pom.xml
index c3c00b0540a7..47fccfa41370 100644
--- a/google-cloud-clients/google-cloud-translate/pom.xml
+++ b/google-cloud-clients/google-cloud-translate/pom.xml
@@ -5,7 +5,7 @@
   <version>1.37.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-translate:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Translation</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-translate</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-translate</url>
   <description>
     Java idiomatic client for Google Translation.
   </description>
diff --git a/google-cloud-clients/google-cloud-video-intelligence/pom.xml b/google-cloud-clients/google-cloud-video-intelligence/pom.xml
index b68c11fb9e93..73c5c2b4ef81 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/pom.xml
+++ b/google-cloud-clients/google-cloud-video-intelligence/pom.xml
@@ -5,7 +5,7 @@
   <version>0.55.2-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-video-intelligence:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Video Intelligence</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-video-intelligence</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-video-intelligence</url>
   <description>
     Java idiomatic client for Cloud Video Intelligence v1beta1.
   </description>
diff --git a/google-cloud-clients/google-cloud-vision/pom.xml b/google-cloud-clients/google-cloud-vision/pom.xml
index c2bd2bb75aa1..9752b882850f 100644
--- a/google-cloud-clients/google-cloud-vision/pom.xml
+++ b/google-cloud-clients/google-cloud-vision/pom.xml
@@ -5,7 +5,7 @@
   <version>1.37.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-vision:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Vision</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-vision</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-vision</url>
   <description>
     Java idiomatic client for Google Cloud Vision.
   </description>
diff --git a/google-cloud-clients/google-cloud-websecurityscanner/pom.xml b/google-cloud-clients/google-cloud-websecurityscanner/pom.xml
index d32a6147295d..2661b4820b78 100644
--- a/google-cloud-clients/google-cloud-websecurityscanner/pom.xml
+++ b/google-cloud-clients/google-cloud-websecurityscanner/pom.xml
@@ -5,7 +5,7 @@
   <version>0.55.2-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-websecurityscanner:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Web Security Scanner</name>
-  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-websecurityscanner</url>
+  <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-clients/google-cloud-websecurityscanner</url>
   <description>
     Java idiomatic client for Google Cloud Web Security Scanner
   </description>