diff --git a/generation_config.yaml b/generation_config.yaml
index 34a66632ca01..89754b575145 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1251,8 +1251,17 @@ libraries:
GAPICs:
- proto_path: google/cloud/hypercomputecluster/v1beta
requires_billing: true
-- api_shortname: iam
- name_pretty: IAM
+- api_shortname: iam-admin
+ name_pretty: IAM Admin API
+ product_documentation: https://cloud.google.com/iam/docs/apis
+ api_description: you to manage your Service Accounts and IAM bindings.
+ release_level: stable
+ distribution_name: com.google.cloud:google-iam-admin
+ api_id: iam.googleapis.com
+ GAPICs:
+ - proto_path: google/iam/admin/v1
+- api_shortname: iam-policy
+ name_pretty: IAM Policy
product_documentation: n/a
api_description: n/a
release_level: stable
@@ -1267,15 +1276,6 @@ libraries:
- proto_path: google/iam/v2beta
- proto_path: google/iam/v3
- proto_path: google/iam/v3beta
-- api_shortname: iam-admin
- name_pretty: IAM Admin API
- product_documentation: https://cloud.google.com/iam/docs/apis
- api_description: you to manage your Service Accounts and IAM bindings.
- release_level: stable
- distribution_name: com.google.cloud:google-iam-admin
- api_id: iam.googleapis.com
- GAPICs:
- - proto_path: google/iam/admin/v1
- api_shortname: iamcredentials
name_pretty: IAM Service Account Credentials API
product_documentation: https://cloud.google.com/iam/credentials/reference/rest/
diff --git a/java-iam/.OwlBot-hermetic.yaml b/java-iam-policy/.OwlBot-hermetic.yaml
similarity index 100%
rename from java-iam/.OwlBot-hermetic.yaml
rename to java-iam-policy/.OwlBot-hermetic.yaml
diff --git a/java-iam/.repo-metadata.json b/java-iam-policy/.repo-metadata.json
similarity index 79%
rename from java-iam/.repo-metadata.json
rename to java-iam-policy/.repo-metadata.json
index fa9ab8c76a75..459e6cd29151 100644
--- a/java-iam/.repo-metadata.json
+++ b/java-iam-policy/.repo-metadata.json
@@ -1,6 +1,6 @@
{
- "api_shortname": "iam",
- "name_pretty": "IAM",
+ "api_shortname": "iam-policy",
+ "name_pretty": "IAM Policy",
"product_documentation": "n/a",
"api_description": "n/a",
"client_documentation": "https://cloud.google.com/java/docs/reference/proto-google-iam-v1/latest/history",
@@ -8,9 +8,9 @@
"transport": "both",
"language": "java",
"repo": "googleapis/google-cloud-java",
- "repo_short": "java-iam",
+ "repo_short": "java-iam-policy",
"distribution_name": "com.google.cloud:google-iam-policy",
- "api_id": "iam.googleapis.com",
+ "api_id": "iam-policy.googleapis.com",
"library_type": "GAPIC_AUTO",
"requires_billing": true,
"excluded_dependencies": "google-iam-policy",
diff --git a/java-iam/CHANGELOG.md b/java-iam-policy/CHANGELOG.md
similarity index 100%
rename from java-iam/CHANGELOG.md
rename to java-iam-policy/CHANGELOG.md
diff --git a/java-iam/README.md b/java-iam-policy/README.md
similarity index 89%
rename from java-iam/README.md
rename to java-iam-policy/README.md
index 34f3f7951a99..41149f00aa73 100644
--- a/java-iam/README.md
+++ b/java-iam-policy/README.md
@@ -1,6 +1,6 @@
-# Google IAM Client for Java
+# Google IAM Policy Client for Java
-Java idiomatic client for [IAM][product-docs].
+Java idiomatic client for [IAM Policy][product-docs].
[![Maven][maven-version-image]][maven-version-link]
![Stability][stability-image]
@@ -42,20 +42,20 @@ If you are using Maven without the BOM, add this to your dependencies:
com.google.cloud
google-iam-policy
- 1.83.0
+ 1.84.0
```
If you are using Gradle without BOM, add this to your dependencies:
```Groovy
-implementation 'com.google.cloud:google-iam-policy:1.83.0'
+implementation 'com.google.cloud:google-iam-policy:1.84.0'
```
If you are using SBT, add this to your dependencies:
```Scala
-libraryDependencies += "com.google.cloud" % "google-iam-policy" % "1.83.0"
+libraryDependencies += "com.google.cloud" % "google-iam-policy" % "1.84.0"
```
## Authentication
@@ -64,14 +64,14 @@ See the [Authentication][authentication] section in the base directory's README.
## Authorization
-The client application making API calls must be granted [authorization scopes][auth-scopes] required for the desired IAM APIs, and the authenticated principal must have the [IAM role(s)][predefined-iam-roles] required to access GCP resources using the IAM API calls.
+The client application making API calls must be granted [authorization scopes][auth-scopes] required for the desired IAM Policy APIs, and the authenticated principal must have the [IAM role(s)][predefined-iam-roles] required to access GCP resources using the IAM Policy API calls.
## Getting Started
### Prerequisites
-You will need a [Google Cloud Platform Console][developer-console] project with the IAM [API enabled][enable-api].
-You will need to [enable billing][enable-billing] to use Google IAM.
+You will need a [Google Cloud Platform Console][developer-console] project with the IAM Policy [API enabled][enable-api].
+You will need to [enable billing][enable-billing] to use Google IAM Policy.
[Follow these instructions][create-project] to get your project set up. You will also need to set up the local development environment by
[installing the Google Cloud Command Line Interface][cloud-cli] and running the following commands in command line:
`gcloud auth login` and `gcloud config set project [YOUR PROJECT ID]`.
@@ -81,13 +81,13 @@ You will need to [enable billing][enable-billing] to use Google IAM.
You'll need to obtain the `google-iam-policy` library. See the [Quickstart](#quickstart) section
to add `google-iam-policy` as a dependency in your code.
-## About IAM
+## About IAM Policy
-[IAM][product-docs] n/a
+[IAM Policy][product-docs] n/a
-See the [IAM client library docs][javadocs] to learn how to
-use this IAM Client Library.
+See the [IAM Policy client library docs][javadocs] to learn how to
+use this IAM Policy Client Library.
@@ -100,7 +100,7 @@ To get help, follow the instructions in the [shared Troubleshooting document][tr
## Transport
-IAM uses both gRPC and HTTP/JSON for the transport layer.
+IAM Policy uses both gRPC and HTTP/JSON for the transport layer.
## Supported Java Versions
@@ -175,7 +175,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
[javadocs]: https://cloud.google.com/java/docs/reference/proto-google-iam-v1/latest/history
[stability-image]: https://img.shields.io/badge/stability-stable-green
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-iam-policy.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-iam-policy/1.83.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-iam-policy/1.84.0
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
@@ -188,7 +188,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
[code-of-conduct]: https://github.com/googleapis/google-cloud-java/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct
[license]: https://github.com/googleapis/google-cloud-java/blob/main/LICENSE
[enable-billing]: https://cloud.google.com/apis/docs/getting-started#enabling_billing
-[enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=iam.googleapis.com
+[enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=iam-policy.googleapis.com
[libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM
[shell_img]: https://gstatic.com/cloudssh/images/open-btn.png
diff --git a/java-iam/google-iam-policy-bom/pom.xml b/java-iam-policy/google-iam-policy-bom/pom.xml
similarity index 100%
rename from java-iam/google-iam-policy-bom/pom.xml
rename to java-iam-policy/google-iam-policy-bom/pom.xml
diff --git a/java-iam/google-iam-policy/pom.xml b/java-iam-policy/google-iam-policy/pom.xml
similarity index 100%
rename from java-iam/google-iam-policy/pom.xml
rename to java-iam-policy/google-iam-policy/pom.xml
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v2/PoliciesClient.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2/PoliciesClient.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v2/PoliciesClient.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2/PoliciesClient.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v2/PoliciesSettings.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2/PoliciesSettings.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v2/PoliciesSettings.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2/PoliciesSettings.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v2/gapic_metadata.json b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2/gapic_metadata.json
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v2/gapic_metadata.json
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2/gapic_metadata.json
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v2/package-info.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2/package-info.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v2/package-info.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2/package-info.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v2/stub/GrpcPoliciesCallableFactory.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2/stub/GrpcPoliciesCallableFactory.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v2/stub/GrpcPoliciesCallableFactory.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2/stub/GrpcPoliciesCallableFactory.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v2/stub/GrpcPoliciesStub.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2/stub/GrpcPoliciesStub.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v2/stub/GrpcPoliciesStub.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2/stub/GrpcPoliciesStub.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v2/stub/HttpJsonPoliciesCallableFactory.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2/stub/HttpJsonPoliciesCallableFactory.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v2/stub/HttpJsonPoliciesCallableFactory.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2/stub/HttpJsonPoliciesCallableFactory.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v2/stub/HttpJsonPoliciesStub.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2/stub/HttpJsonPoliciesStub.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v2/stub/HttpJsonPoliciesStub.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2/stub/HttpJsonPoliciesStub.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v2/stub/PoliciesStub.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2/stub/PoliciesStub.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v2/stub/PoliciesStub.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2/stub/PoliciesStub.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v2/stub/PoliciesStubSettings.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2/stub/PoliciesStubSettings.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v2/stub/PoliciesStubSettings.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2/stub/PoliciesStubSettings.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v2beta/PoliciesClient.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2beta/PoliciesClient.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v2beta/PoliciesClient.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2beta/PoliciesClient.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v2beta/PoliciesSettings.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2beta/PoliciesSettings.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v2beta/PoliciesSettings.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2beta/PoliciesSettings.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v2beta/gapic_metadata.json b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2beta/gapic_metadata.json
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v2beta/gapic_metadata.json
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2beta/gapic_metadata.json
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v2beta/package-info.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2beta/package-info.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v2beta/package-info.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2beta/package-info.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v2beta/stub/GrpcPoliciesCallableFactory.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2beta/stub/GrpcPoliciesCallableFactory.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v2beta/stub/GrpcPoliciesCallableFactory.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2beta/stub/GrpcPoliciesCallableFactory.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v2beta/stub/GrpcPoliciesStub.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2beta/stub/GrpcPoliciesStub.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v2beta/stub/GrpcPoliciesStub.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2beta/stub/GrpcPoliciesStub.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v2beta/stub/HttpJsonPoliciesCallableFactory.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2beta/stub/HttpJsonPoliciesCallableFactory.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v2beta/stub/HttpJsonPoliciesCallableFactory.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2beta/stub/HttpJsonPoliciesCallableFactory.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v2beta/stub/HttpJsonPoliciesStub.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2beta/stub/HttpJsonPoliciesStub.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v2beta/stub/HttpJsonPoliciesStub.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2beta/stub/HttpJsonPoliciesStub.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v2beta/stub/PoliciesStub.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2beta/stub/PoliciesStub.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v2beta/stub/PoliciesStub.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2beta/stub/PoliciesStub.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v2beta/stub/PoliciesStubSettings.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2beta/stub/PoliciesStubSettings.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v2beta/stub/PoliciesStubSettings.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v2beta/stub/PoliciesStubSettings.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3/PolicyBindingsClient.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/PolicyBindingsClient.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3/PolicyBindingsClient.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/PolicyBindingsClient.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3/PolicyBindingsSettings.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/PolicyBindingsSettings.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3/PolicyBindingsSettings.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/PolicyBindingsSettings.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPoliciesClient.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPoliciesClient.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPoliciesClient.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPoliciesClient.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPoliciesSettings.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPoliciesSettings.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPoliciesSettings.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/PrincipalAccessBoundaryPoliciesSettings.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3/gapic_metadata.json b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/gapic_metadata.json
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3/gapic_metadata.json
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/gapic_metadata.json
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3/package-info.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/package-info.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3/package-info.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/package-info.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3/stub/GrpcPolicyBindingsCallableFactory.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/stub/GrpcPolicyBindingsCallableFactory.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3/stub/GrpcPolicyBindingsCallableFactory.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/stub/GrpcPolicyBindingsCallableFactory.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3/stub/GrpcPolicyBindingsStub.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/stub/GrpcPolicyBindingsStub.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3/stub/GrpcPolicyBindingsStub.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/stub/GrpcPolicyBindingsStub.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3/stub/GrpcPrincipalAccessBoundaryPoliciesCallableFactory.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/stub/GrpcPrincipalAccessBoundaryPoliciesCallableFactory.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3/stub/GrpcPrincipalAccessBoundaryPoliciesCallableFactory.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/stub/GrpcPrincipalAccessBoundaryPoliciesCallableFactory.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3/stub/GrpcPrincipalAccessBoundaryPoliciesStub.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/stub/GrpcPrincipalAccessBoundaryPoliciesStub.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3/stub/GrpcPrincipalAccessBoundaryPoliciesStub.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/stub/GrpcPrincipalAccessBoundaryPoliciesStub.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3/stub/HttpJsonPolicyBindingsCallableFactory.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/stub/HttpJsonPolicyBindingsCallableFactory.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3/stub/HttpJsonPolicyBindingsCallableFactory.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/stub/HttpJsonPolicyBindingsCallableFactory.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3/stub/HttpJsonPolicyBindingsStub.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/stub/HttpJsonPolicyBindingsStub.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3/stub/HttpJsonPolicyBindingsStub.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/stub/HttpJsonPolicyBindingsStub.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3/stub/HttpJsonPrincipalAccessBoundaryPoliciesCallableFactory.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/stub/HttpJsonPrincipalAccessBoundaryPoliciesCallableFactory.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3/stub/HttpJsonPrincipalAccessBoundaryPoliciesCallableFactory.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/stub/HttpJsonPrincipalAccessBoundaryPoliciesCallableFactory.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3/stub/HttpJsonPrincipalAccessBoundaryPoliciesStub.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/stub/HttpJsonPrincipalAccessBoundaryPoliciesStub.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3/stub/HttpJsonPrincipalAccessBoundaryPoliciesStub.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/stub/HttpJsonPrincipalAccessBoundaryPoliciesStub.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3/stub/PolicyBindingsStub.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/stub/PolicyBindingsStub.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3/stub/PolicyBindingsStub.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/stub/PolicyBindingsStub.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3/stub/PolicyBindingsStubSettings.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/stub/PolicyBindingsStubSettings.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3/stub/PolicyBindingsStubSettings.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/stub/PolicyBindingsStubSettings.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3/stub/PrincipalAccessBoundaryPoliciesStub.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/stub/PrincipalAccessBoundaryPoliciesStub.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3/stub/PrincipalAccessBoundaryPoliciesStub.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/stub/PrincipalAccessBoundaryPoliciesStub.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3/stub/PrincipalAccessBoundaryPoliciesStubSettings.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/stub/PrincipalAccessBoundaryPoliciesStubSettings.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3/stub/PrincipalAccessBoundaryPoliciesStubSettings.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3/stub/PrincipalAccessBoundaryPoliciesStubSettings.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/PolicyBindingsClient.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/PolicyBindingsClient.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/PolicyBindingsClient.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/PolicyBindingsClient.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/PolicyBindingsSettings.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/PolicyBindingsSettings.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/PolicyBindingsSettings.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/PolicyBindingsSettings.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPoliciesClient.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPoliciesClient.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPoliciesClient.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPoliciesClient.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPoliciesSettings.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPoliciesSettings.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPoliciesSettings.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/PrincipalAccessBoundaryPoliciesSettings.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/gapic_metadata.json b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/gapic_metadata.json
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/gapic_metadata.json
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/gapic_metadata.json
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/package-info.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/package-info.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/package-info.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/package-info.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/GrpcPolicyBindingsCallableFactory.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/GrpcPolicyBindingsCallableFactory.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/GrpcPolicyBindingsCallableFactory.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/GrpcPolicyBindingsCallableFactory.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/GrpcPolicyBindingsStub.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/GrpcPolicyBindingsStub.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/GrpcPolicyBindingsStub.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/GrpcPolicyBindingsStub.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/GrpcPrincipalAccessBoundaryPoliciesCallableFactory.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/GrpcPrincipalAccessBoundaryPoliciesCallableFactory.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/GrpcPrincipalAccessBoundaryPoliciesCallableFactory.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/GrpcPrincipalAccessBoundaryPoliciesCallableFactory.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/GrpcPrincipalAccessBoundaryPoliciesStub.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/GrpcPrincipalAccessBoundaryPoliciesStub.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/GrpcPrincipalAccessBoundaryPoliciesStub.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/GrpcPrincipalAccessBoundaryPoliciesStub.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/HttpJsonPolicyBindingsCallableFactory.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/HttpJsonPolicyBindingsCallableFactory.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/HttpJsonPolicyBindingsCallableFactory.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/HttpJsonPolicyBindingsCallableFactory.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/HttpJsonPolicyBindingsStub.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/HttpJsonPolicyBindingsStub.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/HttpJsonPolicyBindingsStub.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/HttpJsonPolicyBindingsStub.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/HttpJsonPrincipalAccessBoundaryPoliciesCallableFactory.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/HttpJsonPrincipalAccessBoundaryPoliciesCallableFactory.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/HttpJsonPrincipalAccessBoundaryPoliciesCallableFactory.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/HttpJsonPrincipalAccessBoundaryPoliciesCallableFactory.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/HttpJsonPrincipalAccessBoundaryPoliciesStub.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/HttpJsonPrincipalAccessBoundaryPoliciesStub.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/HttpJsonPrincipalAccessBoundaryPoliciesStub.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/HttpJsonPrincipalAccessBoundaryPoliciesStub.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/PolicyBindingsStub.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/PolicyBindingsStub.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/PolicyBindingsStub.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/PolicyBindingsStub.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/PolicyBindingsStubSettings.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/PolicyBindingsStubSettings.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/PolicyBindingsStubSettings.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/PolicyBindingsStubSettings.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/PrincipalAccessBoundaryPoliciesStub.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/PrincipalAccessBoundaryPoliciesStub.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/PrincipalAccessBoundaryPoliciesStub.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/PrincipalAccessBoundaryPoliciesStub.java
diff --git a/java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/PrincipalAccessBoundaryPoliciesStubSettings.java b/java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/PrincipalAccessBoundaryPoliciesStubSettings.java
similarity index 100%
rename from java-iam/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/PrincipalAccessBoundaryPoliciesStubSettings.java
rename to java-iam-policy/google-iam-policy/src/main/java/com/google/iam/v3beta/stub/PrincipalAccessBoundaryPoliciesStubSettings.java
diff --git a/java-iam/google-iam-policy/src/main/resources/META-INF/native-image/com.google.iam.v2/reflect-config.json b/java-iam-policy/google-iam-policy/src/main/resources/META-INF/native-image/com.google.iam.v2/reflect-config.json
similarity index 100%
rename from java-iam/google-iam-policy/src/main/resources/META-INF/native-image/com.google.iam.v2/reflect-config.json
rename to java-iam-policy/google-iam-policy/src/main/resources/META-INF/native-image/com.google.iam.v2/reflect-config.json
diff --git a/java-iam/google-iam-policy/src/main/resources/META-INF/native-image/com.google.iam.v2beta/reflect-config.json b/java-iam-policy/google-iam-policy/src/main/resources/META-INF/native-image/com.google.iam.v2beta/reflect-config.json
similarity index 100%
rename from java-iam/google-iam-policy/src/main/resources/META-INF/native-image/com.google.iam.v2beta/reflect-config.json
rename to java-iam-policy/google-iam-policy/src/main/resources/META-INF/native-image/com.google.iam.v2beta/reflect-config.json
diff --git a/java-iam/google-iam-policy/src/main/resources/META-INF/native-image/com.google.iam.v3/reflect-config.json b/java-iam-policy/google-iam-policy/src/main/resources/META-INF/native-image/com.google.iam.v3/reflect-config.json
similarity index 100%
rename from java-iam/google-iam-policy/src/main/resources/META-INF/native-image/com.google.iam.v3/reflect-config.json
rename to java-iam-policy/google-iam-policy/src/main/resources/META-INF/native-image/com.google.iam.v3/reflect-config.json
diff --git a/java-iam/google-iam-policy/src/main/resources/META-INF/native-image/com.google.iam.v3beta/reflect-config.json b/java-iam-policy/google-iam-policy/src/main/resources/META-INF/native-image/com.google.iam.v3beta/reflect-config.json
similarity index 100%
rename from java-iam/google-iam-policy/src/main/resources/META-INF/native-image/com.google.iam.v3beta/reflect-config.json
rename to java-iam-policy/google-iam-policy/src/main/resources/META-INF/native-image/com.google.iam.v3beta/reflect-config.json
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v2/MockPolicies.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v2/MockPolicies.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v2/MockPolicies.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v2/MockPolicies.java
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v2/MockPoliciesImpl.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v2/MockPoliciesImpl.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v2/MockPoliciesImpl.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v2/MockPoliciesImpl.java
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v2/PoliciesClientHttpJsonTest.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v2/PoliciesClientHttpJsonTest.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v2/PoliciesClientHttpJsonTest.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v2/PoliciesClientHttpJsonTest.java
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v2/PoliciesClientTest.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v2/PoliciesClientTest.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v2/PoliciesClientTest.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v2/PoliciesClientTest.java
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v2beta/MockPolicies.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v2beta/MockPolicies.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v2beta/MockPolicies.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v2beta/MockPolicies.java
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v2beta/MockPoliciesImpl.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v2beta/MockPoliciesImpl.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v2beta/MockPoliciesImpl.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v2beta/MockPoliciesImpl.java
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v2beta/PoliciesClientHttpJsonTest.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v2beta/PoliciesClientHttpJsonTest.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v2beta/PoliciesClientHttpJsonTest.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v2beta/PoliciesClientHttpJsonTest.java
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v2beta/PoliciesClientTest.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v2beta/PoliciesClientTest.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v2beta/PoliciesClientTest.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v2beta/PoliciesClientTest.java
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v3/MockLocations.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3/MockLocations.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v3/MockLocations.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3/MockLocations.java
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v3/MockLocationsImpl.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3/MockLocationsImpl.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v3/MockLocationsImpl.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3/MockLocationsImpl.java
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v3/MockPolicyBindings.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3/MockPolicyBindings.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v3/MockPolicyBindings.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3/MockPolicyBindings.java
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v3/MockPolicyBindingsImpl.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3/MockPolicyBindingsImpl.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v3/MockPolicyBindingsImpl.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3/MockPolicyBindingsImpl.java
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v3/MockPrincipalAccessBoundaryPolicies.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3/MockPrincipalAccessBoundaryPolicies.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v3/MockPrincipalAccessBoundaryPolicies.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3/MockPrincipalAccessBoundaryPolicies.java
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v3/MockPrincipalAccessBoundaryPoliciesImpl.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3/MockPrincipalAccessBoundaryPoliciesImpl.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v3/MockPrincipalAccessBoundaryPoliciesImpl.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3/MockPrincipalAccessBoundaryPoliciesImpl.java
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v3/PolicyBindingsClientHttpJsonTest.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3/PolicyBindingsClientHttpJsonTest.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v3/PolicyBindingsClientHttpJsonTest.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3/PolicyBindingsClientHttpJsonTest.java
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v3/PolicyBindingsClientTest.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3/PolicyBindingsClientTest.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v3/PolicyBindingsClientTest.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3/PolicyBindingsClientTest.java
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v3/PrincipalAccessBoundaryPoliciesClientHttpJsonTest.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3/PrincipalAccessBoundaryPoliciesClientHttpJsonTest.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v3/PrincipalAccessBoundaryPoliciesClientHttpJsonTest.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3/PrincipalAccessBoundaryPoliciesClientHttpJsonTest.java
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v3/PrincipalAccessBoundaryPoliciesClientTest.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3/PrincipalAccessBoundaryPoliciesClientTest.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v3/PrincipalAccessBoundaryPoliciesClientTest.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3/PrincipalAccessBoundaryPoliciesClientTest.java
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v3beta/MockLocations.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3beta/MockLocations.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v3beta/MockLocations.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3beta/MockLocations.java
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v3beta/MockLocationsImpl.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3beta/MockLocationsImpl.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v3beta/MockLocationsImpl.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3beta/MockLocationsImpl.java
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v3beta/MockPolicyBindings.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3beta/MockPolicyBindings.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v3beta/MockPolicyBindings.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3beta/MockPolicyBindings.java
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v3beta/MockPolicyBindingsImpl.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3beta/MockPolicyBindingsImpl.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v3beta/MockPolicyBindingsImpl.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3beta/MockPolicyBindingsImpl.java
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v3beta/MockPrincipalAccessBoundaryPolicies.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3beta/MockPrincipalAccessBoundaryPolicies.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v3beta/MockPrincipalAccessBoundaryPolicies.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3beta/MockPrincipalAccessBoundaryPolicies.java
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v3beta/MockPrincipalAccessBoundaryPoliciesImpl.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3beta/MockPrincipalAccessBoundaryPoliciesImpl.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v3beta/MockPrincipalAccessBoundaryPoliciesImpl.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3beta/MockPrincipalAccessBoundaryPoliciesImpl.java
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v3beta/PolicyBindingsClientHttpJsonTest.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3beta/PolicyBindingsClientHttpJsonTest.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v3beta/PolicyBindingsClientHttpJsonTest.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3beta/PolicyBindingsClientHttpJsonTest.java
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v3beta/PolicyBindingsClientTest.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3beta/PolicyBindingsClientTest.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v3beta/PolicyBindingsClientTest.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3beta/PolicyBindingsClientTest.java
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v3beta/PrincipalAccessBoundaryPoliciesClientHttpJsonTest.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3beta/PrincipalAccessBoundaryPoliciesClientHttpJsonTest.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v3beta/PrincipalAccessBoundaryPoliciesClientHttpJsonTest.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3beta/PrincipalAccessBoundaryPoliciesClientHttpJsonTest.java
diff --git a/java-iam/google-iam-policy/src/test/java/com/google/iam/v3beta/PrincipalAccessBoundaryPoliciesClientTest.java b/java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3beta/PrincipalAccessBoundaryPoliciesClientTest.java
similarity index 100%
rename from java-iam/google-iam-policy/src/test/java/com/google/iam/v3beta/PrincipalAccessBoundaryPoliciesClientTest.java
rename to java-iam-policy/google-iam-policy/src/test/java/com/google/iam/v3beta/PrincipalAccessBoundaryPoliciesClientTest.java
diff --git a/java-iam/owlbot.py b/java-iam-policy/owlbot.py
similarity index 100%
rename from java-iam/owlbot.py
rename to java-iam-policy/owlbot.py
diff --git a/java-iam/pom.xml b/java-iam-policy/pom.xml
similarity index 100%
rename from java-iam/pom.xml
rename to java-iam-policy/pom.xml
diff --git a/pom.xml b/pom.xml
index c17484959e1f..4383ef0dbf90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,8 +121,8 @@
java-grafeas
java-gsuite-addons
java-hypercomputecluster
- java-iam
java-iam-admin
+ java-iam-policy
java-iamcredentials
java-iap
java-ids