Azure · mitchdenny · Jul 9, 2019 · Jul 9, 2019 · Jul 9, 2019 · Jul 9, 2019
diff --git a/pom.client.xml b/pom.client.xml
@@ -735,7 +735,8 @@
     <module>./sdk/appconfiguration/azure-data-appconfiguration</module>
     <module>./core</module>
     <module>./eventhubs/client</module>
-    <module>./keyvault/client</module>
+    <module>./sdk/keyvault/azure-keyvault-secrets</module>
+    <module>./sdk/keyvault/azure-keyvault-keys</module>
     <!-- As recommended by Eng Sys team, removing tracing as it is built and released separately -->
 <!--    <module>./sdk/tracing</module>-->
     <module>./sdk/identity/azure-identity</module>

diff --git a/keyvault/client/keys/CHANGELOG.md → ...keyvault/azure-keyvault-keys/CHANGELOG.md b/keyvault/client/keys/CHANGELOG.md → ...keyvault/azure-keyvault-keys/CHANGELOG.md
diff --git a/keyvault/client/keys/README.md → sdk/keyvault/azure-keyvault-keys/README.md b/keyvault/client/keys/README.md → 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.
 
 <!-- LINKS -->
-[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 → sdk/keyvault/azure-keyvault-keys/pom.xml b/keyvault/client/keys/pom.xml → sdk/keyvault/azure-keyvault-keys/pom.xml
@@ -6,7 +6,7 @@
     <artifactId>azure-keyvault-parent</artifactId>
     <groupId>com.azure</groupId>
     <version>4.0.0-preview.1</version>
-    <relativePath>../pom.xml</relativePath>
+    <relativePath>../pom.client.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/...ault/keys/AzureKeyVaultConfiguration.java → ...ault/keys/AzureKeyVaultConfiguration.java b/...ault/keys/AzureKeyVaultConfiguration.java → ...ault/keys/AzureKeyVaultConfiguration.java
diff --git a/...ecurity/keyvault/keys/KeyAsyncClient.java → ...ecurity/keyvault/keys/KeyAsyncClient.java b/...ecurity/keyvault/keys/KeyAsyncClient.java → ...ecurity/keyvault/keys/KeyAsyncClient.java
diff --git a/...ure/security/keyvault/keys/KeyBackup.java → ...ure/security/keyvault/keys/KeyBackup.java b/...ure/security/keyvault/keys/KeyBackup.java → ...ure/security/keyvault/keys/KeyBackup.java
diff --git a/...ure/security/keyvault/keys/KeyClient.java → ...ure/security/keyvault/keys/KeyClient.java b/...ure/security/keyvault/keys/KeyClient.java → ...ure/security/keyvault/keys/KeyClient.java
diff --git a/...urity/keyvault/keys/KeyClientBuilder.java → ...urity/keyvault/keys/KeyClientBuilder.java b/...urity/keyvault/keys/KeyClientBuilder.java → ...urity/keyvault/keys/KeyClientBuilder.java
diff --git a/...ault/keys/KeyImportRequestParameters.java → ...ault/keys/KeyImportRequestParameters.java b/...ault/keys/KeyImportRequestParameters.java → ...ault/keys/KeyImportRequestParameters.java
diff --git a/...y/keyvault/keys/KeyRequestAttributes.java → ...y/keyvault/keys/KeyRequestAttributes.java b/...y/keyvault/keys/KeyRequestAttributes.java → ...y/keyvault/keys/KeyRequestAttributes.java
diff --git a/...y/keyvault/keys/KeyRequestParameters.java → ...y/keyvault/keys/KeyRequestParameters.java b/...y/keyvault/keys/KeyRequestParameters.java → ...y/keyvault/keys/KeyRequestParameters.java
diff --git a/...ult/keys/KeyRestoreRequestParameters.java → ...ult/keys/KeyRestoreRequestParameters.java b/...ult/keys/KeyRestoreRequestParameters.java → ...ult/keys/KeyRestoreRequestParameters.java
diff --git a/...re/security/keyvault/keys/KeyService.java → ...re/security/keyvault/keys/KeyService.java b/...re/security/keyvault/keys/KeyService.java → ...re/security/keyvault/keys/KeyService.java
diff --git a/...yvault/keys/KeyVaultErrorCodeStrings.java → ...yvault/keys/KeyVaultErrorCodeStrings.java b/...yvault/keys/KeyVaultErrorCodeStrings.java → ...yvault/keys/KeyVaultErrorCodeStrings.java
diff --git a/...t/keys/implementation/DeletedKeyPage.java → ...t/keys/implementation/DeletedKeyPage.java b/...t/keys/implementation/DeletedKeyPage.java → ...t/keys/implementation/DeletedKeyPage.java
diff --git a/...ault/keys/implementation/KeyBasePage.java → ...ault/keys/implementation/KeyBasePage.java b/...ault/keys/implementation/KeyBasePage.java → ...ault/keys/implementation/KeyBasePage.java
diff --git a/...rity/keyvault/keys/models/DeletedKey.java → ...rity/keyvault/keys/models/DeletedKey.java b/...rity/keyvault/keys/models/DeletedKey.java → ...rity/keyvault/keys/models/DeletedKey.java
diff --git a/...vault/keys/models/EcKeyCreateOptions.java → ...vault/keys/models/EcKeyCreateOptions.java b/...vault/keys/models/EcKeyCreateOptions.java → ...vault/keys/models/EcKeyCreateOptions.java
diff --git a/...re/security/keyvault/keys/models/Key.java → ...re/security/keyvault/keys/models/Key.java b/...re/security/keyvault/keys/models/Key.java → ...re/security/keyvault/keys/models/Key.java
diff --git a/...ecurity/keyvault/keys/models/KeyBase.java → ...ecurity/keyvault/keys/models/KeyBase.java b/...ecurity/keyvault/keys/models/KeyBase.java → ...ecurity/keyvault/keys/models/KeyBase.java
diff --git a/...eyvault/keys/models/KeyCreateOptions.java → ...eyvault/keys/models/KeyCreateOptions.java b/...eyvault/keys/models/KeyCreateOptions.java → ...eyvault/keys/models/KeyCreateOptions.java
diff --git a/...eyvault/keys/models/KeyImportOptions.java → ...eyvault/keys/models/KeyImportOptions.java b/...eyvault/keys/models/KeyImportOptions.java → ...eyvault/keys/models/KeyImportOptions.java
diff --git a/...ault/keys/models/RsaKeyCreateOptions.java → ...ault/keys/models/RsaKeyCreateOptions.java b/...ault/keys/models/RsaKeyCreateOptions.java → ...ault/keys/models/RsaKeyCreateOptions.java
diff --git a/...ty/keyvault/keys/models/package-info.java → ...ty/keyvault/keys/models/package-info.java b/...ty/keyvault/keys/models/package-info.java → ...ty/keyvault/keys/models/package-info.java
diff --git a/...els/webkey/Base64UrlJsonDeserializer.java → ...els/webkey/Base64UrlJsonDeserializer.java b/...els/webkey/Base64UrlJsonDeserializer.java → ...els/webkey/Base64UrlJsonDeserializer.java
diff --git a/...odels/webkey/Base64UrlJsonSerializer.java → ...odels/webkey/Base64UrlJsonSerializer.java b/...odels/webkey/Base64UrlJsonSerializer.java → ...odels/webkey/Base64UrlJsonSerializer.java
diff --git a/...lt/keys/models/webkey/ByteExtensions.java → ...lt/keys/models/webkey/ByteExtensions.java b/...lt/keys/models/webkey/ByteExtensions.java → ...lt/keys/models/webkey/ByteExtensions.java
diff --git a/...yvault/keys/models/webkey/JsonWebKey.java → ...yvault/keys/models/webkey/JsonWebKey.java b/...yvault/keys/models/webkey/JsonWebKey.java → ...yvault/keys/models/webkey/JsonWebKey.java
diff --git a/...ault/keys/models/webkey/KeyCurveName.java → ...ault/keys/models/webkey/KeyCurveName.java b/...ault/keys/models/webkey/KeyCurveName.java → ...ault/keys/models/webkey/KeyCurveName.java
diff --git a/...ault/keys/models/webkey/KeyOperation.java → ...ault/keys/models/webkey/KeyOperation.java b/...ault/keys/models/webkey/KeyOperation.java → ...ault/keys/models/webkey/KeyOperation.java
diff --git a/.../keyvault/keys/models/webkey/KeyType.java → .../keyvault/keys/models/webkey/KeyType.java b/.../keyvault/keys/models/webkey/KeyType.java → .../keyvault/keys/models/webkey/KeyType.java
diff --git a/...ault/keys/models/webkey/package-info.java → ...ault/keys/models/webkey/package-info.java b/...ault/keys/models/webkey/package-info.java → ...ault/keys/models/webkey/package-info.java
diff --git a/.../security/keyvault/keys/package-info.java → .../security/keyvault/keys/package-info.java b/.../security/keyvault/keys/package-info.java → .../security/keyvault/keys/package-info.java
diff --git a/.../main/resources/kvErrorStrings.properties → .../main/resources/kvErrorStrings.properties b/.../main/resources/kvErrorStrings.properties → .../main/resources/kvErrorStrings.properties
diff --git a/...ault/keys/BackupAndRestoreOperations.java → ...ault/keys/BackupAndRestoreOperations.java b/...ault/keys/BackupAndRestoreOperations.java → ...ault/keys/BackupAndRestoreOperations.java
diff --git a/...keys/BackupAndRestoreOperationsAsync.java → ...keys/BackupAndRestoreOperationsAsync.java b/...keys/BackupAndRestoreOperationsAsync.java → ...keys/BackupAndRestoreOperationsAsync.java
diff --git a/...re/security/keyvault/keys/HelloWorld.java → ...re/security/keyvault/keys/HelloWorld.java b/...re/security/keyvault/keys/HelloWorld.java → ...re/security/keyvault/keys/HelloWorld.java
diff --git a/...curity/keyvault/keys/HelloWorldAsync.java → ...curity/keyvault/keys/HelloWorldAsync.java b/...curity/keyvault/keys/HelloWorldAsync.java → ...curity/keyvault/keys/HelloWorldAsync.java
diff --git a/...lt/keys/KeyClientJavaDocCodeSnippets.java → ...lt/keys/KeyClientJavaDocCodeSnippets.java b/...lt/keys/KeyClientJavaDocCodeSnippets.java → ...lt/keys/KeyClientJavaDocCodeSnippets.java
diff --git a/...ecurity/keyvault/keys/ListOperations.java → ...ecurity/keyvault/keys/ListOperations.java b/...ecurity/keyvault/keys/ListOperations.java → ...ecurity/keyvault/keys/ListOperations.java
diff --git a/...ty/keyvault/keys/ListOperationsAsync.java → ...ty/keyvault/keys/ListOperationsAsync.java b/...ty/keyvault/keys/ListOperationsAsync.java → ...ty/keyvault/keys/ListOperationsAsync.java
diff --git a/...ty/keyvault/keys/ManagingDeletedKeys.java → ...ty/keyvault/keys/ManagingDeletedKeys.java b/...ty/keyvault/keys/ManagingDeletedKeys.java → ...ty/keyvault/keys/ManagingDeletedKeys.java
diff --git a/...yvault/keys/ManagingDeletedKeysAsync.java → ...yvault/keys/ManagingDeletedKeysAsync.java b/...yvault/keys/ManagingDeletedKeysAsync.java → ...yvault/keys/ManagingDeletedKeysAsync.java
diff --git a/...ity/keyvault/keys/KeyAsyncClientTest.java → ...ity/keyvault/keys/KeyAsyncClientTest.java b/...ity/keyvault/keys/KeyAsyncClientTest.java → ...ity/keyvault/keys/KeyAsyncClientTest.java
diff --git a/...security/keyvault/keys/KeyClientTest.java → ...security/keyvault/keys/KeyClientTest.java b/...security/keyvault/keys/KeyClientTest.java → ...security/keyvault/keys/KeyClientTest.java
diff --git a/...rity/keyvault/keys/KeyClientTestBase.java → ...rity/keyvault/keys/KeyClientTestBase.java b/...rity/keyvault/keys/KeyClientTestBase.java → ...rity/keyvault/keys/KeyClientTestBase.java
diff --git a/.../resources/session-records/backupKey.json → .../resources/session-records/backupKey.json b/.../resources/session-records/backupKey.json → .../resources/session-records/backupKey.json
diff --git a/...es/session-records/backupKeyNotFound.json → ...es/session-records/backupKeyNotFound.json b/...es/session-records/backupKeyNotFound.json → ...es/session-records/backupKeyNotFound.json
diff --git a/.../resources/session-records/deleteKey.json → .../resources/session-records/deleteKey.json b/.../resources/session-records/deleteKey.json → .../resources/session-records/deleteKey.json
diff --git a/...es/session-records/deleteKeyNotFound.json → ...es/session-records/deleteKeyNotFound.json b/...es/session-records/deleteKeyNotFound.json → ...es/session-records/deleteKeyNotFound.json
diff --git a/...ources/session-records/getDeletedKey.json → ...ources/session-records/getDeletedKey.json b/...ources/session-records/getDeletedKey.json → ...ources/session-records/getDeletedKey.json
diff --git a/...ession-records/getDeletedKeyNotFound.json → ...ession-records/getDeletedKeyNotFound.json b/...ession-records/getDeletedKeyNotFound.json → ...ession-records/getDeletedKeyNotFound.json
diff --git a/...est/resources/session-records/getKey.json → ...est/resources/session-records/getKey.json b/...est/resources/session-records/getKey.json → ...est/resources/session-records/getKey.json
diff --git a/...urces/session-records/getKeyNotFound.json → ...urces/session-records/getKeyNotFound.json b/...urces/session-records/getKeyNotFound.json → ...urces/session-records/getKeyNotFound.json
diff --git a/...ession-records/getKeySpecificVersion.json → ...ession-records/getKeySpecificVersion.json b/...ession-records/getKeySpecificVersion.json → ...ession-records/getKeySpecificVersion.json
diff --git a/...rces/session-records/listDeletedKeys.json → ...rces/session-records/listDeletedKeys.json b/...rces/session-records/listDeletedKeys.json → ...rces/session-records/listDeletedKeys.json
diff --git a/...rces/session-records/listKeyVersions.json → ...rces/session-records/listKeyVersions.json b/...rces/session-records/listKeyVersions.json → ...rces/session-records/listKeyVersions.json
diff --git a/...t/resources/session-records/listKeys.json → ...t/resources/session-records/listKeys.json b/...t/resources/session-records/listKeys.json → ...t/resources/session-records/listKeys.json
diff --git a/...es/session-records/recoverDeletedKey.json → ...es/session-records/recoverDeletedKey.json b/...es/session-records/recoverDeletedKey.json → ...es/session-records/recoverDeletedKey.json
diff --git a/...on-records/recoverDeletedKeyNotFound.json → ...on-records/recoverDeletedKeyNotFound.json b/...on-records/recoverDeletedKeyNotFound.json → ...on-records/recoverDeletedKeyNotFound.json
diff --git a/...resources/session-records/restoreKey.json → ...resources/session-records/restoreKey.json b/...resources/session-records/restoreKey.json → ...resources/session-records/restoreKey.json
diff --git a/...ecords/restoreKeyFromMalformedBackup.json → ...ecords/restoreKeyFromMalformedBackup.json b/...ecords/restoreKeyFromMalformedBackup.json → ...ecords/restoreKeyFromMalformedBackup.json
diff --git a/...est/resources/session-records/setKey.json → ...est/resources/session-records/setKey.json b/...est/resources/session-records/setKey.json → ...est/resources/session-records/setKey.json
diff --git a/...rces/session-records/setKeyEmptyName.json → ...rces/session-records/setKeyEmptyName.json b/...rces/session-records/setKeyEmptyName.json → ...rces/session-records/setKeyEmptyName.json
diff --git a/...resources/session-records/setKeyNull.json → ...resources/session-records/setKeyNull.json b/...resources/session-records/setKeyNull.json → ...resources/session-records/setKeyNull.json
diff --git a/...urces/session-records/setKeyNullType.json → ...urces/session-records/setKeyNullType.json b/...urces/session-records/setKeyNullType.json → ...urces/session-records/setKeyNullType.json
diff --git a/...es/session-records/updateDisabledKey.json → ...es/session-records/updateDisabledKey.json b/...es/session-records/updateDisabledKey.json → ...es/session-records/updateDisabledKey.json
diff --git a/.../resources/session-records/updateKey.json → .../resources/session-records/updateKey.json b/.../resources/session-records/updateKey.json → .../resources/session-records/updateKey.json
diff --git a/keyvault/client/secrets/CHANGELOG.md → ...vault/azure-keyvault-secrets/CHANGELOG.md b/keyvault/client/secrets/CHANGELOG.md → ...vault/azure-keyvault-secrets/CHANGELOG.md
diff --git a/keyvault/client/secrets/README.md → ...keyvault/azure-keyvault-secrets/README.md b/keyvault/client/secrets/README.md → ...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.
 
 <!-- LINKS -->
-[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 → sdk/keyvault/azure-keyvault-secrets/pom.xml b/keyvault/client/secrets/pom.xml → sdk/keyvault/azure-keyvault-secrets/pom.xml
@@ -6,7 +6,7 @@
     <groupId>com.azure</groupId>
     <artifactId>azure-keyvault-parent</artifactId>
     <version>4.0.0-preview.1</version>
-    <relativePath>../pom.xml</relativePath>
+    <relativePath>../pom.client.xml</relativePath>
   </parent>
 
   <groupId>com.azure</groupId>

diff --git a/...t/secrets/AzureKeyVaultConfiguration.java → ...t/secrets/AzureKeyVaultConfiguration.java b/...t/secrets/AzureKeyVaultConfiguration.java → ...t/secrets/AzureKeyVaultConfiguration.java
diff --git a/...ult/secrets/KeyVaultErrorCodeStrings.java → ...ult/secrets/KeyVaultErrorCodeStrings.java b/...ult/secrets/KeyVaultErrorCodeStrings.java → ...ult/secrets/KeyVaultErrorCodeStrings.java
diff --git a/...y/keyvault/secrets/SecretAsyncClient.java → ...y/keyvault/secrets/SecretAsyncClient.java b/...y/keyvault/secrets/SecretAsyncClient.java → ...y/keyvault/secrets/SecretAsyncClient.java
diff --git a/...curity/keyvault/secrets/SecretBackup.java → ...curity/keyvault/secrets/SecretBackup.java b/...curity/keyvault/secrets/SecretBackup.java → ...curity/keyvault/secrets/SecretBackup.java
diff --git a/...curity/keyvault/secrets/SecretClient.java → ...curity/keyvault/secrets/SecretClient.java b/...curity/keyvault/secrets/SecretClient.java → ...curity/keyvault/secrets/SecretClient.java
diff --git a/...keyvault/secrets/SecretClientBuilder.java → ...keyvault/secrets/SecretClientBuilder.java b/...keyvault/secrets/SecretClientBuilder.java → ...keyvault/secrets/SecretClientBuilder.java
diff --git a/...ault/secrets/SecretRequestAttributes.java → ...ault/secrets/SecretRequestAttributes.java b/...ault/secrets/SecretRequestAttributes.java → ...ault/secrets/SecretRequestAttributes.java
diff --git a/...ault/secrets/SecretRequestParameters.java → ...ault/secrets/SecretRequestParameters.java b/...ault/secrets/SecretRequestParameters.java → ...ault/secrets/SecretRequestParameters.java
diff --git a/...crets/SecretRestoreRequestParameters.java → ...crets/SecretRestoreRequestParameters.java b/...crets/SecretRestoreRequestParameters.java → ...crets/SecretRestoreRequestParameters.java
diff --git a/...urity/keyvault/secrets/SecretService.java → ...urity/keyvault/secrets/SecretService.java b/...urity/keyvault/secrets/SecretService.java → ...urity/keyvault/secrets/SecretService.java
diff --git a/...ets/implementation/DeletedSecretPage.java → ...ets/implementation/DeletedSecretPage.java b/...ets/implementation/DeletedSecretPage.java → ...ets/implementation/DeletedSecretPage.java
diff --git a/...ecrets/implementation/SecretBasePage.java → ...ecrets/implementation/SecretBasePage.java b/...ecrets/implementation/SecretBasePage.java → ...ecrets/implementation/SecretBasePage.java
diff --git a/...eyvault/secrets/models/DeletedSecret.java → ...eyvault/secrets/models/DeletedSecret.java b/...eyvault/secrets/models/DeletedSecret.java → ...eyvault/secrets/models/DeletedSecret.java
diff --git a/...urity/keyvault/secrets/models/Secret.java → ...urity/keyvault/secrets/models/Secret.java b/...urity/keyvault/secrets/models/Secret.java → ...urity/keyvault/secrets/models/Secret.java
diff --git a/...y/keyvault/secrets/models/SecretBase.java → ...y/keyvault/secrets/models/SecretBase.java b/...y/keyvault/secrets/models/SecretBase.java → ...y/keyvault/secrets/models/SecretBase.java
diff --git a/...keyvault/secrets/models/package-info.java → ...keyvault/secrets/models/package-info.java b/...keyvault/secrets/models/package-info.java → ...keyvault/secrets/models/package-info.java
diff --git a/...curity/keyvault/secrets/package-info.java → ...curity/keyvault/secrets/package-info.java b/...curity/keyvault/secrets/package-info.java → ...curity/keyvault/secrets/package-info.java
diff --git a/.../main/resources/kvErrorStrings.properties → .../main/resources/kvErrorStrings.properties b/.../main/resources/kvErrorStrings.properties → .../main/resources/kvErrorStrings.properties
diff --git a/...t/secrets/BackupAndRestoreOperations.java → ...t/secrets/BackupAndRestoreOperations.java b/...t/secrets/BackupAndRestoreOperations.java → ...t/secrets/BackupAndRestoreOperations.java
diff --git a/...rets/BackupAndRestoreOperationsAsync.java → ...rets/BackupAndRestoreOperationsAsync.java b/...rets/BackupAndRestoreOperationsAsync.java → ...rets/BackupAndRestoreOperationsAsync.java
diff --git a/...security/keyvault/secrets/HelloWorld.java → ...security/keyvault/secrets/HelloWorld.java b/...security/keyvault/secrets/HelloWorld.java → ...security/keyvault/secrets/HelloWorld.java
diff --git a/...ity/keyvault/secrets/HelloWorldAsync.java → ...ity/keyvault/secrets/HelloWorldAsync.java b/...ity/keyvault/secrets/HelloWorldAsync.java → ...ity/keyvault/secrets/HelloWorldAsync.java
diff --git a/...rity/keyvault/secrets/ListOperations.java → ...rity/keyvault/secrets/ListOperations.java b/...rity/keyvault/secrets/ListOperations.java → ...rity/keyvault/secrets/ListOperations.java
diff --git a/...keyvault/secrets/ListOperationsAsync.java → ...keyvault/secrets/ListOperationsAsync.java b/...keyvault/secrets/ListOperationsAsync.java → ...keyvault/secrets/ListOperationsAsync.java
diff --git a/...vault/secrets/ManagingDeletedSecrets.java → ...vault/secrets/ManagingDeletedSecrets.java b/...vault/secrets/ManagingDeletedSecrets.java → ...vault/secrets/ManagingDeletedSecrets.java
diff --git a/.../secrets/ManagingDeletedSecretsAsync.java → .../secrets/ManagingDeletedSecretsAsync.java b/.../secrets/ManagingDeletedSecretsAsync.java → .../secrets/ManagingDeletedSecretsAsync.java
diff --git a/...rets/SecretClientJavaDocCodeSnippets.java → ...rets/SecretClientJavaDocCodeSnippets.java b/...rets/SecretClientJavaDocCodeSnippets.java → ...rets/SecretClientJavaDocCodeSnippets.java
diff --git a/...yvault/secrets/SecretAsyncClientTest.java → ...yvault/secrets/SecretAsyncClientTest.java b/...yvault/secrets/SecretAsyncClientTest.java → ...yvault/secrets/SecretAsyncClientTest.java
diff --git a/...ty/keyvault/secrets/SecretClientTest.java → ...ty/keyvault/secrets/SecretClientTest.java b/...ty/keyvault/secrets/SecretClientTest.java → ...ty/keyvault/secrets/SecretClientTest.java
diff --git a/...eyvault/secrets/SecretClientTestBase.java → ...eyvault/secrets/SecretClientTestBase.java b/...eyvault/secrets/SecretClientTestBase.java → ...eyvault/secrets/SecretClientTestBase.java
diff --git a/...sources/session-records/backupSecret.json → ...sources/session-records/backupSecret.json b/...sources/session-records/backupSecret.json → ...sources/session-records/backupSecret.json
diff --git a/...session-records/backupSecretNotFound.json → ...session-records/backupSecretNotFound.json b/...session-records/backupSecretNotFound.json → ...session-records/backupSecretNotFound.json
diff --git a/...sources/session-records/deleteSecret.json → ...sources/session-records/deleteSecret.json b/...sources/session-records/deleteSecret.json → ...sources/session-records/deleteSecret.json
diff --git a/...session-records/deleteSecretNotFound.json → ...session-records/deleteSecretNotFound.json b/...session-records/deleteSecretNotFound.json → ...session-records/deleteSecretNotFound.json
diff --git a/...ces/session-records/getDeletedSecret.json → ...ces/session-records/getDeletedSecret.json b/...ces/session-records/getDeletedSecret.json → ...ces/session-records/getDeletedSecret.json
diff --git a/...ion-records/getDeletedSecretNotFound.json → ...ion-records/getDeletedSecretNotFound.json b/...ion-records/getDeletedSecretNotFound.json → ...ion-records/getDeletedSecretNotFound.json
diff --git a/.../resources/session-records/getSecret.json → .../resources/session-records/getSecret.json b/.../resources/session-records/getSecret.json → .../resources/session-records/getSecret.json
diff --git a/...es/session-records/getSecretNotFound.json → ...es/session-records/getSecretNotFound.json b/...es/session-records/getSecretNotFound.json → ...es/session-records/getSecretNotFound.json
diff --git a/...ion-records/getSecretSpecificVersion.json → ...ion-records/getSecretSpecificVersion.json b/...ion-records/getSecretSpecificVersion.json → ...ion-records/getSecretSpecificVersion.json
diff --git a/...s/session-records/listDeletedSecrets.json → ...s/session-records/listDeletedSecrets.json b/...s/session-records/listDeletedSecrets.json → ...s/session-records/listDeletedSecrets.json
diff --git a/...s/session-records/listSecretVersions.json → ...s/session-records/listSecretVersions.json b/...s/session-records/listSecretVersions.json → ...s/session-records/listSecretVersions.json
diff --git a/...esources/session-records/listSecrets.json → ...esources/session-records/listSecrets.json b/...esources/session-records/listSecrets.json → ...esources/session-records/listSecrets.json
diff --git a/...session-records/recoverDeletedSecret.json → ...session-records/recoverDeletedSecret.json b/...session-records/recoverDeletedSecret.json → ...session-records/recoverDeletedSecret.json
diff --git a/...records/recoverDeletedSecretNotFound.json → ...records/recoverDeletedSecretNotFound.json b/...records/recoverDeletedSecretNotFound.json → ...records/recoverDeletedSecretNotFound.json
diff --git a/...ources/session-records/restoreSecret.json → ...ources/session-records/restoreSecret.json b/...ources/session-records/restoreSecret.json → ...ources/session-records/restoreSecret.json
diff --git a/...rds/restoreSecretFromMalformedBackup.json → ...rds/restoreSecretFromMalformedBackup.json b/...rds/restoreSecretFromMalformedBackup.json → ...rds/restoreSecretFromMalformedBackup.json
diff --git a/.../resources/session-records/setSecret.json → .../resources/session-records/setSecret.json b/.../resources/session-records/setSecret.json → .../resources/session-records/setSecret.json
diff --git a/...s/session-records/setSecretEmptyName.json → ...s/session-records/setSecretEmptyName.json b/...s/session-records/setSecretEmptyName.json → ...s/session-records/setSecretEmptyName.json
diff --git a/.../session-records/setSecretEmptyValue.json → .../session-records/setSecretEmptyValue.json b/.../session-records/setSecretEmptyValue.json → .../session-records/setSecretEmptyValue.json
diff --git a/...ources/session-records/setSecretNull.json → ...ources/session-records/setSecretNull.json b/...ources/session-records/setSecretNull.json → ...ources/session-records/setSecretNull.json
diff --git a/...session-records/updateDisabledSecret.json → ...session-records/updateDisabledSecret.json b/...session-records/updateDisabledSecret.json → ...session-records/updateDisabledSecret.json
diff --git a/...sources/session-records/updateSecret.json → ...sources/session-records/updateSecret.json b/...sources/session-records/updateSecret.json → ...sources/session-records/updateSecret.json
diff --git a/...ources/session-records/updateSetting.json → ...ources/session-records/updateSetting.json b/...ources/session-records/updateSetting.json → ...ources/session-records/updateSetting.json
diff --git 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. --
     <groupId>com.microsoft.azure</groupId>
     <artifactId>azure-keyvault-parent</artifactId>
     <version>1.2.1</version>
-    <relativePath>../pom.xml</relativePath>
+    <relativePath>../pom.data.xml</relativePath>
   </parent>
 
   <groupId>com.microsoft.azure</groupId>

diff --git a/sdk/keyvault/microsoft-azure-keyvault-core/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-core/pom.xml
@@ -9,7 +9,7 @@
     <groupId>com.microsoft.azure</groupId>
     <artifactId>azure-keyvault-parent</artifactId>
     <version>1.2.1</version>
-    <relativePath>../pom.xml</relativePath>
+    <relativePath>../pom.data.xml</relativePath>
   </parent>
 
   <groupId>com.microsoft.azure</groupId>

diff --git a/sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml
@@ -8,7 +8,7 @@
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-keyvault-parent</artifactId>
         <version>1.2.1</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../pom.data.xml</relativePath>
     </parent>
 
     <groupId>com.microsoft.azure</groupId>

diff --git a/sdk/keyvault/microsoft-azure-keyvault-extensions/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-extensions/pom.xml
@@ -9,7 +9,7 @@
     <groupId>com.microsoft.azure</groupId>
     <artifactId>azure-keyvault-parent</artifactId>
     <version>1.2.1</version>
-    <relativePath>../pom.xml</relativePath>
+    <relativePath>../pom.data.xml</relativePath>
   </parent>
 
   <artifactId>azure-keyvault-extensions</artifactId>

diff --git a/sdk/keyvault/microsoft-azure-keyvault-test/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-test/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.microsoft.azure</groupId>
     <artifactId>azure-keyvault-parent</artifactId>
     <version>1.2.1</version>
-    <relativePath>../pom.xml</relativePath>
+    <relativePath>../pom.data.xml</relativePath>
   </parent>
   <artifactId>azure-keyvault-test</artifactId>
   <name>azure-keyvault-test</name>

diff --git a/sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.microsoft.azure</groupId>
     <artifactId>azure-keyvault-parent</artifactId>
     <version>1.2.1</version>
-    <relativePath>../pom.xml</relativePath>
+    <relativePath>../pom.data.xml</relativePath>
   </parent>
 
   <artifactId>azure-keyvault-webkey</artifactId>

diff --git 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. --
     <groupId>com.microsoft.azure</groupId>
     <artifactId>azure-keyvault-parent</artifactId>
     <version>1.2.1</version>
-    <relativePath>../pom.xml</relativePath>
+    <relativePath>../pom.data.xml</relativePath>
   </parent>
 
   <groupId>com.microsoft.azure</groupId>

diff --git a/keyvault/client/pom.xml → sdk/keyvault/pom.client.xml b/keyvault/client/pom.xml → sdk/keyvault/pom.client.xml
@@ -32,7 +32,7 @@
   </scm>
 
   <modules>
-    <module>./keys</module>
-    <module>./secrets</module>
+    <module>azure-keyvault-keys</module>
+    <module>azure-keyvault-secrets</module>
   </modules>
 </project>
diff --git a/sdk/keyvault/pom.xml → sdk/keyvault/pom.data.xml b/sdk/keyvault/pom.xml → sdk/keyvault/pom.data.xml
diff --git a/sdk/keyvault/pom.service.xml b/sdk/keyvault/pom.service.xml
@@ -9,11 +9,21 @@
   <packaging>pom</packaging>
   <version>1.0.0</version><!-- Need not change for every release-->
   <modules>
+
+    <!-- Track 1 -->
     <module>microsoft-azure-keyvault</module>
     <module>microsoft-azure-keyvault-core</module>
     <module>microsoft-azure-keyvault-webkey</module>
     <module>microsoft-azure-keyvault-cryptography</module>
     <module>microsoft-azure-keyvault-extensions</module>
     <module>microsoft-azure-keyvault-complete</module>
+
+    <!-- Track 2 -->
+    <module>../../core</module> <!-- NOTE: We need to build core so we can build against the version in the repo. -->
+    <module>../identity/azure-identity</module> <!-- NOTE: We need to build identity so we can build against the version in the repo. -->
+    <module>azure-keyvault-keys</module>
+    <module>azure-keyvault-secrets</module>
+
   </modules>
+
 </project>