diff --git a/pom.client.xml b/pom.client.xml
index c575beec90b5..f5eb77543186 100644
--- a/pom.client.xml
+++ b/pom.client.xml
@@ -735,7 +735,8 @@
./sdk/appconfiguration/azure-data-appconfiguration
./core
./eventhubs/client
- ./keyvault/client
+ ./sdk/keyvault/azure-keyvault-secrets
+ ./sdk/keyvault/azure-keyvault-keys
./sdk/identity/azure-identity
diff --git a/keyvault/client/keys/CHANGELOG.md b/sdk/keyvault/azure-keyvault-keys/CHANGELOG.md
similarity index 100%
rename from keyvault/client/keys/CHANGELOG.md
rename to sdk/keyvault/azure-keyvault-keys/CHANGELOG.md
diff --git a/keyvault/client/keys/README.md b/sdk/keyvault/azure-keyvault-keys/README.md
similarity index 93%
rename from keyvault/client/keys/README.md
rename to sdk/keyvault/azure-keyvault-keys/README.md
index 2b718d036b4b..33419a0b7dd5 100644
--- a/keyvault/client/keys/README.md
+++ b/sdk/keyvault/azure-keyvault-keys/README.md
@@ -302,7 +302,7 @@ When you submit a pull request, a CLA-bot will automatically determine whether y
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the Code of Conduct FAQ or contact opencode@microsoft.com with any additional questions or comments.
-[source_code]: https://github.com/Azure/azure-sdk-for-java/tree/master/keyvault/client/keys/src
+[source_code]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/keyvault/azure-keyvault-keys/src
[api_documentation]: not-valid-link
[azkeyvault_docs]: https://docs.microsoft.com/en-us/azure/key-vault/
[azure_identity]: https://github.com/Azure/azure-sdk-for-java/tree/master/identity/client
@@ -315,12 +315,12 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope
[azure_create_application_in_portal]:https://docs.microsoft.com/en-us/azure/active-directory/develop/howto-create-service-principal-portal
[azure_keyvault_cli]:https://docs.microsoft.com/en-us/azure/key-vault/quick-create-cli
[azure_keyvault_cli_full]:https://docs.microsoft.com/en-us/cli/azure/keyvault?view=azure-cli-latest
-[keys_samples]:https://github.com/Azure/azure-sdk-for-java/tree/master/keyvault/client/keys/src/samples/java/com/azure/security/keyvault/keys
-[sample_helloWorld]:https://github.com/Azure/azure-sdk-for-java/tree/master/keyvault/client/keys/src/samples/java/com/azure/security/keyvault/keys/HelloWorld.java
-[sample_helloWorldAsync]:https://github.com/Azure/azure-sdk-for-java/tree/master/keyvault/client/keys/src/samples/java/com/azure/security/keyvault/keys/HelloWorldAsync.java
-[sample_list]:https://github.com/Azure/azure-sdk-for-java/tree/master/keyvault/client/keys/src/samples/java/com/azure/security/keyvault/keys/ListOperations.java
-[sample_listAsync]:https://github.com/Azure/azure-sdk-for-java/tree/master/keyvault/client/keys/src/samples/java/com/azure/security/keyvault/keys/ListOperationsAsync.java
-[sample_BackupRestore]:https://github.com/Azure/azure-sdk-for-java/tree/master/keyvault/client/keys/src/samples/java/com/azure/security/keyvault/keys/BackupAndRestoreOperations.java
-[sample_BackupRestoreAsync]:https://github.com/Azure/azure-sdk-for-java/tree/master/keyvault/client/keys/src/samples/java/com/azure/security/keyvault/keys/BackupAndRestoreOperationsAsync.java
-[sample_ManageDeleted]:https://github.com/Azure/azure-sdk-for-java/tree/master/keyvault/client/keys/src/samples/java/com/azure/security/keyvault/keys/ManagingDeletedKeys.java
-[sample_ManageDeletedAsync]:https://github.com/Azure/azure-sdk-for-java/tree/master/keyvault/client/keys/src/samples/java/com/azure/security/keyvault/keys/ManagingDeletedKeysAsync.java
+[keys_samples]:https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/keyvault/azure-keyvault-keys/src/samples/java/com/azure/security/keyvault/keys
+[sample_helloWorld]:https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/keyvault/azure-keyvault-keys/src/samples/java/com/azure/security/keyvault/keys/HelloWorld.java
+[sample_helloWorldAsync]:https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/keyvault/azure-keyvault-keys/src/samples/java/com/azure/security/keyvault/keys/HelloWorldAsync.java
+[sample_list]:https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/keyvault/azure-keyvault-keys/src/samples/java/com/azure/security/keyvault/keys/ListOperations.java
+[sample_listAsync]:https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/keyvault/azure-keyvault-keys/src/samples/java/com/azure/security/keyvault/keys/ListOperationsAsync.java
+[sample_BackupRestore]:https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/keyvault/azure-keyvault-keys/src/samples/java/com/azure/security/keyvault/keys/BackupAndRestoreOperations.java
+[sample_BackupRestoreAsync]:https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/keyvault/azure-keyvault-keys/src/samples/java/com/azure/security/keyvault/keys/BackupAndRestoreOperationsAsync.java
+[sample_ManageDeleted]:https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/keyvault/azure-keyvault-keys/src/samples/java/com/azure/security/keyvault/keys/ManagingDeletedKeys.java
+[sample_ManageDeletedAsync]:https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/keyvault/azure-keyvault-keys/src/samples/java/com/azure/security/keyvault/keys/ManagingDeletedKeysAsync.java
diff --git a/keyvault/client/keys/pom.xml b/sdk/keyvault/azure-keyvault-keys/pom.xml
similarity index 97%
rename from keyvault/client/keys/pom.xml
rename to sdk/keyvault/azure-keyvault-keys/pom.xml
index 61457bb355a5..340ef6f343eb 100644
--- a/keyvault/client/keys/pom.xml
+++ b/sdk/keyvault/azure-keyvault-keys/pom.xml
@@ -6,7 +6,7 @@
azure-keyvault-parent
com.azure
4.0.0-preview.1
- ../pom.xml
+ ../pom.client.xml
4.0.0
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/AzureKeyVaultConfiguration.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/AzureKeyVaultConfiguration.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/AzureKeyVaultConfiguration.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/AzureKeyVaultConfiguration.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/KeyAsyncClient.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyAsyncClient.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/KeyAsyncClient.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyAsyncClient.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/KeyBackup.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyBackup.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/KeyBackup.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyBackup.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/KeyClient.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyClient.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/KeyClient.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyClient.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/KeyClientBuilder.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyClientBuilder.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/KeyClientBuilder.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyClientBuilder.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/KeyImportRequestParameters.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyImportRequestParameters.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/KeyImportRequestParameters.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyImportRequestParameters.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/KeyRequestAttributes.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyRequestAttributes.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/KeyRequestAttributes.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyRequestAttributes.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/KeyRequestParameters.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyRequestParameters.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/KeyRequestParameters.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyRequestParameters.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/KeyRestoreRequestParameters.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyRestoreRequestParameters.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/KeyRestoreRequestParameters.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyRestoreRequestParameters.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/KeyService.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyService.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/KeyService.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyService.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/KeyVaultErrorCodeStrings.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyVaultErrorCodeStrings.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/KeyVaultErrorCodeStrings.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/KeyVaultErrorCodeStrings.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/implementation/DeletedKeyPage.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/implementation/DeletedKeyPage.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/implementation/DeletedKeyPage.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/implementation/DeletedKeyPage.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/implementation/KeyBasePage.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/implementation/KeyBasePage.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/implementation/KeyBasePage.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/implementation/KeyBasePage.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/DeletedKey.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/DeletedKey.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/DeletedKey.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/DeletedKey.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/EcKeyCreateOptions.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/EcKeyCreateOptions.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/EcKeyCreateOptions.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/EcKeyCreateOptions.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/Key.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/Key.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/Key.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/Key.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/KeyBase.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/KeyBase.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/KeyBase.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/KeyBase.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/KeyCreateOptions.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/KeyCreateOptions.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/KeyCreateOptions.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/KeyCreateOptions.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/KeyImportOptions.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/KeyImportOptions.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/KeyImportOptions.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/KeyImportOptions.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/RsaKeyCreateOptions.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/RsaKeyCreateOptions.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/RsaKeyCreateOptions.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/RsaKeyCreateOptions.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/package-info.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/package-info.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/package-info.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/package-info.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/Base64UrlJsonDeserializer.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/Base64UrlJsonDeserializer.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/Base64UrlJsonDeserializer.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/Base64UrlJsonDeserializer.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/Base64UrlJsonSerializer.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/Base64UrlJsonSerializer.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/Base64UrlJsonSerializer.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/Base64UrlJsonSerializer.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/ByteExtensions.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/ByteExtensions.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/ByteExtensions.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/ByteExtensions.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/JsonWebKey.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/JsonWebKey.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/JsonWebKey.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/JsonWebKey.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/KeyCurveName.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/KeyCurveName.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/KeyCurveName.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/KeyCurveName.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/KeyOperation.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/KeyOperation.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/KeyOperation.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/KeyOperation.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/KeyType.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/KeyType.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/KeyType.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/KeyType.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/package-info.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/package-info.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/package-info.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/models/webkey/package-info.java
diff --git a/keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/package-info.java b/sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/package-info.java
similarity index 100%
rename from keyvault/client/keys/src/main/java/com/azure/security/keyvault/keys/package-info.java
rename to sdk/keyvault/azure-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/package-info.java
diff --git a/keyvault/client/keys/src/main/resources/kvErrorStrings.properties b/sdk/keyvault/azure-keyvault-keys/src/main/resources/kvErrorStrings.properties
similarity index 100%
rename from keyvault/client/keys/src/main/resources/kvErrorStrings.properties
rename to sdk/keyvault/azure-keyvault-keys/src/main/resources/kvErrorStrings.properties
diff --git a/keyvault/client/keys/src/samples/java/com/azure/security/keyvault/keys/BackupAndRestoreOperations.java b/sdk/keyvault/azure-keyvault-keys/src/samples/java/com/azure/security/keyvault/keys/BackupAndRestoreOperations.java
similarity index 100%
rename from keyvault/client/keys/src/samples/java/com/azure/security/keyvault/keys/BackupAndRestoreOperations.java
rename to sdk/keyvault/azure-keyvault-keys/src/samples/java/com/azure/security/keyvault/keys/BackupAndRestoreOperations.java
diff --git a/keyvault/client/keys/src/samples/java/com/azure/security/keyvault/keys/BackupAndRestoreOperationsAsync.java b/sdk/keyvault/azure-keyvault-keys/src/samples/java/com/azure/security/keyvault/keys/BackupAndRestoreOperationsAsync.java
similarity index 100%
rename from keyvault/client/keys/src/samples/java/com/azure/security/keyvault/keys/BackupAndRestoreOperationsAsync.java
rename to sdk/keyvault/azure-keyvault-keys/src/samples/java/com/azure/security/keyvault/keys/BackupAndRestoreOperationsAsync.java
diff --git a/keyvault/client/keys/src/samples/java/com/azure/security/keyvault/keys/HelloWorld.java b/sdk/keyvault/azure-keyvault-keys/src/samples/java/com/azure/security/keyvault/keys/HelloWorld.java
similarity index 100%
rename from keyvault/client/keys/src/samples/java/com/azure/security/keyvault/keys/HelloWorld.java
rename to sdk/keyvault/azure-keyvault-keys/src/samples/java/com/azure/security/keyvault/keys/HelloWorld.java
diff --git a/keyvault/client/keys/src/samples/java/com/azure/security/keyvault/keys/HelloWorldAsync.java b/sdk/keyvault/azure-keyvault-keys/src/samples/java/com/azure/security/keyvault/keys/HelloWorldAsync.java
similarity index 100%
rename from keyvault/client/keys/src/samples/java/com/azure/security/keyvault/keys/HelloWorldAsync.java
rename to sdk/keyvault/azure-keyvault-keys/src/samples/java/com/azure/security/keyvault/keys/HelloWorldAsync.java
diff --git a/keyvault/client/keys/src/samples/java/com/azure/security/keyvault/keys/KeyClientJavaDocCodeSnippets.java b/sdk/keyvault/azure-keyvault-keys/src/samples/java/com/azure/security/keyvault/keys/KeyClientJavaDocCodeSnippets.java
similarity index 100%
rename from keyvault/client/keys/src/samples/java/com/azure/security/keyvault/keys/KeyClientJavaDocCodeSnippets.java
rename to sdk/keyvault/azure-keyvault-keys/src/samples/java/com/azure/security/keyvault/keys/KeyClientJavaDocCodeSnippets.java
diff --git a/keyvault/client/keys/src/samples/java/com/azure/security/keyvault/keys/ListOperations.java b/sdk/keyvault/azure-keyvault-keys/src/samples/java/com/azure/security/keyvault/keys/ListOperations.java
similarity index 100%
rename from keyvault/client/keys/src/samples/java/com/azure/security/keyvault/keys/ListOperations.java
rename to sdk/keyvault/azure-keyvault-keys/src/samples/java/com/azure/security/keyvault/keys/ListOperations.java
diff --git a/keyvault/client/keys/src/samples/java/com/azure/security/keyvault/keys/ListOperationsAsync.java b/sdk/keyvault/azure-keyvault-keys/src/samples/java/com/azure/security/keyvault/keys/ListOperationsAsync.java
similarity index 100%
rename from keyvault/client/keys/src/samples/java/com/azure/security/keyvault/keys/ListOperationsAsync.java
rename to sdk/keyvault/azure-keyvault-keys/src/samples/java/com/azure/security/keyvault/keys/ListOperationsAsync.java
diff --git a/keyvault/client/keys/src/samples/java/com/azure/security/keyvault/keys/ManagingDeletedKeys.java b/sdk/keyvault/azure-keyvault-keys/src/samples/java/com/azure/security/keyvault/keys/ManagingDeletedKeys.java
similarity index 100%
rename from keyvault/client/keys/src/samples/java/com/azure/security/keyvault/keys/ManagingDeletedKeys.java
rename to sdk/keyvault/azure-keyvault-keys/src/samples/java/com/azure/security/keyvault/keys/ManagingDeletedKeys.java
diff --git a/keyvault/client/keys/src/samples/java/com/azure/security/keyvault/keys/ManagingDeletedKeysAsync.java b/sdk/keyvault/azure-keyvault-keys/src/samples/java/com/azure/security/keyvault/keys/ManagingDeletedKeysAsync.java
similarity index 100%
rename from keyvault/client/keys/src/samples/java/com/azure/security/keyvault/keys/ManagingDeletedKeysAsync.java
rename to sdk/keyvault/azure-keyvault-keys/src/samples/java/com/azure/security/keyvault/keys/ManagingDeletedKeysAsync.java
diff --git a/keyvault/client/keys/src/test/java/com/azure/security/keyvault/keys/KeyAsyncClientTest.java b/sdk/keyvault/azure-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/KeyAsyncClientTest.java
similarity index 100%
rename from keyvault/client/keys/src/test/java/com/azure/security/keyvault/keys/KeyAsyncClientTest.java
rename to sdk/keyvault/azure-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/KeyAsyncClientTest.java
diff --git a/keyvault/client/keys/src/test/java/com/azure/security/keyvault/keys/KeyClientTest.java b/sdk/keyvault/azure-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/KeyClientTest.java
similarity index 100%
rename from keyvault/client/keys/src/test/java/com/azure/security/keyvault/keys/KeyClientTest.java
rename to sdk/keyvault/azure-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/KeyClientTest.java
diff --git a/keyvault/client/keys/src/test/java/com/azure/security/keyvault/keys/KeyClientTestBase.java b/sdk/keyvault/azure-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/KeyClientTestBase.java
similarity index 100%
rename from keyvault/client/keys/src/test/java/com/azure/security/keyvault/keys/KeyClientTestBase.java
rename to sdk/keyvault/azure-keyvault-keys/src/test/java/com/azure/security/keyvault/keys/KeyClientTestBase.java
diff --git a/keyvault/client/keys/src/test/resources/session-records/backupKey.json b/sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/backupKey.json
similarity index 100%
rename from keyvault/client/keys/src/test/resources/session-records/backupKey.json
rename to sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/backupKey.json
diff --git a/keyvault/client/keys/src/test/resources/session-records/backupKeyNotFound.json b/sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/backupKeyNotFound.json
similarity index 100%
rename from keyvault/client/keys/src/test/resources/session-records/backupKeyNotFound.json
rename to sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/backupKeyNotFound.json
diff --git a/keyvault/client/keys/src/test/resources/session-records/deleteKey.json b/sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/deleteKey.json
similarity index 100%
rename from keyvault/client/keys/src/test/resources/session-records/deleteKey.json
rename to sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/deleteKey.json
diff --git a/keyvault/client/keys/src/test/resources/session-records/deleteKeyNotFound.json b/sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/deleteKeyNotFound.json
similarity index 100%
rename from keyvault/client/keys/src/test/resources/session-records/deleteKeyNotFound.json
rename to sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/deleteKeyNotFound.json
diff --git a/keyvault/client/keys/src/test/resources/session-records/getDeletedKey.json b/sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/getDeletedKey.json
similarity index 100%
rename from keyvault/client/keys/src/test/resources/session-records/getDeletedKey.json
rename to sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/getDeletedKey.json
diff --git a/keyvault/client/keys/src/test/resources/session-records/getDeletedKeyNotFound.json b/sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/getDeletedKeyNotFound.json
similarity index 100%
rename from keyvault/client/keys/src/test/resources/session-records/getDeletedKeyNotFound.json
rename to sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/getDeletedKeyNotFound.json
diff --git a/keyvault/client/keys/src/test/resources/session-records/getKey.json b/sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/getKey.json
similarity index 100%
rename from keyvault/client/keys/src/test/resources/session-records/getKey.json
rename to sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/getKey.json
diff --git a/keyvault/client/keys/src/test/resources/session-records/getKeyNotFound.json b/sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/getKeyNotFound.json
similarity index 100%
rename from keyvault/client/keys/src/test/resources/session-records/getKeyNotFound.json
rename to sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/getKeyNotFound.json
diff --git a/keyvault/client/keys/src/test/resources/session-records/getKeySpecificVersion.json b/sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/getKeySpecificVersion.json
similarity index 100%
rename from keyvault/client/keys/src/test/resources/session-records/getKeySpecificVersion.json
rename to sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/getKeySpecificVersion.json
diff --git a/keyvault/client/keys/src/test/resources/session-records/listDeletedKeys.json b/sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/listDeletedKeys.json
similarity index 100%
rename from keyvault/client/keys/src/test/resources/session-records/listDeletedKeys.json
rename to sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/listDeletedKeys.json
diff --git a/keyvault/client/keys/src/test/resources/session-records/listKeyVersions.json b/sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/listKeyVersions.json
similarity index 100%
rename from keyvault/client/keys/src/test/resources/session-records/listKeyVersions.json
rename to sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/listKeyVersions.json
diff --git a/keyvault/client/keys/src/test/resources/session-records/listKeys.json b/sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/listKeys.json
similarity index 100%
rename from keyvault/client/keys/src/test/resources/session-records/listKeys.json
rename to sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/listKeys.json
diff --git a/keyvault/client/keys/src/test/resources/session-records/recoverDeletedKey.json b/sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/recoverDeletedKey.json
similarity index 100%
rename from keyvault/client/keys/src/test/resources/session-records/recoverDeletedKey.json
rename to sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/recoverDeletedKey.json
diff --git a/keyvault/client/keys/src/test/resources/session-records/recoverDeletedKeyNotFound.json b/sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/recoverDeletedKeyNotFound.json
similarity index 100%
rename from keyvault/client/keys/src/test/resources/session-records/recoverDeletedKeyNotFound.json
rename to sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/recoverDeletedKeyNotFound.json
diff --git a/keyvault/client/keys/src/test/resources/session-records/restoreKey.json b/sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/restoreKey.json
similarity index 100%
rename from keyvault/client/keys/src/test/resources/session-records/restoreKey.json
rename to sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/restoreKey.json
diff --git a/keyvault/client/keys/src/test/resources/session-records/restoreKeyFromMalformedBackup.json b/sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/restoreKeyFromMalformedBackup.json
similarity index 100%
rename from keyvault/client/keys/src/test/resources/session-records/restoreKeyFromMalformedBackup.json
rename to sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/restoreKeyFromMalformedBackup.json
diff --git a/keyvault/client/keys/src/test/resources/session-records/setKey.json b/sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/setKey.json
similarity index 100%
rename from keyvault/client/keys/src/test/resources/session-records/setKey.json
rename to sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/setKey.json
diff --git a/keyvault/client/keys/src/test/resources/session-records/setKeyEmptyName.json b/sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/setKeyEmptyName.json
similarity index 100%
rename from keyvault/client/keys/src/test/resources/session-records/setKeyEmptyName.json
rename to sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/setKeyEmptyName.json
diff --git a/keyvault/client/keys/src/test/resources/session-records/setKeyNull.json b/sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/setKeyNull.json
similarity index 100%
rename from keyvault/client/keys/src/test/resources/session-records/setKeyNull.json
rename to sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/setKeyNull.json
diff --git a/keyvault/client/keys/src/test/resources/session-records/setKeyNullType.json b/sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/setKeyNullType.json
similarity index 100%
rename from keyvault/client/keys/src/test/resources/session-records/setKeyNullType.json
rename to sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/setKeyNullType.json
diff --git a/keyvault/client/keys/src/test/resources/session-records/updateDisabledKey.json b/sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/updateDisabledKey.json
similarity index 100%
rename from keyvault/client/keys/src/test/resources/session-records/updateDisabledKey.json
rename to sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/updateDisabledKey.json
diff --git a/keyvault/client/keys/src/test/resources/session-records/updateKey.json b/sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/updateKey.json
similarity index 100%
rename from keyvault/client/keys/src/test/resources/session-records/updateKey.json
rename to sdk/keyvault/azure-keyvault-keys/src/test/resources/session-records/updateKey.json
diff --git a/keyvault/client/secrets/CHANGELOG.md b/sdk/keyvault/azure-keyvault-secrets/CHANGELOG.md
similarity index 100%
rename from keyvault/client/secrets/CHANGELOG.md
rename to sdk/keyvault/azure-keyvault-secrets/CHANGELOG.md
diff --git a/keyvault/client/secrets/README.md b/sdk/keyvault/azure-keyvault-secrets/README.md
similarity index 92%
rename from keyvault/client/secrets/README.md
rename to sdk/keyvault/azure-keyvault-secrets/README.md
index ce7c1bca37d6..e8ffe95e55d5 100644
--- a/keyvault/client/secrets/README.md
+++ b/sdk/keyvault/azure-keyvault-secrets/README.md
@@ -286,7 +286,7 @@ When you submit a pull request, a CLA-bot will automatically determine whether y
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the Code of Conduct FAQ or contact opencode@microsoft.com with any additional questions or comments.
-[source_code]: https://github.com/Azure/azure-sdk-for-java/tree/master/keyvault/client/secrets/src
+[source_code]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/keyvault/azure-keyvault-secrets/src
[api_documentation]: not-valid-link
[azure_identity]: https://github.com/Azure/azure-sdk-for-java/tree/master/identity/client
[azkeyvault_docs]: https://docs.microsoft.com/en-us/azure/key-vault/
@@ -299,12 +299,12 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope
[azure_create_application_in_portal]:https://docs.microsoft.com/en-us/azure/active-directory/develop/howto-create-service-principal-portal
[azure_keyvault_cli]:https://docs.microsoft.com/en-us/azure/key-vault/quick-create-cli
[azure_keyvault_cli_full]:https://docs.microsoft.com/en-us/cli/azure/keyvault?view=azure-cli-latest
-[secrets_samples]:https://github.com/Azure/azure-sdk-for-java/tree/master/keyvault/client/secrets/src/samples/java/com/azure/security/keyvault/secrets
-[sample_helloWorld]:https://github.com/Azure/azure-sdk-for-java/tree/master/keyvault/client/secrets/src/samples/java/com/azure/security/keyvault/secrets/HelloWorld.java
-[sample_helloWorldAsync]:https://github.com/Azure/azure-sdk-for-java/tree/master/keyvault/client/secrets/src/samples/java/com/azure/security/keyvault/secrets/HelloWorldAsync.java
-[sample_list]:https://github.com/Azure/azure-sdk-for-java/tree/master/keyvault/client/secrets/src/samples/java/com/azure/security/keyvault/secrets/ListOperations.java
-[sample_listAsync]:https://github.com/Azure/azure-sdk-for-java/tree/master/keyvault/client/secrets/src/samples/java/com/azure/security/keyvault/secrets/ListOperationsAsync.java
-[sample_BackupRestore]:https://github.com/Azure/azure-sdk-for-java/tree/master/keyvault/client/secrets/src/samples/java/com/azure/security/keyvault/secrets/BackupAndRestoreOperations.java
-[sample_BackupRestoreAsync]:https://github.com/Azure/azure-sdk-for-java/tree/master/keyvault/client/secrets/src/samples/java/com/azure/security/keyvault/secrets/BackupAndRestoreOperationsAsync.java
-[sample_ManageDeleted]:https://github.com/Azure/azure-sdk-for-java/tree/master/keyvault/client/secrets/src/samples/java/com/azure/security/keyvault/secrets/ManagingDeletedSecrets.java
-[sample_ManageDeletedAsync]:https://github.com/Azure/azure-sdk-for-java/tree/master/keyvault/client/secrets/src/samples/java/com/azure/security/keyvault/secrets/ManagingDeletedSecretsAsync.java
+[secrets_samples]:https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/keyvault/azure-keyvault-secrets/src/samples/java/com/azure/security/keyvault/secrets
+[sample_helloWorld]:https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/keyvault/azure-keyvault-secrets/src/samples/java/com/azure/security/keyvault/secrets/HelloWorld.java
+[sample_helloWorldAsync]:https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/keyvault/azure-keyvault-secrets/src/samples/java/com/azure/security/keyvault/secrets/HelloWorldAsync.java
+[sample_list]:https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/keyvault/azure-keyvault-secrets/src/samples/java/com/azure/security/keyvault/secrets/ListOperations.java
+[sample_listAsync]:https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/keyvault/azure-keyvault-secrets/src/samples/java/com/azure/security/keyvault/secrets/ListOperationsAsync.java
+[sample_BackupRestore]:https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/keyvault/azure-keyvault-secrets/src/samples/java/com/azure/security/keyvault/secrets/BackupAndRestoreOperations.java
+[sample_BackupRestoreAsync]:https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/keyvault/azure-keyvault-secrets/src/samples/java/com/azure/security/keyvault/secrets/BackupAndRestoreOperationsAsync.java
+[sample_ManageDeleted]:https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/keyvault/azure-keyvault-secrets/src/samples/java/com/azure/security/keyvault/secrets/ManagingDeletedSecrets.java
+[sample_ManageDeletedAsync]:https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/keyvault/azure-keyvault-secrets/src/samples/java/com/azure/security/keyvault/secrets/ManagingDeletedSecretsAsync.java
diff --git a/keyvault/client/secrets/pom.xml b/sdk/keyvault/azure-keyvault-secrets/pom.xml
similarity index 97%
rename from keyvault/client/secrets/pom.xml
rename to sdk/keyvault/azure-keyvault-secrets/pom.xml
index 172985cb4969..7f86407dd1df 100644
--- a/keyvault/client/secrets/pom.xml
+++ b/sdk/keyvault/azure-keyvault-secrets/pom.xml
@@ -6,7 +6,7 @@
com.azure
azure-keyvault-parent
4.0.0-preview.1
- ../pom.xml
+ ../pom.client.xml
com.azure
diff --git a/keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/AzureKeyVaultConfiguration.java b/sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/AzureKeyVaultConfiguration.java
similarity index 100%
rename from keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/AzureKeyVaultConfiguration.java
rename to sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/AzureKeyVaultConfiguration.java
diff --git a/keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/KeyVaultErrorCodeStrings.java b/sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/KeyVaultErrorCodeStrings.java
similarity index 100%
rename from keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/KeyVaultErrorCodeStrings.java
rename to sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/KeyVaultErrorCodeStrings.java
diff --git a/keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/SecretAsyncClient.java b/sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/SecretAsyncClient.java
similarity index 100%
rename from keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/SecretAsyncClient.java
rename to sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/SecretAsyncClient.java
diff --git a/keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/SecretBackup.java b/sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/SecretBackup.java
similarity index 100%
rename from keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/SecretBackup.java
rename to sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/SecretBackup.java
diff --git a/keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/SecretClient.java b/sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/SecretClient.java
similarity index 100%
rename from keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/SecretClient.java
rename to sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/SecretClient.java
diff --git a/keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/SecretClientBuilder.java b/sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/SecretClientBuilder.java
similarity index 100%
rename from keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/SecretClientBuilder.java
rename to sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/SecretClientBuilder.java
diff --git a/keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/SecretRequestAttributes.java b/sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/SecretRequestAttributes.java
similarity index 100%
rename from keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/SecretRequestAttributes.java
rename to sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/SecretRequestAttributes.java
diff --git a/keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/SecretRequestParameters.java b/sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/SecretRequestParameters.java
similarity index 100%
rename from keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/SecretRequestParameters.java
rename to sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/SecretRequestParameters.java
diff --git a/keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/SecretRestoreRequestParameters.java b/sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/SecretRestoreRequestParameters.java
similarity index 100%
rename from keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/SecretRestoreRequestParameters.java
rename to sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/SecretRestoreRequestParameters.java
diff --git a/keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/SecretService.java b/sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/SecretService.java
similarity index 100%
rename from keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/SecretService.java
rename to sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/SecretService.java
diff --git a/keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/implementation/DeletedSecretPage.java b/sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/implementation/DeletedSecretPage.java
similarity index 100%
rename from keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/implementation/DeletedSecretPage.java
rename to sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/implementation/DeletedSecretPage.java
diff --git a/keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/implementation/SecretBasePage.java b/sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/implementation/SecretBasePage.java
similarity index 100%
rename from keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/implementation/SecretBasePage.java
rename to sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/implementation/SecretBasePage.java
diff --git a/keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/models/DeletedSecret.java b/sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/models/DeletedSecret.java
similarity index 100%
rename from keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/models/DeletedSecret.java
rename to sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/models/DeletedSecret.java
diff --git a/keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/models/Secret.java b/sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/models/Secret.java
similarity index 100%
rename from keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/models/Secret.java
rename to sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/models/Secret.java
diff --git a/keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/models/SecretBase.java b/sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/models/SecretBase.java
similarity index 100%
rename from keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/models/SecretBase.java
rename to sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/models/SecretBase.java
diff --git a/keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/models/package-info.java b/sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/models/package-info.java
similarity index 100%
rename from keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/models/package-info.java
rename to sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/models/package-info.java
diff --git a/keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/package-info.java b/sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/package-info.java
similarity index 100%
rename from keyvault/client/secrets/src/main/java/com/azure/security/keyvault/secrets/package-info.java
rename to sdk/keyvault/azure-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/package-info.java
diff --git a/keyvault/client/secrets/src/main/resources/kvErrorStrings.properties b/sdk/keyvault/azure-keyvault-secrets/src/main/resources/kvErrorStrings.properties
similarity index 100%
rename from keyvault/client/secrets/src/main/resources/kvErrorStrings.properties
rename to sdk/keyvault/azure-keyvault-secrets/src/main/resources/kvErrorStrings.properties
diff --git a/keyvault/client/secrets/src/samples/java/com/azure/security/keyvault/secrets/BackupAndRestoreOperations.java b/sdk/keyvault/azure-keyvault-secrets/src/samples/java/com/azure/security/keyvault/secrets/BackupAndRestoreOperations.java
similarity index 100%
rename from keyvault/client/secrets/src/samples/java/com/azure/security/keyvault/secrets/BackupAndRestoreOperations.java
rename to sdk/keyvault/azure-keyvault-secrets/src/samples/java/com/azure/security/keyvault/secrets/BackupAndRestoreOperations.java
diff --git a/keyvault/client/secrets/src/samples/java/com/azure/security/keyvault/secrets/BackupAndRestoreOperationsAsync.java b/sdk/keyvault/azure-keyvault-secrets/src/samples/java/com/azure/security/keyvault/secrets/BackupAndRestoreOperationsAsync.java
similarity index 100%
rename from keyvault/client/secrets/src/samples/java/com/azure/security/keyvault/secrets/BackupAndRestoreOperationsAsync.java
rename to sdk/keyvault/azure-keyvault-secrets/src/samples/java/com/azure/security/keyvault/secrets/BackupAndRestoreOperationsAsync.java
diff --git a/keyvault/client/secrets/src/samples/java/com/azure/security/keyvault/secrets/HelloWorld.java b/sdk/keyvault/azure-keyvault-secrets/src/samples/java/com/azure/security/keyvault/secrets/HelloWorld.java
similarity index 100%
rename from keyvault/client/secrets/src/samples/java/com/azure/security/keyvault/secrets/HelloWorld.java
rename to sdk/keyvault/azure-keyvault-secrets/src/samples/java/com/azure/security/keyvault/secrets/HelloWorld.java
diff --git a/keyvault/client/secrets/src/samples/java/com/azure/security/keyvault/secrets/HelloWorldAsync.java b/sdk/keyvault/azure-keyvault-secrets/src/samples/java/com/azure/security/keyvault/secrets/HelloWorldAsync.java
similarity index 100%
rename from keyvault/client/secrets/src/samples/java/com/azure/security/keyvault/secrets/HelloWorldAsync.java
rename to sdk/keyvault/azure-keyvault-secrets/src/samples/java/com/azure/security/keyvault/secrets/HelloWorldAsync.java
diff --git a/keyvault/client/secrets/src/samples/java/com/azure/security/keyvault/secrets/ListOperations.java b/sdk/keyvault/azure-keyvault-secrets/src/samples/java/com/azure/security/keyvault/secrets/ListOperations.java
similarity index 100%
rename from keyvault/client/secrets/src/samples/java/com/azure/security/keyvault/secrets/ListOperations.java
rename to sdk/keyvault/azure-keyvault-secrets/src/samples/java/com/azure/security/keyvault/secrets/ListOperations.java
diff --git a/keyvault/client/secrets/src/samples/java/com/azure/security/keyvault/secrets/ListOperationsAsync.java b/sdk/keyvault/azure-keyvault-secrets/src/samples/java/com/azure/security/keyvault/secrets/ListOperationsAsync.java
similarity index 100%
rename from keyvault/client/secrets/src/samples/java/com/azure/security/keyvault/secrets/ListOperationsAsync.java
rename to sdk/keyvault/azure-keyvault-secrets/src/samples/java/com/azure/security/keyvault/secrets/ListOperationsAsync.java
diff --git a/keyvault/client/secrets/src/samples/java/com/azure/security/keyvault/secrets/ManagingDeletedSecrets.java b/sdk/keyvault/azure-keyvault-secrets/src/samples/java/com/azure/security/keyvault/secrets/ManagingDeletedSecrets.java
similarity index 100%
rename from keyvault/client/secrets/src/samples/java/com/azure/security/keyvault/secrets/ManagingDeletedSecrets.java
rename to sdk/keyvault/azure-keyvault-secrets/src/samples/java/com/azure/security/keyvault/secrets/ManagingDeletedSecrets.java
diff --git a/keyvault/client/secrets/src/samples/java/com/azure/security/keyvault/secrets/ManagingDeletedSecretsAsync.java b/sdk/keyvault/azure-keyvault-secrets/src/samples/java/com/azure/security/keyvault/secrets/ManagingDeletedSecretsAsync.java
similarity index 100%
rename from keyvault/client/secrets/src/samples/java/com/azure/security/keyvault/secrets/ManagingDeletedSecretsAsync.java
rename to sdk/keyvault/azure-keyvault-secrets/src/samples/java/com/azure/security/keyvault/secrets/ManagingDeletedSecretsAsync.java
diff --git a/keyvault/client/secrets/src/samples/java/com/azure/security/keyvault/secrets/SecretClientJavaDocCodeSnippets.java b/sdk/keyvault/azure-keyvault-secrets/src/samples/java/com/azure/security/keyvault/secrets/SecretClientJavaDocCodeSnippets.java
similarity index 100%
rename from keyvault/client/secrets/src/samples/java/com/azure/security/keyvault/secrets/SecretClientJavaDocCodeSnippets.java
rename to sdk/keyvault/azure-keyvault-secrets/src/samples/java/com/azure/security/keyvault/secrets/SecretClientJavaDocCodeSnippets.java
diff --git a/keyvault/client/secrets/src/test/java/com/azure/security/keyvault/secrets/SecretAsyncClientTest.java b/sdk/keyvault/azure-keyvault-secrets/src/test/java/com/azure/security/keyvault/secrets/SecretAsyncClientTest.java
similarity index 100%
rename from keyvault/client/secrets/src/test/java/com/azure/security/keyvault/secrets/SecretAsyncClientTest.java
rename to sdk/keyvault/azure-keyvault-secrets/src/test/java/com/azure/security/keyvault/secrets/SecretAsyncClientTest.java
diff --git a/keyvault/client/secrets/src/test/java/com/azure/security/keyvault/secrets/SecretClientTest.java b/sdk/keyvault/azure-keyvault-secrets/src/test/java/com/azure/security/keyvault/secrets/SecretClientTest.java
similarity index 100%
rename from keyvault/client/secrets/src/test/java/com/azure/security/keyvault/secrets/SecretClientTest.java
rename to sdk/keyvault/azure-keyvault-secrets/src/test/java/com/azure/security/keyvault/secrets/SecretClientTest.java
diff --git a/keyvault/client/secrets/src/test/java/com/azure/security/keyvault/secrets/SecretClientTestBase.java b/sdk/keyvault/azure-keyvault-secrets/src/test/java/com/azure/security/keyvault/secrets/SecretClientTestBase.java
similarity index 100%
rename from keyvault/client/secrets/src/test/java/com/azure/security/keyvault/secrets/SecretClientTestBase.java
rename to sdk/keyvault/azure-keyvault-secrets/src/test/java/com/azure/security/keyvault/secrets/SecretClientTestBase.java
diff --git a/keyvault/client/secrets/src/test/resources/session-records/backupSecret.json b/sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/backupSecret.json
similarity index 100%
rename from keyvault/client/secrets/src/test/resources/session-records/backupSecret.json
rename to sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/backupSecret.json
diff --git a/keyvault/client/secrets/src/test/resources/session-records/backupSecretNotFound.json b/sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/backupSecretNotFound.json
similarity index 100%
rename from keyvault/client/secrets/src/test/resources/session-records/backupSecretNotFound.json
rename to sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/backupSecretNotFound.json
diff --git a/keyvault/client/secrets/src/test/resources/session-records/deleteSecret.json b/sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/deleteSecret.json
similarity index 100%
rename from keyvault/client/secrets/src/test/resources/session-records/deleteSecret.json
rename to sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/deleteSecret.json
diff --git a/keyvault/client/secrets/src/test/resources/session-records/deleteSecretNotFound.json b/sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/deleteSecretNotFound.json
similarity index 100%
rename from keyvault/client/secrets/src/test/resources/session-records/deleteSecretNotFound.json
rename to sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/deleteSecretNotFound.json
diff --git a/keyvault/client/secrets/src/test/resources/session-records/getDeletedSecret.json b/sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/getDeletedSecret.json
similarity index 100%
rename from keyvault/client/secrets/src/test/resources/session-records/getDeletedSecret.json
rename to sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/getDeletedSecret.json
diff --git a/keyvault/client/secrets/src/test/resources/session-records/getDeletedSecretNotFound.json b/sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/getDeletedSecretNotFound.json
similarity index 100%
rename from keyvault/client/secrets/src/test/resources/session-records/getDeletedSecretNotFound.json
rename to sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/getDeletedSecretNotFound.json
diff --git a/keyvault/client/secrets/src/test/resources/session-records/getSecret.json b/sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/getSecret.json
similarity index 100%
rename from keyvault/client/secrets/src/test/resources/session-records/getSecret.json
rename to sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/getSecret.json
diff --git a/keyvault/client/secrets/src/test/resources/session-records/getSecretNotFound.json b/sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/getSecretNotFound.json
similarity index 100%
rename from keyvault/client/secrets/src/test/resources/session-records/getSecretNotFound.json
rename to sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/getSecretNotFound.json
diff --git a/keyvault/client/secrets/src/test/resources/session-records/getSecretSpecificVersion.json b/sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/getSecretSpecificVersion.json
similarity index 100%
rename from keyvault/client/secrets/src/test/resources/session-records/getSecretSpecificVersion.json
rename to sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/getSecretSpecificVersion.json
diff --git a/keyvault/client/secrets/src/test/resources/session-records/listDeletedSecrets.json b/sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/listDeletedSecrets.json
similarity index 100%
rename from keyvault/client/secrets/src/test/resources/session-records/listDeletedSecrets.json
rename to sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/listDeletedSecrets.json
diff --git a/keyvault/client/secrets/src/test/resources/session-records/listSecretVersions.json b/sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/listSecretVersions.json
similarity index 100%
rename from keyvault/client/secrets/src/test/resources/session-records/listSecretVersions.json
rename to sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/listSecretVersions.json
diff --git a/keyvault/client/secrets/src/test/resources/session-records/listSecrets.json b/sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/listSecrets.json
similarity index 100%
rename from keyvault/client/secrets/src/test/resources/session-records/listSecrets.json
rename to sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/listSecrets.json
diff --git a/keyvault/client/secrets/src/test/resources/session-records/recoverDeletedSecret.json b/sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/recoverDeletedSecret.json
similarity index 100%
rename from keyvault/client/secrets/src/test/resources/session-records/recoverDeletedSecret.json
rename to sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/recoverDeletedSecret.json
diff --git a/keyvault/client/secrets/src/test/resources/session-records/recoverDeletedSecretNotFound.json b/sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/recoverDeletedSecretNotFound.json
similarity index 100%
rename from keyvault/client/secrets/src/test/resources/session-records/recoverDeletedSecretNotFound.json
rename to sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/recoverDeletedSecretNotFound.json
diff --git a/keyvault/client/secrets/src/test/resources/session-records/restoreSecret.json b/sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/restoreSecret.json
similarity index 100%
rename from keyvault/client/secrets/src/test/resources/session-records/restoreSecret.json
rename to sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/restoreSecret.json
diff --git a/keyvault/client/secrets/src/test/resources/session-records/restoreSecretFromMalformedBackup.json b/sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/restoreSecretFromMalformedBackup.json
similarity index 100%
rename from keyvault/client/secrets/src/test/resources/session-records/restoreSecretFromMalformedBackup.json
rename to sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/restoreSecretFromMalformedBackup.json
diff --git a/keyvault/client/secrets/src/test/resources/session-records/setSecret.json b/sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/setSecret.json
similarity index 100%
rename from keyvault/client/secrets/src/test/resources/session-records/setSecret.json
rename to sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/setSecret.json
diff --git a/keyvault/client/secrets/src/test/resources/session-records/setSecretEmptyName.json b/sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/setSecretEmptyName.json
similarity index 100%
rename from keyvault/client/secrets/src/test/resources/session-records/setSecretEmptyName.json
rename to sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/setSecretEmptyName.json
diff --git a/keyvault/client/secrets/src/test/resources/session-records/setSecretEmptyValue.json b/sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/setSecretEmptyValue.json
similarity index 100%
rename from keyvault/client/secrets/src/test/resources/session-records/setSecretEmptyValue.json
rename to sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/setSecretEmptyValue.json
diff --git a/keyvault/client/secrets/src/test/resources/session-records/setSecretNull.json b/sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/setSecretNull.json
similarity index 100%
rename from keyvault/client/secrets/src/test/resources/session-records/setSecretNull.json
rename to sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/setSecretNull.json
diff --git a/keyvault/client/secrets/src/test/resources/session-records/updateDisabledSecret.json b/sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/updateDisabledSecret.json
similarity index 100%
rename from keyvault/client/secrets/src/test/resources/session-records/updateDisabledSecret.json
rename to sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/updateDisabledSecret.json
diff --git a/keyvault/client/secrets/src/test/resources/session-records/updateSecret.json b/sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/updateSecret.json
similarity index 100%
rename from keyvault/client/secrets/src/test/resources/session-records/updateSecret.json
rename to sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/updateSecret.json
diff --git a/keyvault/client/secrets/src/test/resources/session-records/updateSetting.json b/sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/updateSetting.json
similarity index 100%
rename from keyvault/client/secrets/src/test/resources/session-records/updateSetting.json
rename to sdk/keyvault/azure-keyvault-secrets/src/test/resources/session-records/updateSetting.json
diff --git a/sdk/keyvault/microsoft-azure-keyvault-complete/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-complete/pom.xml
index d9d090442fb9..52b486d560c3 100644
--- a/sdk/keyvault/microsoft-azure-keyvault-complete/pom.xml
+++ b/sdk/keyvault/microsoft-azure-keyvault-complete/pom.xml
@@ -8,7 +8,7 @@ the MIT License. See License.txt in the project root for license information. --
com.microsoft.azure
azure-keyvault-parent
1.2.1
- ../pom.xml
+ ../pom.data.xml
com.microsoft.azure
diff --git a/sdk/keyvault/microsoft-azure-keyvault-core/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-core/pom.xml
index 85059fc4aa9d..ac37e02c8f65 100644
--- a/sdk/keyvault/microsoft-azure-keyvault-core/pom.xml
+++ b/sdk/keyvault/microsoft-azure-keyvault-core/pom.xml
@@ -9,7 +9,7 @@
com.microsoft.azure
azure-keyvault-parent
1.2.1
- ../pom.xml
+ ../pom.data.xml
com.microsoft.azure
diff --git a/sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml
index b0b295a50453..b89291571a57 100644
--- a/sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml
+++ b/sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml
@@ -8,7 +8,7 @@
com.microsoft.azure
azure-keyvault-parent
1.2.1
- ../pom.xml
+ ../pom.data.xml
com.microsoft.azure
diff --git a/sdk/keyvault/microsoft-azure-keyvault-extensions/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-extensions/pom.xml
index 17bda8b4fe68..40eb0fbb486a 100644
--- a/sdk/keyvault/microsoft-azure-keyvault-extensions/pom.xml
+++ b/sdk/keyvault/microsoft-azure-keyvault-extensions/pom.xml
@@ -9,7 +9,7 @@
com.microsoft.azure
azure-keyvault-parent
1.2.1
- ../pom.xml
+ ../pom.data.xml
azure-keyvault-extensions
diff --git a/sdk/keyvault/microsoft-azure-keyvault-test/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-test/pom.xml
index 6d3a3cf985cd..f8dd24695ff9 100644
--- a/sdk/keyvault/microsoft-azure-keyvault-test/pom.xml
+++ b/sdk/keyvault/microsoft-azure-keyvault-test/pom.xml
@@ -7,7 +7,7 @@
com.microsoft.azure
azure-keyvault-parent
1.2.1
- ../pom.xml
+ ../pom.data.xml
azure-keyvault-test
azure-keyvault-test
diff --git a/sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml
index 7091c9630d61..f79a9cda82ce 100644
--- a/sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml
+++ b/sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml
@@ -7,7 +7,7 @@
com.microsoft.azure
azure-keyvault-parent
1.2.1
- ../pom.xml
+ ../pom.data.xml
azure-keyvault-webkey
diff --git a/sdk/keyvault/microsoft-azure-keyvault/pom.xml b/sdk/keyvault/microsoft-azure-keyvault/pom.xml
index efccc7a35fac..482acf233fe3 100644
--- a/sdk/keyvault/microsoft-azure-keyvault/pom.xml
+++ b/sdk/keyvault/microsoft-azure-keyvault/pom.xml
@@ -7,7 +7,7 @@ the MIT License. See License.txt in the project root for license information. --
com.microsoft.azure
azure-keyvault-parent
1.2.1
- ../pom.xml
+ ../pom.data.xml
com.microsoft.azure
diff --git a/keyvault/client/pom.xml b/sdk/keyvault/pom.client.xml
similarity index 92%
rename from keyvault/client/pom.xml
rename to sdk/keyvault/pom.client.xml
index 5f0a2d8a7e05..56af4e99df0b 100644
--- a/keyvault/client/pom.xml
+++ b/sdk/keyvault/pom.client.xml
@@ -32,7 +32,7 @@
- ./keys
- ./secrets
+ azure-keyvault-keys
+ azure-keyvault-secrets
diff --git a/sdk/keyvault/pom.xml b/sdk/keyvault/pom.data.xml
similarity index 100%
rename from sdk/keyvault/pom.xml
rename to sdk/keyvault/pom.data.xml
diff --git a/sdk/keyvault/pom.service.xml b/sdk/keyvault/pom.service.xml
index 56f12fc9d934..862a0ba0d96e 100644
--- a/sdk/keyvault/pom.service.xml
+++ b/sdk/keyvault/pom.service.xml
@@ -9,11 +9,21 @@
pom
1.0.0
+
+
microsoft-azure-keyvault
microsoft-azure-keyvault-core
microsoft-azure-keyvault-webkey
microsoft-azure-keyvault-cryptography
microsoft-azure-keyvault-extensions
microsoft-azure-keyvault-complete
+
+
+ ../../core
+ ../identity/azure-identity
+ azure-keyvault-keys
+ azure-keyvault-secrets
+
+