+ * {@codesnippet com.azure.data.appconfiguration.configurationasyncclient.listsettingrevisions}
*
* @param selector Optional. Used to filter configuration setting revisions from the service.
* @return Revisions of the ConfigurationSetting
*/
@ServiceMethod(returns = ReturnType.COLLECTION)
public Flux listSettingRevisions(SettingSelector selector) {
- return listSettingRevisions(selector, Context.NONE);
+ return fluxContext(context -> listSettingRevisions(selector, context));
}
/**
@@ -764,7 +765,9 @@ private static void validateSetting(ConfigurationSetting setting) {
* Remaps the exception returned from the service if it is a PRECONDITION_FAILED response. This is performed since
* add setting returns PRECONDITION_FAILED when the configuration already exists, all other uses of setKey return
* this status when the configuration doesn't exist.
+ *
* @param throwable Error response from the service.
+ *
* @return Exception remapped to a ResourceModifiedException if the throwable was a ResourceNotFoundException,
* otherwise the throwable is returned unmodified.
*/
diff --git a/sdk/appconfiguration/azure-data-appconfiguration/src/main/java/com/azure/data/appconfiguration/ConfigurationClientBuilder.java b/sdk/appconfiguration/azure-data-appconfiguration/src/main/java/com/azure/data/appconfiguration/ConfigurationClientBuilder.java
index 8d4bd79e5d1ef..26840826d978c 100644
--- a/sdk/appconfiguration/azure-data-appconfiguration/src/main/java/com/azure/data/appconfiguration/ConfigurationClientBuilder.java
+++ b/sdk/appconfiguration/azure-data-appconfiguration/src/main/java/com/azure/data/appconfiguration/ConfigurationClientBuilder.java
@@ -4,6 +4,7 @@
package com.azure.data.appconfiguration;
import com.azure.core.implementation.annotation.ServiceClientBuilder;
+import com.azure.core.util.logging.ClientLogger;
import com.azure.data.appconfiguration.credentials.ConfigurationClientCredentials;
import com.azure.data.appconfiguration.models.ConfigurationSetting;
import com.azure.data.appconfiguration.policy.ConfigurationCredentialsPolicy;
@@ -36,9 +37,9 @@
* by calling {@link ConfigurationClientBuilder#buildAsyncClient() buildAsyncClient} and {@link ConfigurationClientBuilder#buildClient() buildClient} respectively
* to construct an instance of the desired client.
*
- *
The client needs the service endpoint of the Azure App Configuration store and access credentials.
- * {@link ConfigurationClientCredentials} gives the builder the service endpoint and access credentials it requires to
- * construct a client, set the ConfigurationClientCredentials with {@link ConfigurationClientBuilder#credentials(ConfigurationClientCredentials) this}.
+ *
The client needs the service endpoint of the Azure App Configuration store and access credential.
+ * {@link ConfigurationClientCredentials} gives the builder the service endpoint and access credential it requires to
+ * construct a client, set the ConfigurationClientCredentials with {@link ConfigurationClientBuilder#credential(ConfigurationClientCredentials) this}.
*
*
Instantiating an asynchronous Configuration Client
*
@@ -51,7 +52,7 @@
*
Another way to construct the client is using a {@link HttpPipeline}. The pipeline gives the client an authenticated
* way to communicate with the service but it doesn't contain the service endpoint. Set the pipeline with
* {@link ConfigurationClientBuilder#pipeline(HttpPipeline) this}, additionally set the service endpoint with
- * {@link ConfigurationClientBuilder#serviceEndpoint(String) this}. Using a pipeline requires additional setup but
+ * {@link ConfigurationClientBuilder#endpoint(String) this}. Using a pipeline requires additional setup but
* allows for finer control on how the {@link ConfigurationAsyncClient} and {@link ConfigurationClient} it built.
*
* {@codesnippet com.azure.data.applicationconfig.configurationclient.pipeline.instantiation}
@@ -70,11 +71,12 @@ public final class ConfigurationClientBuilder {
private static final String ACCEPT_HEADER = "Accept";
private static final String ACCEPT_HEADER_VALUE = "application/vnd.microsoft.azconfig.kv+json";
+ private final ClientLogger logger = new ClientLogger(ConfigurationClientBuilder.class);
private final List policies;
private final HttpHeaders headers;
- private ConfigurationClientCredentials credentials;
- private URL serviceEndpoint;
+ private ConfigurationClientCredentials credential;
+ private URL endpoint;
private HttpClient httpClient;
private HttpLogDetailLevel httpLogDetailLevel;
private HttpPipeline pipeline;
@@ -100,14 +102,14 @@ public ConfigurationClientBuilder() {
*
*
* If {@link ConfigurationClientBuilder#pipeline(HttpPipeline) pipeline} is set, then the {@code pipeline} and
- * {@link ConfigurationClientBuilder#serviceEndpoint(String) serviceEndpoint} are used to create the
+ * {@link ConfigurationClientBuilder#endpoint(String) endpoint} are used to create the
* {@link ConfigurationClient client}. All other builder settings are ignored.
*
* @return A ConfigurationClient with the options set from the builder.
- * @throws NullPointerException If {@code serviceEndpoint} has not been set. This setting is automatically set when
- * {@link ConfigurationClientBuilder#credentials(ConfigurationClientCredentials) credentials} are set through
- * the builder. Or can be set explicitly by calling {@link ConfigurationClientBuilder#serviceEndpoint(String)}.
- * @throws IllegalStateException If {@link ConfigurationClientBuilder#credentials(ConfigurationClientCredentials)}
+ * @throws NullPointerException If {@code endpoint} has not been set. This setting is automatically set when
+ * {@link ConfigurationClientBuilder#credential(ConfigurationClientCredentials) credential} are set through
+ * the builder. Or can be set explicitly by calling {@link ConfigurationClientBuilder#endpoint(String)}.
+ * @throws IllegalStateException If {@link ConfigurationClientBuilder#credential(ConfigurationClientCredentials)}
* has not been set.
*/
public ConfigurationClient buildClient() {
@@ -120,31 +122,31 @@ public ConfigurationClient buildClient() {
*
*
* If {@link ConfigurationClientBuilder#pipeline(HttpPipeline) pipeline} is set, then the {@code pipeline} and
- * {@link ConfigurationClientBuilder#serviceEndpoint(String) serviceEndpoint} are used to create the
+ * {@link ConfigurationClientBuilder#endpoint(String) endpoint} are used to create the
* {@link ConfigurationAsyncClient client}. All other builder settings are ignored.
*
*
* @return A ConfigurationAsyncClient with the options set from the builder.
- * @throws NullPointerException If {@code serviceEndpoint} has not been set. This setting is automatically set when
- * {@link ConfigurationClientBuilder#credentials(ConfigurationClientCredentials) credentials} are set through
- * the builder. Or can be set explicitly by calling {@link ConfigurationClientBuilder#serviceEndpoint(String)}.
- * @throws IllegalStateException If {@link ConfigurationClientBuilder#credentials(ConfigurationClientCredentials)}
+ * @throws NullPointerException If {@code endpoint} has not been set. This setting is automatically set when
+ * {@link ConfigurationClientBuilder#credential(ConfigurationClientCredentials) credential} are set through
+ * the builder. Or can be set explicitly by calling {@link ConfigurationClientBuilder#endpoint(String)}.
+ * @throws IllegalStateException If {@link ConfigurationClientBuilder#credential(ConfigurationClientCredentials)}
* has not been set.
*/
public ConfigurationAsyncClient buildAsyncClient() {
Configuration buildConfiguration = (configuration == null) ? ConfigurationManager.getConfiguration().clone() : configuration;
ConfigurationClientCredentials configurationCredentials = getConfigurationCredentials(buildConfiguration);
- URL buildServiceEndpoint = getBuildServiceEndpoint(configurationCredentials);
+ URL buildEndpoint = getBuildEndpoint(configurationCredentials);
- Objects.requireNonNull(buildServiceEndpoint);
+ Objects.requireNonNull(buildEndpoint);
if (pipeline != null) {
- return new ConfigurationAsyncClient(buildServiceEndpoint, pipeline);
+ return new ConfigurationAsyncClient(buildEndpoint, pipeline);
}
- ConfigurationClientCredentials buildCredentials = (credentials == null) ? configurationCredentials : credentials;
- if (buildCredentials == null) {
- throw new IllegalStateException("'credentials' is required.");
+ ConfigurationClientCredentials buildCredential = (credential == null) ? configurationCredentials : credential;
+ if (buildCredential == null) {
+ logger.logAndThrow(new IllegalStateException("'credential' is required."));
}
// Closest to API goes first, closest to wire goes last.
@@ -154,7 +156,7 @@ public ConfigurationAsyncClient buildAsyncClient() {
policies.add(new RequestIdPolicy());
policies.add(new AddHeadersPolicy(headers));
policies.add(new AddDatePolicy());
- policies.add(new ConfigurationCredentialsPolicy(buildCredentials));
+ policies.add(new ConfigurationCredentialsPolicy(buildCredential));
HttpPolicyProviders.addBeforeRetryPolicies(policies);
policies.add(retryPolicy);
@@ -168,34 +170,38 @@ public ConfigurationAsyncClient buildAsyncClient() {
.httpClient(httpClient)
.build();
- return new ConfigurationAsyncClient(buildServiceEndpoint, pipeline);
+ return new ConfigurationAsyncClient(buildEndpoint, pipeline);
}
/**
* Sets the service endpoint for the Azure App Configuration instance.
*
- * @param serviceEndpoint The URL of the Azure App Configuration instance to send {@link ConfigurationSetting}
+ * @param endpoint The URL of the Azure App Configuration instance to send {@link ConfigurationSetting}
* service requests to and receive responses from.
* @return The updated ConfigurationClientBuilder object.
- * @throws MalformedURLException if {@code serviceEndpoint} is null or it cannot be parsed into a valid URL.
+ * @throws IllegalArgumentException if {@code endpoint} is null or it cannot be parsed into a valid URL.
*/
- public ConfigurationClientBuilder serviceEndpoint(String serviceEndpoint) throws MalformedURLException {
- this.serviceEndpoint = new URL(serviceEndpoint);
+ public ConfigurationClientBuilder endpoint(String endpoint) {
+ try {
+ this.endpoint = new URL(endpoint);
+ } catch (MalformedURLException ex) {
+ logger.logAndThrow(new IllegalArgumentException("'endpoint' must be a valid URL"));
+ }
+
return this;
}
/**
- * Sets the credentials to use when authenticating HTTP requests. Also, sets the
- * {@link ConfigurationClientBuilder#serviceEndpoint(String) serviceEndpoint} for this ConfigurationClientBuilder.
+ * Sets the credential to use when authenticating HTTP requests. Also, sets the
+ * {@link ConfigurationClientBuilder#endpoint(String) endpoint} for this ConfigurationClientBuilder.
*
- * @param credentials The credentials to use for authenticating HTTP requests.
+ * @param credential The credential to use for authenticating HTTP requests.
* @return The updated ConfigurationClientBuilder object.
- * @throws NullPointerException If {@code credentials} is {@code null}.
+ * @throws NullPointerException If {@code credential} is {@code null}.
*/
- public ConfigurationClientBuilder credentials(ConfigurationClientCredentials credentials) {
- Objects.requireNonNull(credentials);
- this.credentials = credentials;
- this.serviceEndpoint = credentials.baseUri();
+ public ConfigurationClientBuilder credential(ConfigurationClientCredentials credential) {
+ this.credential = Objects.requireNonNull(credential);
+ this.endpoint = credential.baseUri();
return this;
}
@@ -240,7 +246,7 @@ public ConfigurationClientBuilder httpClient(HttpClient client) {
* Sets the HTTP pipeline to use for the service client.
*
* If {@code pipeline} is set, all other settings are ignored, aside from
- * {@link ConfigurationClientBuilder#serviceEndpoint(String) serviceEndpoint} to build {@link ConfigurationAsyncClient} or {@link ConfigurationClient}.
+ * {@link ConfigurationClientBuilder#endpoint(String) endpoint} to build {@link ConfigurationAsyncClient} or {@link ConfigurationClient}.
*
* @param pipeline The HTTP pipeline to use for sending service requests and receiving responses.
* @return The updated ConfigurationClientBuilder object.
@@ -268,7 +274,7 @@ public ConfigurationClientBuilder configuration(Configuration configuration) {
private ConfigurationClientCredentials getConfigurationCredentials(Configuration configuration) {
String connectionString = configuration.get("AZURE_APPCONFIG_CONNECTION_STRING");
if (ImplUtils.isNullOrEmpty(connectionString)) {
- return credentials;
+ return credential;
}
try {
@@ -278,9 +284,9 @@ private ConfigurationClientCredentials getConfigurationCredentials(Configuration
}
}
- private URL getBuildServiceEndpoint(ConfigurationClientCredentials buildCredentials) {
- if (serviceEndpoint != null) {
- return serviceEndpoint;
+ private URL getBuildEndpoint(ConfigurationClientCredentials buildCredentials) {
+ if (endpoint != null) {
+ return endpoint;
} else if (buildCredentials != null) {
return buildCredentials.baseUri();
} else {
diff --git a/sdk/appconfiguration/azure-data-appconfiguration/src/main/java/com/azure/data/appconfiguration/models/Range.java b/sdk/appconfiguration/azure-data-appconfiguration/src/main/java/com/azure/data/appconfiguration/models/Range.java
index 93a166235d416..07a7214acb944 100644
--- a/sdk/appconfiguration/azure-data-appconfiguration/src/main/java/com/azure/data/appconfiguration/models/Range.java
+++ b/sdk/appconfiguration/azure-data-appconfiguration/src/main/java/com/azure/data/appconfiguration/models/Range.java
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
package com.azure.data.appconfiguration.models;
-import com.azure.core.implementation.annotation.Fluent;
+import com.azure.core.implementation.annotation.Immutable;
import com.azure.data.appconfiguration.ConfigurationAsyncClient;
import com.azure.data.appconfiguration.ConfigurationClient;
@@ -14,7 +14,7 @@
* @see ConfigurationClient#listSettingRevisions(SettingSelector)
* @see SettingSelector#range(Range)
*/
-@Fluent
+@Immutable
public class Range {
private final int start;
private final int end;
diff --git a/sdk/appconfiguration/azure-data-appconfiguration/src/samples/java/ConfigurationSets.java b/sdk/appconfiguration/azure-data-appconfiguration/src/samples/java/ConfigurationSets.java
index a818c8da36ebc..d4e5cc18ce6f6 100644
--- a/sdk/appconfiguration/azure-data-appconfiguration/src/samples/java/ConfigurationSets.java
+++ b/sdk/appconfiguration/azure-data-appconfiguration/src/samples/java/ConfigurationSets.java
@@ -52,7 +52,7 @@ public static void main(String[] args) throws NoSuchAlgorithmException, InvalidK
// Instantiate a configuration client that will be used to call the configuration service.
ConfigurationAsyncClient client = new ConfigurationClientBuilder()
- .credentials(new ConfigurationClientCredentials(connectionString))
+ .credential(new ConfigurationClientCredentials(connectionString))
.buildAsyncClient();
// Demonstrates two different complex objects being stored in Azure App Configuration; one used for beta and the
diff --git a/sdk/appconfiguration/azure-data-appconfiguration/src/samples/java/HelloWorld.java b/sdk/appconfiguration/azure-data-appconfiguration/src/samples/java/HelloWorld.java
index 15bc35ba8531b..8aaa0039a4b1c 100644
--- a/sdk/appconfiguration/azure-data-appconfiguration/src/samples/java/HelloWorld.java
+++ b/sdk/appconfiguration/azure-data-appconfiguration/src/samples/java/HelloWorld.java
@@ -28,7 +28,7 @@ public static void main(String[] args) throws NoSuchAlgorithmException, InvalidK
// Instantiate a client that will be used to call the service.
ConfigurationAsyncClient client = new ConfigurationClientBuilder()
- .credentials(new ConfigurationClientCredentials(connectionString))
+ .credential(new ConfigurationClientCredentials(connectionString))
.buildAsyncClient();
// Name of the key to add to the configuration service.
diff --git a/sdk/appconfiguration/azure-data-appconfiguration/src/samples/java/PipelineSample.java b/sdk/appconfiguration/azure-data-appconfiguration/src/samples/java/PipelineSample.java
index dc876f7f4c42b..64ca0d7b61ef7 100644
--- a/sdk/appconfiguration/azure-data-appconfiguration/src/samples/java/PipelineSample.java
+++ b/sdk/appconfiguration/azure-data-appconfiguration/src/samples/java/PipelineSample.java
@@ -44,7 +44,7 @@ public static void main(String[] args) throws NoSuchAlgorithmException, Invalid
// We add in a policy to track the type of HTTP method calls we make.
// We also want to see the Header information of our HTTP requests, so we specify the detail level.
final ConfigurationAsyncClient client = new ConfigurationClientBuilder()
- .credentials(new ConfigurationClientCredentials(connectionString))
+ .credential(new ConfigurationClientCredentials(connectionString))
.addPolicy(new HttpMethodRequestTrackingPolicy(tracker))
.httpLogDetailLevel(HttpLogDetailLevel.HEADERS)
.buildAsyncClient();
diff --git a/sdk/appconfiguration/azure-data-appconfiguration/src/samples/java/com/azure/data/appconfiguration/ConfigurationAsyncClientJavaDocCodeSnippets.java b/sdk/appconfiguration/azure-data-appconfiguration/src/samples/java/com/azure/data/appconfiguration/ConfigurationAsyncClientJavaDocCodeSnippets.java
new file mode 100644
index 0000000000000..ae1a97cfcb827
--- /dev/null
+++ b/sdk/appconfiguration/azure-data-appconfiguration/src/samples/java/com/azure/data/appconfiguration/ConfigurationAsyncClientJavaDocCodeSnippets.java
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.data.appconfiguration;
+
+import com.azure.data.appconfiguration.models.ConfigurationSetting;
+import com.azure.data.appconfiguration.models.SettingSelector;
+import reactor.util.context.Context;
+
+/**
+ * Code snippets for {@link ConfigurationAsyncClient}
+ */
+public class ConfigurationAsyncClientJavaDocCodeSnippets {
+
+ private String key1 = "key1";
+ private String key2 = "key2";
+ private String value1 = "val1";
+ private String value2 = "val2";
+ /**
+ * Code snippets for {@link ConfigurationAsyncClient#addSetting(String, String)}
+ */
+ public void addSettingsCodeSnippet() {
+ ConfigurationAsyncClient client = getAsyncClient();
+ // BEGIN: com.azure.data.appconfiguration.configurationasyncclient.addsetting#String-String
+ client.addSetting("prodDBConnection", "db_connection")
+ .subscriberContext(Context.of(key1, value1, key2, value2))
+ .subscribe(response -> {
+ ConfigurationSetting result = response.value();
+ System.out.printf("Key: %s, Value: %s", result.key(), result.value());
+ });
+ // END: com.azure.data.appconfiguration.configurationasyncclient.addsetting#String-String
+ }
+
+ /**
+ * Code snippets for {@link ConfigurationAsyncClient#listSettingRevisions(SettingSelector)}
+ */
+ public void listSettingRevisionsCodeSnippet() {
+ ConfigurationAsyncClient client = getAsyncClient();
+ // BEGIN: com.azure.data.appconfiguration.configurationasyncclient.listsettingrevisions
+ client.listSettingRevisions(new SettingSelector().keys("prodDBConnection"))
+ .subscriberContext(Context.of(key1, value1, key2, value2))
+ .subscribe(setting ->
+ System.out.printf("Key: %s, Value: %s", setting.key(), setting.value()));
+ // END: com.azure.data.appconfiguration.configurationasyncclient.listsettingrevisions
+ }
+
+ /**
+ * Implementation not provided
+ * @return {@code null}
+ */
+ private ConfigurationAsyncClient getAsyncClient() {
+ return new ConfigurationClientBuilder().buildAsyncClient();
+ }
+}
diff --git a/sdk/appconfiguration/azure-data-appconfiguration/src/samples/java/com/azure/data/appconfiguration/ConfigurationClientJavaDocCodeSnippets.java b/sdk/appconfiguration/azure-data-appconfiguration/src/samples/java/com/azure/data/appconfiguration/ConfigurationClientJavaDocCodeSnippets.java
index 72bd7346b3e1c..209554c5d4be7 100644
--- a/sdk/appconfiguration/azure-data-appconfiguration/src/samples/java/com/azure/data/appconfiguration/ConfigurationClientJavaDocCodeSnippets.java
+++ b/sdk/appconfiguration/azure-data-appconfiguration/src/samples/java/com/azure/data/appconfiguration/ConfigurationClientJavaDocCodeSnippets.java
@@ -32,8 +32,8 @@ public ConfigurationClient createAsyncConfigurationClientWithPipeline() throws M
ConfigurationClient configurationClient = new ConfigurationClientBuilder()
.pipeline(pipeline)
- .serviceEndpoint("https://myconfig.azure.net/")
- .credentials(new ConfigurationClientCredentials(connectionString))
+ .endpoint("https://myconfig.azure.net/")
+ .credential(new ConfigurationClientCredentials(connectionString))
.buildClient();
// END: com.azure.data.applicationconfig.configurationclient.pipeline.instantiation
return configurationClient;
@@ -52,7 +52,7 @@ public ConfigurationAsyncClient createAsyncConfigurationClient() {
String connectionString = getConnectionString();
// BEGIN: com.azure.data.applicationconfig.async.configurationclient.instantiation
ConfigurationAsyncClient configurationAsyncClient = new ConfigurationClientBuilder()
- .credentials(new ConfigurationClientCredentials(connectionString))
+ .credential(new ConfigurationClientCredentials(connectionString))
.buildAsyncClient();
// END: com.azure.data.applicationconfig.async.configurationclient.instantiation
return configurationAsyncClient;
@@ -71,7 +71,7 @@ public ConfigurationClient createSyncConfigurationClient() {
String connectionString = getConnectionString();
// BEGIN: com.azure.data.applicationconfig.configurationclient.instantiation
ConfigurationClient configurationClient = new ConfigurationClientBuilder()
- .credentials(new ConfigurationClientCredentials(connectionString))
+ .credential(new ConfigurationClientCredentials(connectionString))
.buildClient();
// END: com.azure.data.applicationconfig.configurationclient.instantiation
return configurationClient;
diff --git a/sdk/appconfiguration/azure-data-appconfiguration/src/test/java/com/azure/data/appconfiguration/ConfigurationAsyncClientTest.java b/sdk/appconfiguration/azure-data-appconfiguration/src/test/java/com/azure/data/appconfiguration/ConfigurationAsyncClientTest.java
index 32f2e059d4c9c..8026fb83eecc0 100644
--- a/sdk/appconfiguration/azure-data-appconfiguration/src/test/java/com/azure/data/appconfiguration/ConfigurationAsyncClientTest.java
+++ b/sdk/appconfiguration/azure-data-appconfiguration/src/test/java/com/azure/data/appconfiguration/ConfigurationAsyncClientTest.java
@@ -36,13 +36,13 @@ protected void beforeTest() {
if (interceptorManager.isPlaybackMode()) {
client = clientSetup(credentials -> new ConfigurationClientBuilder()
- .credentials(credentials)
+ .credential(credentials)
.httpClient(interceptorManager.getPlaybackClient())
.httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
.buildAsyncClient());
} else {
client = clientSetup(credentials -> new ConfigurationClientBuilder()
- .credentials(credentials)
+ .credential(credentials)
.httpClient(HttpClient.createDefault().wiretap(true))
.httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
.addPolicy(interceptorManager.getRecordPolicy())
@@ -101,8 +101,8 @@ public void addSettingEmptyValue() {
* Verifies that an exception is thrown when null key is passed.
*/
public void addSettingNullKey() {
- assertRunnableThrowsException(() -> client.addSetting(null, "A Value"), IllegalArgumentException.class);
- assertRunnableThrowsException(() -> client.addSetting(null), NullPointerException.class);
+ assertRunnableThrowsException(() -> client.addSetting(null, "A Value").block(), IllegalArgumentException.class);
+ assertRunnableThrowsException(() -> client.addSetting(null).block(), NullPointerException.class);
}
/**
@@ -179,8 +179,8 @@ public void setSettingEmptyValue() {
* Verifies that an exception is thrown when null key is passed.
*/
public void setSettingNullKey() {
- assertRunnableThrowsException(() -> client.setSetting(null, "A Value"), IllegalArgumentException.class);
- assertRunnableThrowsException(() -> client.setSetting(null), NullPointerException.class);
+ assertRunnableThrowsException(() -> client.setSetting(null, "A Value").block(), IllegalArgumentException.class);
+ assertRunnableThrowsException(() -> client.setSetting(null).block(), NullPointerException.class);
}
/**
@@ -224,8 +224,8 @@ public void updateSettingOverload() {
* Verifies that an exception is thrown when null key is passed.
*/
public void updateSettingNullKey() {
- assertRunnableThrowsException(() -> client.updateSetting(null, "A Value"), IllegalArgumentException.class);
- assertRunnableThrowsException(() -> client.updateSetting(null), NullPointerException.class);
+ assertRunnableThrowsException(() -> client.updateSetting(null, "A Value").block(), IllegalArgumentException.class);
+ assertRunnableThrowsException(() -> client.updateSetting(null).block(), NullPointerException.class);
}
/**
@@ -365,8 +365,8 @@ public void deleteSettingWithETag() {
* Test the API will not make a delete call without having a key passed, an IllegalArgumentException should be thrown.
*/
public void deleteSettingNullKey() {
- assertRunnableThrowsException(() -> client.deleteSetting((String) null), IllegalArgumentException.class);
- assertRunnableThrowsException(() -> client.deleteSetting((ConfigurationSetting) null), NullPointerException.class);
+ assertRunnableThrowsException(() -> client.deleteSetting((String) null).block(), IllegalArgumentException.class);
+ assertRunnableThrowsException(() -> client.deleteSetting((ConfigurationSetting) null).block(), NullPointerException.class);
}
/**
diff --git a/sdk/appconfiguration/azure-data-appconfiguration/src/test/java/com/azure/data/appconfiguration/ConfigurationClientTest.java b/sdk/appconfiguration/azure-data-appconfiguration/src/test/java/com/azure/data/appconfiguration/ConfigurationClientTest.java
index 49c08b0ba9869..32da0d6c5babc 100644
--- a/sdk/appconfiguration/azure-data-appconfiguration/src/test/java/com/azure/data/appconfiguration/ConfigurationClientTest.java
+++ b/sdk/appconfiguration/azure-data-appconfiguration/src/test/java/com/azure/data/appconfiguration/ConfigurationClientTest.java
@@ -31,13 +31,13 @@ protected void beforeTest() {
if (interceptorManager.isPlaybackMode()) {
client = clientSetup(credentials -> new ConfigurationClientBuilder()
- .credentials(credentials)
+ .credential(credentials)
.httpClient(interceptorManager.getPlaybackClient())
.httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
.buildClient());
} else {
client = clientSetup(credentials -> new ConfigurationClientBuilder()
- .credentials(credentials)
+ .credential(credentials)
.httpClient(HttpClient.createDefault().wiretap(true))
.httpLogDetailLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
.addPolicy(interceptorManager.getRecordPolicy())
diff --git a/sdk/appconfiguration/pom.service.xml b/sdk/appconfiguration/pom.service.xml
index e33082c71b929..5e032d27570c0 100644
--- a/sdk/appconfiguration/pom.service.xml
+++ b/sdk/appconfiguration/pom.service.xml
@@ -9,7 +9,7 @@
pom1.0.0
+ ../coreazure-data-appconfiguration
- ../../core
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/pom.xml b/sdk/cognitiveservices/ms-azure-cs-autosuggest/pom.xml
similarity index 98%
rename from cognitiveservices/data-plane/search/bingautosuggest/pom.xml
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/pom.xml
index 115e1708562a9..5b91d450eed0d 100644
--- a/cognitiveservices/data-plane/search/bingautosuggest/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-autosuggest/pom.xml
@@ -9,7 +9,7 @@
com.microsoft.azure.cognitiveservicesazure-cognitiveservices-parent1.0.2
- ../../pom.xml
+ ../pom.xmlazure-cognitiveservices-autosuggest1.0.2-beta
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/BingAutoSuggestSearch.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/BingAutoSuggestSearch.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/BingAutoSuggestSearch.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/BingAutoSuggestSearch.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/BingAutoSuggestSearchAPI.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/BingAutoSuggestSearchAPI.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/BingAutoSuggestSearchAPI.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/BingAutoSuggestSearchAPI.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/BingAutoSuggestSearchManager.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/BingAutoSuggestSearchManager.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/BingAutoSuggestSearchManager.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/BingAutoSuggestSearchManager.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/implementation/BingAutoSuggestSearchAPIImpl.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/implementation/BingAutoSuggestSearchAPIImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/implementation/BingAutoSuggestSearchAPIImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/implementation/BingAutoSuggestSearchAPIImpl.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/implementation/BingAutoSuggestSearchImpl.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/implementation/BingAutoSuggestSearchImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/implementation/BingAutoSuggestSearchImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/implementation/BingAutoSuggestSearchImpl.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/implementation/package-info.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/implementation/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/implementation/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/implementation/package-info.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Action.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Action.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Action.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Action.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Answer.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Answer.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Answer.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Answer.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/AutoSuggestOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/AutoSuggestOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/AutoSuggestOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/AutoSuggestOptionalParameter.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/CreativeWork.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/CreativeWork.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/CreativeWork.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/CreativeWork.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Error.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Error.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Error.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Error.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/ErrorCode.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/ErrorCode.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/ErrorCode.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/ErrorCode.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/ErrorResponse.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/ErrorResponse.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/ErrorResponse.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/ErrorResponse.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/ErrorResponseException.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/ErrorResponseException.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/ErrorResponseException.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/ErrorResponseException.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Identifiable.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Identifiable.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Identifiable.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Identifiable.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/QueryContext.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/QueryContext.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/QueryContext.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/QueryContext.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Response.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Response.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Response.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Response.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/ResponseBase.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/ResponseBase.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/ResponseBase.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/ResponseBase.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/ResponseFormat.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/ResponseFormat.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/ResponseFormat.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/ResponseFormat.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/SafeSearch.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/SafeSearch.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/SafeSearch.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/SafeSearch.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/ScenarioType.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/ScenarioType.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/ScenarioType.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/ScenarioType.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/SearchAction.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/SearchAction.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/SearchAction.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/SearchAction.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/SearchKind.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/SearchKind.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/SearchKind.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/SearchKind.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/SearchResultsAnswer.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/SearchResultsAnswer.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/SearchResultsAnswer.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/SearchResultsAnswer.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Suggestions.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Suggestions.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Suggestions.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Suggestions.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/SuggestionsSuggestionGroup.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/SuggestionsSuggestionGroup.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/SuggestionsSuggestionGroup.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/SuggestionsSuggestionGroup.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Thing.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Thing.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Thing.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/Thing.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/package-info.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/models/package-info.java
diff --git a/cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/package-info.java b/sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingautosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-autosuggest/src/main/java/com/microsoft/azure/cognitiveservices/search/autosuggest/package-info.java
diff --git a/cognitiveservices/data-plane/vision/computervision/pom.xml b/sdk/cognitiveservices/ms-azure-cs-computervision/pom.xml
old mode 100755
new mode 100644
similarity index 98%
rename from cognitiveservices/data-plane/vision/computervision/pom.xml
rename to sdk/cognitiveservices/ms-azure-cs-computervision/pom.xml
index f585c51f98577..67d7daafb80bc
--- a/cognitiveservices/data-plane/vision/computervision/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-computervision/pom.xml
@@ -11,7 +11,7 @@
com.microsoft.azure.cognitiveservicesazure-cognitiveservices-parent1.0.2
- ../../pom.xml
+ ../pom.xmlazure-cognitiveservices-computervision1.0.2-beta
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/ComputerVision.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/ComputerVision.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/ComputerVision.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/ComputerVision.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/ComputerVisionClient.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/ComputerVisionClient.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/ComputerVisionClient.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/ComputerVisionClient.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/ComputerVisionManager.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/ComputerVisionManager.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/ComputerVisionManager.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/ComputerVisionManager.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/implementation/ComputerVisionClientImpl.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/implementation/ComputerVisionClientImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/implementation/ComputerVisionClientImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/implementation/ComputerVisionClientImpl.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/implementation/ComputerVisionImpl.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/implementation/ComputerVisionImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/implementation/ComputerVisionImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/implementation/ComputerVisionImpl.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/implementation/package-info.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/implementation/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/implementation/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/implementation/package-info.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/AdultInfo.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/AdultInfo.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/AdultInfo.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/AdultInfo.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/AnalyzeImageByDomainInStreamOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/AnalyzeImageByDomainInStreamOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/AnalyzeImageByDomainInStreamOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/AnalyzeImageByDomainInStreamOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/AnalyzeImageByDomainOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/AnalyzeImageByDomainOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/AnalyzeImageByDomainOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/AnalyzeImageByDomainOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/AnalyzeImageInStreamOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/AnalyzeImageInStreamOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/AnalyzeImageInStreamOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/AnalyzeImageInStreamOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/AnalyzeImageOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/AnalyzeImageOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/AnalyzeImageOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/AnalyzeImageOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/Category.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/Category.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/Category.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/Category.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/CategoryDetail.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/CategoryDetail.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/CategoryDetail.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/CategoryDetail.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/CelebritiesModel.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/CelebritiesModel.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/CelebritiesModel.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/CelebritiesModel.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/CelebrityResults.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/CelebrityResults.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/CelebrityResults.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/CelebrityResults.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ColorInfo.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ColorInfo.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ColorInfo.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ColorInfo.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ComputerVisionError.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ComputerVisionError.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ComputerVisionError.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ComputerVisionError.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ComputerVisionErrorCodes.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ComputerVisionErrorCodes.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ComputerVisionErrorCodes.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ComputerVisionErrorCodes.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ComputerVisionErrorException.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ComputerVisionErrorException.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ComputerVisionErrorException.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ComputerVisionErrorException.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/DescribeImageInStreamOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/DescribeImageInStreamOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/DescribeImageInStreamOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/DescribeImageInStreamOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/DescribeImageOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/DescribeImageOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/DescribeImageOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/DescribeImageOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/Details.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/Details.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/Details.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/Details.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/DomainModelResults.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/DomainModelResults.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/DomainModelResults.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/DomainModelResults.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/FaceDescription.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/FaceDescription.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/FaceDescription.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/FaceDescription.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/FaceRectangle.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/FaceRectangle.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/FaceRectangle.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/FaceRectangle.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/Gender.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/Gender.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/Gender.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/Gender.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/GenerateThumbnailInStreamOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/GenerateThumbnailInStreamOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/GenerateThumbnailInStreamOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/GenerateThumbnailInStreamOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/GenerateThumbnailOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/GenerateThumbnailOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/GenerateThumbnailOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/GenerateThumbnailOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageAnalysis.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageAnalysis.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageAnalysis.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageAnalysis.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageCaption.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageCaption.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageCaption.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageCaption.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageDescription.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageDescription.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageDescription.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageDescription.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageDescriptionDetails.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageDescriptionDetails.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageDescriptionDetails.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageDescriptionDetails.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageMetadata.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageMetadata.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageMetadata.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageMetadata.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageTag.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageTag.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageTag.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageTag.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageType.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageType.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageType.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageType.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageUrl.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageUrl.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageUrl.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ImageUrl.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/LandmarkResults.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/LandmarkResults.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/LandmarkResults.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/LandmarkResults.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/LandmarksModel.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/LandmarksModel.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/LandmarksModel.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/LandmarksModel.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/Line.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/Line.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/Line.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/Line.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ListModelsResult.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ListModelsResult.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ListModelsResult.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ListModelsResult.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ModelDescription.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ModelDescription.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ModelDescription.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/ModelDescription.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/OcrLanguages.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/OcrLanguages.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/OcrLanguages.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/OcrLanguages.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/OcrLine.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/OcrLine.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/OcrLine.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/OcrLine.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/OcrRegion.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/OcrRegion.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/OcrRegion.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/OcrRegion.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/OcrResult.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/OcrResult.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/OcrResult.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/OcrResult.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/OcrWord.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/OcrWord.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/OcrWord.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/OcrWord.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/RecognitionResult.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/RecognitionResult.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/RecognitionResult.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/RecognitionResult.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/RecognizePrintedTextInStreamOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/RecognizePrintedTextInStreamOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/RecognizePrintedTextInStreamOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/RecognizePrintedTextInStreamOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/RecognizePrintedTextOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/RecognizePrintedTextOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/RecognizePrintedTextOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/RecognizePrintedTextOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/RecognizeTextHeaders.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/RecognizeTextHeaders.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/RecognizeTextHeaders.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/RecognizeTextHeaders.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/RecognizeTextInStreamHeaders.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/RecognizeTextInStreamHeaders.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/RecognizeTextInStreamHeaders.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/RecognizeTextInStreamHeaders.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/TagImageInStreamOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/TagImageInStreamOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/TagImageInStreamOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/TagImageInStreamOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/TagImageOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/TagImageOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/TagImageOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/TagImageOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/TagResult.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/TagResult.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/TagResult.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/TagResult.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/TextOperationResult.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/TextOperationResult.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/TextOperationResult.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/TextOperationResult.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/TextOperationStatusCodes.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/TextOperationStatusCodes.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/TextOperationStatusCodes.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/TextOperationStatusCodes.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/TextRecognitionMode.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/TextRecognitionMode.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/TextRecognitionMode.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/TextRecognitionMode.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/VisualFeatureTypes.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/VisualFeatureTypes.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/VisualFeatureTypes.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/VisualFeatureTypes.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/Word.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/Word.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/Word.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/Word.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/package-info.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/models/package-info.java
diff --git a/cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/package-info.java b/sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-computervision/src/main/java/com/microsoft/azure/cognitiveservices/vision/computervision/package-info.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/pom.xml b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/pom.xml
old mode 100755
new mode 100644
similarity index 98%
rename from cognitiveservices/data-plane/vision/contentmoderator/pom.xml
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/pom.xml
index 4d970865955fc..0678ef83bea88
--- a/cognitiveservices/data-plane/vision/contentmoderator/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/pom.xml
@@ -11,7 +11,7 @@
com.microsoft.azure.cognitiveservicesazure-cognitiveservices-parent1.0.2
- ../../pom.xml
+ ../pom.xmlazure-cognitiveservices-contentmoderator1.0.2-beta
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ContentModeratorClient.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ContentModeratorClient.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ContentModeratorClient.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ContentModeratorClient.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ContentModeratorManager.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ContentModeratorManager.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ContentModeratorManager.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ContentModeratorManager.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ImageModerations.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ImageModerations.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ImageModerations.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ImageModerations.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ListManagementImageLists.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ListManagementImageLists.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ListManagementImageLists.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ListManagementImageLists.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ListManagementImages.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ListManagementImages.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ListManagementImages.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ListManagementImages.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ListManagementTermLists.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ListManagementTermLists.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ListManagementTermLists.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ListManagementTermLists.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ListManagementTerms.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ListManagementTerms.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ListManagementTerms.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/ListManagementTerms.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/Reviews.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/Reviews.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/Reviews.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/Reviews.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/TextModerations.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/TextModerations.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/TextModerations.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/TextModerations.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ContentModeratorClientImpl.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ContentModeratorClientImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ContentModeratorClientImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ContentModeratorClientImpl.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ImageModerationsImpl.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ImageModerationsImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ImageModerationsImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ImageModerationsImpl.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ListManagementImageListsImpl.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ListManagementImageListsImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ListManagementImageListsImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ListManagementImageListsImpl.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ListManagementImagesImpl.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ListManagementImagesImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ListManagementImagesImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ListManagementImagesImpl.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ListManagementTermListsImpl.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ListManagementTermListsImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ListManagementTermListsImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ListManagementTermListsImpl.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ListManagementTermsImpl.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ListManagementTermsImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ListManagementTermsImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ListManagementTermsImpl.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ReviewsImpl.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ReviewsImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ReviewsImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/ReviewsImpl.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/TextModerationsImpl.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/TextModerationsImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/TextModerationsImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/TextModerationsImpl.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/package-info.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/implementation/package-info.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/APIError.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/APIError.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/APIError.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/APIError.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/APIErrorException.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/APIErrorException.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/APIErrorException.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/APIErrorException.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AddImageFileInputOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AddImageFileInputOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AddImageFileInputOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AddImageFileInputOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AddImageOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AddImageOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AddImageOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AddImageOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AddImageUrlInputOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AddImageUrlInputOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AddImageUrlInputOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AddImageUrlInputOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AddVideoFrameOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AddVideoFrameOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AddVideoFrameOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AddVideoFrameOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AddVideoFrameStreamOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AddVideoFrameStreamOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AddVideoFrameStreamOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AddVideoFrameStreamOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AddVideoFrameUrlOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AddVideoFrameUrlOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AddVideoFrameUrlOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AddVideoFrameUrlOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Address.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Address.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Address.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Address.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AzureRegionBaseUrl.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AzureRegionBaseUrl.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AzureRegionBaseUrl.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/AzureRegionBaseUrl.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/BodyMetadata.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/BodyMetadata.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/BodyMetadata.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/BodyMetadata.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/BodyModel.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/BodyModel.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/BodyModel.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/BodyModel.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/BodyModelModel.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/BodyModelModel.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/BodyModelModel.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/BodyModelModel.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Candidate.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Candidate.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Candidate.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Candidate.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Classification.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Classification.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Classification.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Classification.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ClassificationCategory1.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ClassificationCategory1.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ClassificationCategory1.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ClassificationCategory1.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ClassificationCategory2.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ClassificationCategory2.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ClassificationCategory2.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ClassificationCategory2.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ClassificationCategory3.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ClassificationCategory3.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ClassificationCategory3.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ClassificationCategory3.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Content.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Content.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Content.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Content.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateJobOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateJobOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateJobOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateJobOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateReviewBodyItem.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateReviewBodyItem.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateReviewBodyItem.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateReviewBodyItem.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateReviewBodyItemMetadataItem.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateReviewBodyItemMetadataItem.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateReviewBodyItemMetadataItem.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateReviewBodyItemMetadataItem.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateReviewsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateReviewsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateReviewsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateReviewsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateVideoReviewsBodyItem.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateVideoReviewsBodyItem.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateVideoReviewsBodyItem.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateVideoReviewsBodyItem.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateVideoReviewsBodyItemMetadataItem.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateVideoReviewsBodyItemMetadataItem.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateVideoReviewsBodyItemMetadataItem.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateVideoReviewsBodyItemMetadataItem.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateVideoReviewsBodyItemVideoFramesItem.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateVideoReviewsBodyItemVideoFramesItem.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateVideoReviewsBodyItemVideoFramesItem.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateVideoReviewsBodyItemVideoFramesItem.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateVideoReviewsBodyItemVideoFramesItemMetadataItem.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateVideoReviewsBodyItemVideoFramesItemMetadataItem.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateVideoReviewsBodyItemVideoFramesItemMetadataItem.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateVideoReviewsBodyItemVideoFramesItemMetadataItem.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateVideoReviewsBodyItemVideoFramesItemReviewerResultTagsItem.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateVideoReviewsBodyItemVideoFramesItemReviewerResultTagsItem.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateVideoReviewsBodyItemVideoFramesItemReviewerResultTagsItem.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateVideoReviewsBodyItemVideoFramesItemReviewerResultTagsItem.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateVideoReviewsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateVideoReviewsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateVideoReviewsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/CreateVideoReviewsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/DetectedLanguage.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/DetectedLanguage.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/DetectedLanguage.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/DetectedLanguage.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/DetectedTerms.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/DetectedTerms.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/DetectedTerms.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/DetectedTerms.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Email.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Email.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Email.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Email.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Error.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Error.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Error.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Error.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Evaluate.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Evaluate.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Evaluate.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Evaluate.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/EvaluateFileInputOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/EvaluateFileInputOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/EvaluateFileInputOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/EvaluateFileInputOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/EvaluateMethodOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/EvaluateMethodOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/EvaluateMethodOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/EvaluateMethodOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/EvaluateUrlInputOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/EvaluateUrlInputOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/EvaluateUrlInputOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/EvaluateUrlInputOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Face.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Face.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Face.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Face.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/FindFacesFileInputOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/FindFacesFileInputOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/FindFacesFileInputOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/FindFacesFileInputOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/FindFacesOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/FindFacesOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/FindFacesOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/FindFacesOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/FindFacesUrlInputOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/FindFacesUrlInputOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/FindFacesUrlInputOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/FindFacesUrlInputOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/FoundFaces.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/FoundFaces.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/FoundFaces.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/FoundFaces.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Frame.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Frame.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Frame.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Frame.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Frames.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Frames.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Frames.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Frames.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/GetAllTermsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/GetAllTermsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/GetAllTermsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/GetAllTermsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/GetVideoFramesOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/GetVideoFramesOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/GetVideoFramesOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/GetVideoFramesOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/IPA.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/IPA.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/IPA.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/IPA.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Image.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Image.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Image.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Image.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ImageAdditionalInfoItem.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ImageAdditionalInfoItem.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ImageAdditionalInfoItem.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ImageAdditionalInfoItem.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ImageIds.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ImageIds.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ImageIds.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ImageIds.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ImageList.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ImageList.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ImageList.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ImageList.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ImageListMetadata.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ImageListMetadata.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ImageListMetadata.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ImageListMetadata.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Job.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Job.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Job.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Job.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/JobExecutionReportDetails.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/JobExecutionReportDetails.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/JobExecutionReportDetails.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/JobExecutionReportDetails.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/JobId.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/JobId.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/JobId.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/JobId.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/JobListResult.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/JobListResult.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/JobListResult.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/JobListResult.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/KeyValuePair.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/KeyValuePair.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/KeyValuePair.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/KeyValuePair.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Match.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Match.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Match.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Match.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/MatchFileInputOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/MatchFileInputOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/MatchFileInputOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/MatchFileInputOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/MatchMethodOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/MatchMethodOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/MatchMethodOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/MatchMethodOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/MatchResponse.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/MatchResponse.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/MatchResponse.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/MatchResponse.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/MatchUrlInputOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/MatchUrlInputOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/MatchUrlInputOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/MatchUrlInputOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/OCR.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/OCR.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/OCR.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/OCR.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/OCRFileInputOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/OCRFileInputOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/OCRFileInputOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/OCRFileInputOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/OCRMethodOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/OCRMethodOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/OCRMethodOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/OCRMethodOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/OCRUrlInputOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/OCRUrlInputOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/OCRUrlInputOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/OCRUrlInputOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/PII.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/PII.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/PII.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/PII.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Phone.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Phone.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Phone.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Phone.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/RefreshIndex.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/RefreshIndex.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/RefreshIndex.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/RefreshIndex.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/RefreshIndexAdvancedInfoItem.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/RefreshIndexAdvancedInfoItem.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/RefreshIndexAdvancedInfoItem.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/RefreshIndexAdvancedInfoItem.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Review.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Review.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Review.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Review.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/SSN.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/SSN.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/SSN.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/SSN.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Screen.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Screen.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Screen.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Screen.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ScreenTextOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ScreenTextOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ScreenTextOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/ScreenTextOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Status.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Status.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Status.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Status.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Tag.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Tag.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Tag.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Tag.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TermList.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TermList.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TermList.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TermList.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TermListMetadata.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TermListMetadata.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TermListMetadata.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TermListMetadata.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Terms.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Terms.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Terms.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/Terms.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TermsData.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TermsData.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TermsData.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TermsData.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TermsInList.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TermsInList.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TermsInList.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TermsInList.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TermsPaging.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TermsPaging.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TermsPaging.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TermsPaging.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TranscriptModerationBodyItem.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TranscriptModerationBodyItem.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TranscriptModerationBodyItem.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TranscriptModerationBodyItem.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TranscriptModerationBodyItemTermsItem.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TranscriptModerationBodyItemTermsItem.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TranscriptModerationBodyItemTermsItem.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/TranscriptModerationBodyItemTermsItem.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/VideoFrameBodyItem.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/VideoFrameBodyItem.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/VideoFrameBodyItem.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/VideoFrameBodyItem.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/VideoFrameBodyItemMetadataItem.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/VideoFrameBodyItemMetadataItem.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/VideoFrameBodyItemMetadataItem.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/VideoFrameBodyItemMetadataItem.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/VideoFrameBodyItemReviewerResultTagsItem.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/VideoFrameBodyItemReviewerResultTagsItem.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/VideoFrameBodyItemReviewerResultTagsItem.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/VideoFrameBodyItemReviewerResultTagsItem.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/package-info.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/models/package-info.java
diff --git a/cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/package-info.java b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-contentmoderator/src/main/java/com/microsoft/azure/cognitiveservices/vision/contentmoderator/package-info.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/pom.xml b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/pom.xml
similarity index 98%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/pom.xml
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/pom.xml
index 4362d9179db56..2d99abaad5d71 100644
--- a/cognitiveservices/data-plane/search/bingcustomimagesearch/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/pom.xml
@@ -9,7 +9,7 @@
com.microsoft.azure.cognitiveservicesazure-cognitiveservices-parent1.0.2
- ../../pom.xml
+ ../pom.xmlazure-cognitiveservices-customimagesearch1.0.2-beta
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/BingCustomImageSearchAPI.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/BingCustomImageSearchAPI.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/BingCustomImageSearchAPI.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/BingCustomImageSearchAPI.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/BingCustomImageSearchManager.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/BingCustomImageSearchManager.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/BingCustomImageSearchManager.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/BingCustomImageSearchManager.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/BingCustomInstances.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/BingCustomInstances.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/BingCustomInstances.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/BingCustomInstances.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/implementation/BingCustomImageSearchAPIImpl.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/implementation/BingCustomImageSearchAPIImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/implementation/BingCustomImageSearchAPIImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/implementation/BingCustomImageSearchAPIImpl.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/implementation/BingCustomInstancesImpl.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/implementation/BingCustomInstancesImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/implementation/BingCustomInstancesImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/implementation/BingCustomInstancesImpl.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/implementation/package-info.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/implementation/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/implementation/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/implementation/package-info.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Answer.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Answer.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Answer.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Answer.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/CreativeWork.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/CreativeWork.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/CreativeWork.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/CreativeWork.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Error.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Error.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Error.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Error.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ErrorCode.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ErrorCode.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ErrorCode.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ErrorCode.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ErrorResponse.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ErrorResponse.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ErrorResponse.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ErrorResponse.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ErrorResponseException.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ErrorResponseException.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ErrorResponseException.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ErrorResponseException.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ErrorSubCode.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ErrorSubCode.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ErrorSubCode.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ErrorSubCode.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Freshness.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Freshness.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Freshness.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Freshness.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Identifiable.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Identifiable.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Identifiable.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Identifiable.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageAspect.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageAspect.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageAspect.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageAspect.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageColor.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageColor.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageColor.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageColor.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageContent.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageContent.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageContent.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageContent.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageLicense.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageLicense.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageLicense.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageLicense.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageObject.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageObject.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageObject.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageObject.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageSearchOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageSearchOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageSearchOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageSearchOptionalParameter.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageSize.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageSize.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageSize.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageSize.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageType.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageType.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageType.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ImageType.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Images.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Images.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Images.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Images.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/MediaObject.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/MediaObject.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/MediaObject.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/MediaObject.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Query.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Query.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Query.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Query.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Response.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Response.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Response.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Response.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ResponseBase.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ResponseBase.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ResponseBase.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/ResponseBase.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/SafeSearch.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/SafeSearch.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/SafeSearch.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/SafeSearch.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/SearchResultsAnswer.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/SearchResultsAnswer.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/SearchResultsAnswer.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/SearchResultsAnswer.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Thing.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Thing.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Thing.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/Thing.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/WebPage.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/WebPage.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/WebPage.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/WebPage.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/package-info.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/models/package-info.java
diff --git a/cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/package-info.java b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-customimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customimagesearch/package-info.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/pom.xml b/sdk/cognitiveservices/ms-azure-cs-customsearch/pom.xml
similarity index 98%
rename from cognitiveservices/data-plane/search/bingcustomsearch/pom.xml
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/pom.xml
index 14c184488025a..5b6ac07a479a8 100644
--- a/cognitiveservices/data-plane/search/bingcustomsearch/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-customsearch/pom.xml
@@ -9,7 +9,7 @@
com.microsoft.azure.cognitiveservicesazure-cognitiveservices-parent1.0.2
- ../../pom.xml
+ ../pom.xmlazure-cognitiveservices-customsearch1.0.2
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/BingCustomInstances.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/BingCustomInstances.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/BingCustomInstances.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/BingCustomInstances.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/BingCustomSearchAPI.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/BingCustomSearchAPI.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/BingCustomSearchAPI.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/BingCustomSearchAPI.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/BingCustomSearchManager.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/BingCustomSearchManager.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/BingCustomSearchManager.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/BingCustomSearchManager.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/implementation/BingCustomInstancesImpl.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/implementation/BingCustomInstancesImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/implementation/BingCustomInstancesImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/implementation/BingCustomInstancesImpl.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/implementation/BingCustomSearchAPIImpl.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/implementation/BingCustomSearchAPIImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/implementation/BingCustomSearchAPIImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/implementation/BingCustomSearchAPIImpl.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/implementation/package-info.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/implementation/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/implementation/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/implementation/package-info.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/Answer.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/Answer.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/Answer.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/Answer.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/CreativeWork.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/CreativeWork.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/CreativeWork.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/CreativeWork.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/Error.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/Error.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/Error.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/Error.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/ErrorCode.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/ErrorCode.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/ErrorCode.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/ErrorCode.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/ErrorResponse.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/ErrorResponse.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/ErrorResponse.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/ErrorResponse.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/ErrorResponseException.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/ErrorResponseException.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/ErrorResponseException.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/ErrorResponseException.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/ErrorSubCode.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/ErrorSubCode.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/ErrorSubCode.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/ErrorSubCode.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/Identifiable.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/Identifiable.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/Identifiable.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/Identifiable.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/Query.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/Query.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/Query.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/Query.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/QueryContext.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/QueryContext.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/QueryContext.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/QueryContext.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/Response.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/Response.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/Response.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/Response.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/ResponseBase.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/ResponseBase.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/ResponseBase.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/ResponseBase.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/SafeSearch.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/SafeSearch.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/SafeSearch.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/SafeSearch.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/SearchOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/SearchOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/SearchOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/SearchOptionalParameter.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/SearchResponse.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/SearchResponse.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/SearchResponse.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/SearchResponse.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/SearchResultsAnswer.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/SearchResultsAnswer.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/SearchResultsAnswer.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/SearchResultsAnswer.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/TextFormat.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/TextFormat.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/TextFormat.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/TextFormat.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/Thing.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/Thing.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/Thing.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/Thing.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/WebMetaTag.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/WebMetaTag.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/WebMetaTag.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/WebMetaTag.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/WebPage.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/WebPage.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/WebPage.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/WebPage.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/WebWebAnswer.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/WebWebAnswer.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/WebWebAnswer.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/WebWebAnswer.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/package-info.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/models/package-info.java
diff --git a/cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/package-info.java b/sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingcustomsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-customsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/customsearch/package-info.java
diff --git a/cognitiveservices/data-plane/vision/customvision/prediction/pom.xml b/sdk/cognitiveservices/ms-azure-cs-customvision-prediction/pom.xml
similarity index 98%
rename from cognitiveservices/data-plane/vision/customvision/prediction/pom.xml
rename to sdk/cognitiveservices/ms-azure-cs-customvision-prediction/pom.xml
index e208aaa0b909d..f4ee4cec9cb4f 100644
--- a/cognitiveservices/data-plane/vision/customvision/prediction/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-customvision-prediction/pom.xml
@@ -11,7 +11,7 @@
com.microsoft.azure.cognitiveservicesazure-cognitiveservices-parent1.0.2
- ../../../pom.xml
+ ../pom.xmlazure-cognitiveservices-customvision-prediction1.0.2-beta
diff --git a/cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/CustomVisionPredictionManager.java b/sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/CustomVisionPredictionManager.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/CustomVisionPredictionManager.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/CustomVisionPredictionManager.java
diff --git a/cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/PredictionEndpoint.java b/sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/PredictionEndpoint.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/PredictionEndpoint.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/PredictionEndpoint.java
diff --git a/cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/Predictions.java b/sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/Predictions.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/Predictions.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/Predictions.java
diff --git a/cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/implementation/PredictionEndpointImpl.java b/sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/implementation/PredictionEndpointImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/implementation/PredictionEndpointImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/implementation/PredictionEndpointImpl.java
diff --git a/cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/implementation/PredictionsImpl.java b/sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/implementation/PredictionsImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/implementation/PredictionsImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/implementation/PredictionsImpl.java
diff --git a/cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/implementation/package-info.java b/sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/implementation/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/implementation/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/implementation/package-info.java
diff --git a/cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/BoundingBox.java b/sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/BoundingBox.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/BoundingBox.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/BoundingBox.java
diff --git a/cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/ImagePrediction.java b/sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/ImagePrediction.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/ImagePrediction.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/ImagePrediction.java
diff --git a/cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/ImageUrl.java b/sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/ImageUrl.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/ImageUrl.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/ImageUrl.java
diff --git a/cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/PredictImageOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/PredictImageOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/PredictImageOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/PredictImageOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/PredictImageUrlOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/PredictImageUrlOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/PredictImageUrlOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/PredictImageUrlOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/PredictImageUrlWithNoStoreOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/PredictImageUrlWithNoStoreOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/PredictImageUrlWithNoStoreOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/PredictImageUrlWithNoStoreOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/PredictImageWithNoStoreOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/PredictImageWithNoStoreOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/PredictImageWithNoStoreOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/PredictImageWithNoStoreOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/Prediction.java b/sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/Prediction.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/Prediction.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/Prediction.java
diff --git a/cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/package-info.java b/sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/models/package-info.java
diff --git a/cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/package-info.java b/sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-prediction/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/prediction/package-info.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/pom.xml b/sdk/cognitiveservices/ms-azure-cs-customvision-training/pom.xml
similarity index 98%
rename from cognitiveservices/data-plane/vision/customvision/training/pom.xml
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/pom.xml
index 9330c16a23f79..491e94891644b 100644
--- a/cognitiveservices/data-plane/vision/customvision/training/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-customvision-training/pom.xml
@@ -11,7 +11,7 @@
com.microsoft.azure.cognitiveservicesazure-cognitiveservices-parent1.0.2
- ../../../pom.xml
+ ../pom.xmlazure-cognitiveservices-customvision-training1.0.2-beta
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/CustomVisionTrainingManager.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/CustomVisionTrainingManager.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/CustomVisionTrainingManager.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/CustomVisionTrainingManager.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/TrainingApi.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/TrainingApi.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/TrainingApi.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/TrainingApi.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/Trainings.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/Trainings.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/Trainings.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/Trainings.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/implementation/TrainingApiImpl.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/implementation/TrainingApiImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/implementation/TrainingApiImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/implementation/TrainingApiImpl.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/implementation/TrainingsImpl.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/implementation/TrainingsImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/implementation/TrainingsImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/implementation/TrainingsImpl.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/implementation/package-info.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/implementation/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/implementation/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/implementation/package-info.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/BoundingBox.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/BoundingBox.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/BoundingBox.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/BoundingBox.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Classifier.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Classifier.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Classifier.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Classifier.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/CreateImageRegionsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/CreateImageRegionsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/CreateImageRegionsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/CreateImageRegionsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/CreateImageTagsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/CreateImageTagsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/CreateImageTagsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/CreateImageTagsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/CreateImagesFromDataOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/CreateImagesFromDataOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/CreateImagesFromDataOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/CreateImagesFromDataOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/CreateProjectOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/CreateProjectOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/CreateProjectOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/CreateProjectOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/CreateTagOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/CreateTagOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/CreateTagOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/CreateTagOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Domain.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Domain.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Domain.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Domain.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/DomainType.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/DomainType.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/DomainType.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/DomainType.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Export.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Export.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Export.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Export.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ExportFlavor.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ExportFlavor.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ExportFlavor.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ExportFlavor.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ExportIterationOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ExportIterationOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ExportIterationOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ExportIterationOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ExportPlatform.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ExportPlatform.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ExportPlatform.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ExportPlatform.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ExportStatusModel.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ExportStatusModel.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ExportStatusModel.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ExportStatusModel.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetImagePerformanceCountOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetImagePerformanceCountOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetImagePerformanceCountOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetImagePerformanceCountOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetImagePerformancesOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetImagePerformancesOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetImagePerformancesOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetImagePerformancesOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetImagesByIdsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetImagesByIdsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetImagesByIdsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetImagesByIdsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetIterationPerformanceOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetIterationPerformanceOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetIterationPerformanceOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetIterationPerformanceOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetTagOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetTagOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetTagOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetTagOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetTaggedImageCountOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetTaggedImageCountOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetTaggedImageCountOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetTaggedImageCountOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetTaggedImagesOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetTaggedImagesOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetTaggedImagesOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetTaggedImagesOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetTagsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetTagsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetTagsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetTagsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetUntaggedImageCountOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetUntaggedImageCountOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetUntaggedImageCountOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetUntaggedImageCountOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetUntaggedImagesOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetUntaggedImagesOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetUntaggedImagesOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/GetUntaggedImagesOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Image.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Image.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Image.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Image.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageCreateResult.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageCreateResult.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageCreateResult.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageCreateResult.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageCreateSummary.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageCreateSummary.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageCreateSummary.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageCreateSummary.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageFileCreateBatch.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageFileCreateBatch.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageFileCreateBatch.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageFileCreateBatch.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageFileCreateEntry.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageFileCreateEntry.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageFileCreateEntry.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageFileCreateEntry.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageIdCreateBatch.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageIdCreateBatch.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageIdCreateBatch.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageIdCreateBatch.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageIdCreateEntry.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageIdCreateEntry.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageIdCreateEntry.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageIdCreateEntry.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImagePerformance.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImagePerformance.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImagePerformance.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImagePerformance.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImagePrediction.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImagePrediction.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImagePrediction.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImagePrediction.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageRegion.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageRegion.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageRegion.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageRegion.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageRegionCreateBatch.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageRegionCreateBatch.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageRegionCreateBatch.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageRegionCreateBatch.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageRegionCreateEntry.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageRegionCreateEntry.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageRegionCreateEntry.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageRegionCreateEntry.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageRegionCreateResult.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageRegionCreateResult.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageRegionCreateResult.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageRegionCreateResult.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageRegionCreateSummary.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageRegionCreateSummary.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageRegionCreateSummary.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageRegionCreateSummary.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageRegionProposal.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageRegionProposal.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageRegionProposal.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageRegionProposal.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageTag.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageTag.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageTag.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageTag.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageTagCreateBatch.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageTagCreateBatch.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageTagCreateBatch.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageTagCreateBatch.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageTagCreateEntry.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageTagCreateEntry.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageTagCreateEntry.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageTagCreateEntry.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageTagCreateSummary.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageTagCreateSummary.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageTagCreateSummary.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageTagCreateSummary.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageUploadStatus.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageUploadStatus.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageUploadStatus.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageUploadStatus.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageUrl.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageUrl.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageUrl.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageUrl.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageUrlCreateBatch.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageUrlCreateBatch.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageUrlCreateBatch.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageUrlCreateBatch.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageUrlCreateEntry.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageUrlCreateEntry.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageUrlCreateEntry.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ImageUrlCreateEntry.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Iteration.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Iteration.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Iteration.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Iteration.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/IterationPerformance.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/IterationPerformance.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/IterationPerformance.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/IterationPerformance.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/OrderBy.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/OrderBy.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/OrderBy.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/OrderBy.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Prediction.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Prediction.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Prediction.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Prediction.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/PredictionQueryResult.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/PredictionQueryResult.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/PredictionQueryResult.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/PredictionQueryResult.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/PredictionQueryTag.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/PredictionQueryTag.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/PredictionQueryTag.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/PredictionQueryTag.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/PredictionQueryToken.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/PredictionQueryToken.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/PredictionQueryToken.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/PredictionQueryToken.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Project.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Project.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Project.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Project.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ProjectSettings.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ProjectSettings.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ProjectSettings.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/ProjectSettings.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/QuickTestImageOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/QuickTestImageOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/QuickTestImageOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/QuickTestImageOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/QuickTestImageUrlOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/QuickTestImageUrlOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/QuickTestImageUrlOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/QuickTestImageUrlOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Region.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Region.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Region.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Region.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/RegionProposal.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/RegionProposal.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/RegionProposal.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/RegionProposal.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/StoredImagePrediction.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/StoredImagePrediction.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/StoredImagePrediction.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/StoredImagePrediction.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Tag.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Tag.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Tag.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/Tag.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/TagPerformance.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/TagPerformance.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/TagPerformance.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/TagPerformance.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/package-info.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/models/package-info.java
diff --git a/cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/package-info.java b/sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/customvision/training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-customvision-training/src/main/java/com/microsoft/azure/cognitiveservices/vision/customvision/training/package-info.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/pom.xml b/sdk/cognitiveservices/ms-azure-cs-entitysearch/pom.xml
similarity index 98%
rename from cognitiveservices/data-plane/search/bingentitysearch/pom.xml
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/pom.xml
index 58421872540f0..e43ccb17c512e 100644
--- a/cognitiveservices/data-plane/search/bingentitysearch/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-entitysearch/pom.xml
@@ -9,7 +9,7 @@
com.microsoft.azure.cognitiveservicesazure-cognitiveservices-parent1.0.2
- ../../pom.xml
+ ../pom.xmlazure-cognitiveservices-entitysearch1.0.2
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/BingEntities.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/BingEntities.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/BingEntities.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/BingEntities.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/BingEntitySearchAPI.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/BingEntitySearchAPI.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/BingEntitySearchAPI.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/BingEntitySearchAPI.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/BingEntitySearchManager.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/BingEntitySearchManager.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/BingEntitySearchManager.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/BingEntitySearchManager.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/implementation/BingEntitiesImpl.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/implementation/BingEntitiesImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/implementation/BingEntitiesImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/implementation/BingEntitiesImpl.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/implementation/BingEntitySearchAPIImpl.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/implementation/BingEntitySearchAPIImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/implementation/BingEntitySearchAPIImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/implementation/BingEntitySearchAPIImpl.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/implementation/package-info.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/implementation/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/implementation/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/implementation/package-info.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Airport.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Airport.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Airport.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Airport.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Answer.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Answer.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Answer.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Answer.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/AnswerType.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/AnswerType.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/AnswerType.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/AnswerType.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/CivicStructure.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/CivicStructure.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/CivicStructure.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/CivicStructure.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ContractualRulesAttribution.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ContractualRulesAttribution.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ContractualRulesAttribution.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ContractualRulesAttribution.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ContractualRulesContractualRule.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ContractualRulesContractualRule.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ContractualRulesContractualRule.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ContractualRulesContractualRule.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ContractualRulesLicenseAttribution.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ContractualRulesLicenseAttribution.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ContractualRulesLicenseAttribution.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ContractualRulesLicenseAttribution.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ContractualRulesLinkAttribution.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ContractualRulesLinkAttribution.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ContractualRulesLinkAttribution.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ContractualRulesLinkAttribution.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ContractualRulesMediaAttribution.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ContractualRulesMediaAttribution.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ContractualRulesMediaAttribution.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ContractualRulesMediaAttribution.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ContractualRulesTextAttribution.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ContractualRulesTextAttribution.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ContractualRulesTextAttribution.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ContractualRulesTextAttribution.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/CreativeWork.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/CreativeWork.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/CreativeWork.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/CreativeWork.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/EntertainmentBusiness.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/EntertainmentBusiness.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/EntertainmentBusiness.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/EntertainmentBusiness.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/EntitiesEntityPresentationInfo.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/EntitiesEntityPresentationInfo.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/EntitiesEntityPresentationInfo.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/EntitiesEntityPresentationInfo.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/EntitiesModel.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/EntitiesModel.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/EntitiesModel.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/EntitiesModel.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/EntityQueryScenario.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/EntityQueryScenario.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/EntityQueryScenario.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/EntityQueryScenario.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/EntityScenario.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/EntityScenario.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/EntityScenario.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/EntityScenario.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/EntityType.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/EntityType.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/EntityType.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/EntityType.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Error.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Error.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Error.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Error.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ErrorCode.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ErrorCode.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ErrorCode.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ErrorCode.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ErrorResponse.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ErrorResponse.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ErrorResponse.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ErrorResponse.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ErrorResponseException.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ErrorResponseException.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ErrorResponseException.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ErrorResponseException.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ErrorSubCode.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ErrorSubCode.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ErrorSubCode.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ErrorSubCode.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/FoodEstablishment.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/FoodEstablishment.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/FoodEstablishment.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/FoodEstablishment.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Hotel.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Hotel.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Hotel.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Hotel.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Identifiable.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Identifiable.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Identifiable.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Identifiable.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ImageObject.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ImageObject.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ImageObject.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ImageObject.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Intangible.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Intangible.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Intangible.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Intangible.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/License.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/License.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/License.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/License.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/LocalBusiness.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/LocalBusiness.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/LocalBusiness.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/LocalBusiness.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/LodgingBusiness.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/LodgingBusiness.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/LodgingBusiness.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/LodgingBusiness.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/MediaObject.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/MediaObject.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/MediaObject.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/MediaObject.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/MovieTheater.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/MovieTheater.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/MovieTheater.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/MovieTheater.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Organization.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Organization.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Organization.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Organization.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Place.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Place.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Place.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Place.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Places.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Places.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Places.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Places.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/PostalAddress.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/PostalAddress.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/PostalAddress.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/PostalAddress.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/QueryContext.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/QueryContext.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/QueryContext.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/QueryContext.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Response.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Response.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Response.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Response.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ResponseBase.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ResponseBase.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ResponseBase.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ResponseBase.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ResponseFormat.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ResponseFormat.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ResponseFormat.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/ResponseFormat.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Restaurant.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Restaurant.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Restaurant.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Restaurant.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/SafeSearch.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/SafeSearch.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/SafeSearch.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/SafeSearch.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/SearchOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/SearchOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/SearchOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/SearchOptionalParameter.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/SearchResponse.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/SearchResponse.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/SearchResponse.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/SearchResponse.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/SearchResultsAnswer.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/SearchResultsAnswer.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/SearchResultsAnswer.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/SearchResultsAnswer.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/StructuredValue.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/StructuredValue.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/StructuredValue.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/StructuredValue.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Thing.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Thing.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Thing.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/Thing.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/TouristAttraction.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/TouristAttraction.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/TouristAttraction.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/TouristAttraction.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/package-info.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/models/package-info.java
diff --git a/cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/package-info.java b/sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingentitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-entitysearch/src/main/java/com/microsoft/azure/cognitiveservices/search/entitysearch/package-info.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/pom.xml b/sdk/cognitiveservices/ms-azure-cs-faceapi/pom.xml
similarity index 98%
rename from cognitiveservices/data-plane/vision/faceapi/pom.xml
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/pom.xml
index 9da7c43166699..75833fdba5817 100644
--- a/cognitiveservices/data-plane/vision/faceapi/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-faceapi/pom.xml
@@ -9,7 +9,7 @@
com.microsoft.azure.cognitiveservicesazure-cognitiveservices-parent1.0.2
- ../../pom.xml
+ ../pom.xmlazure-cognitiveservices-faceapi1.0.2-beta
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/FaceAPI.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/FaceAPI.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/FaceAPI.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/FaceAPI.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/FaceAPIManager.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/FaceAPIManager.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/FaceAPIManager.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/FaceAPIManager.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/FaceLists.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/FaceLists.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/FaceLists.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/FaceLists.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/Faces.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/Faces.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/Faces.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/Faces.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/PersonGroupPersons.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/PersonGroupPersons.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/PersonGroupPersons.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/PersonGroupPersons.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/PersonGroups.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/PersonGroups.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/PersonGroups.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/PersonGroups.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/implementation/FaceAPIImpl.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/implementation/FaceAPIImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/implementation/FaceAPIImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/implementation/FaceAPIImpl.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/implementation/FaceListsImpl.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/implementation/FaceListsImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/implementation/FaceListsImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/implementation/FaceListsImpl.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/implementation/FacesImpl.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/implementation/FacesImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/implementation/FacesImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/implementation/FacesImpl.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/implementation/PersonGroupPersonsImpl.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/implementation/PersonGroupPersonsImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/implementation/PersonGroupPersonsImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/implementation/PersonGroupPersonsImpl.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/implementation/PersonGroupsImpl.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/implementation/PersonGroupsImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/implementation/PersonGroupsImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/implementation/PersonGroupsImpl.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/implementation/package-info.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/implementation/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/implementation/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/implementation/package-info.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/APIError.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/APIError.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/APIError.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/APIError.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/APIErrorException.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/APIErrorException.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/APIErrorException.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/APIErrorException.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Accessory.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Accessory.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Accessory.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Accessory.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/AccessoryType.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/AccessoryType.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/AccessoryType.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/AccessoryType.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/AddFaceFromStreamOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/AddFaceFromStreamOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/AddFaceFromStreamOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/AddFaceFromStreamOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/AddFaceFromUrlOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/AddFaceFromUrlOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/AddFaceFromUrlOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/AddFaceFromUrlOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/AddPersonFaceFromStreamOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/AddPersonFaceFromStreamOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/AddPersonFaceFromStreamOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/AddPersonFaceFromStreamOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/AddPersonFaceFromUrlOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/AddPersonFaceFromUrlOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/AddPersonFaceFromUrlOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/AddPersonFaceFromUrlOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/AzureRegions.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/AzureRegions.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/AzureRegions.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/AzureRegions.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Blur.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Blur.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Blur.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Blur.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/BlurLevel.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/BlurLevel.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/BlurLevel.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/BlurLevel.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Coordinate.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Coordinate.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Coordinate.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Coordinate.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/CreateFaceListsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/CreateFaceListsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/CreateFaceListsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/CreateFaceListsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/CreatePersonGroupPersonsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/CreatePersonGroupPersonsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/CreatePersonGroupPersonsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/CreatePersonGroupPersonsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/CreatePersonGroupsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/CreatePersonGroupsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/CreatePersonGroupsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/CreatePersonGroupsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/DetectWithStreamOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/DetectWithStreamOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/DetectWithStreamOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/DetectWithStreamOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/DetectWithUrlOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/DetectWithUrlOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/DetectWithUrlOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/DetectWithUrlOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/DetectedFace.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/DetectedFace.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/DetectedFace.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/DetectedFace.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Emotion.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Emotion.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Emotion.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Emotion.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Error.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Error.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Error.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Error.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Exposure.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Exposure.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Exposure.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Exposure.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/ExposureLevel.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/ExposureLevel.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/ExposureLevel.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/ExposureLevel.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FaceAttributeType.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FaceAttributeType.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FaceAttributeType.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FaceAttributeType.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FaceAttributes.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FaceAttributes.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FaceAttributes.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FaceAttributes.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FaceLandmarks.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FaceLandmarks.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FaceLandmarks.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FaceLandmarks.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FaceList.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FaceList.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FaceList.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FaceList.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FaceRectangle.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FaceRectangle.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FaceRectangle.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FaceRectangle.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FacialHair.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FacialHair.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FacialHair.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FacialHair.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FindSimilarMatchMode.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FindSimilarMatchMode.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FindSimilarMatchMode.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FindSimilarMatchMode.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FindSimilarOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FindSimilarOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FindSimilarOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FindSimilarOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FindSimilarRequest.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FindSimilarRequest.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FindSimilarRequest.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/FindSimilarRequest.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Gender.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Gender.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Gender.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Gender.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/GlassesType.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/GlassesType.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/GlassesType.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/GlassesType.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/GroupRequest.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/GroupRequest.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/GroupRequest.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/GroupRequest.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/GroupResult.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/GroupResult.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/GroupResult.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/GroupResult.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Hair.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Hair.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Hair.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Hair.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/HairColor.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/HairColor.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/HairColor.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/HairColor.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/HairColorType.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/HairColorType.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/HairColorType.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/HairColorType.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/HeadPose.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/HeadPose.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/HeadPose.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/HeadPose.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/IdentifyCandidate.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/IdentifyCandidate.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/IdentifyCandidate.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/IdentifyCandidate.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/IdentifyOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/IdentifyOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/IdentifyOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/IdentifyOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/IdentifyRequest.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/IdentifyRequest.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/IdentifyRequest.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/IdentifyRequest.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/IdentifyResult.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/IdentifyResult.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/IdentifyResult.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/IdentifyResult.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/ImageUrl.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/ImageUrl.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/ImageUrl.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/ImageUrl.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/ListPersonGroupPersonsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/ListPersonGroupPersonsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/ListPersonGroupPersonsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/ListPersonGroupPersonsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/ListPersonGroupsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/ListPersonGroupsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/ListPersonGroupsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/ListPersonGroupsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Makeup.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Makeup.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Makeup.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Makeup.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/NameAndUserDataContract.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/NameAndUserDataContract.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/NameAndUserDataContract.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/NameAndUserDataContract.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Noise.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Noise.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Noise.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Noise.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/NoiseLevel.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/NoiseLevel.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/NoiseLevel.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/NoiseLevel.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Occlusion.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Occlusion.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Occlusion.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Occlusion.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/PersistedFace.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/PersistedFace.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/PersistedFace.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/PersistedFace.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Person.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Person.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Person.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/Person.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/PersonGroup.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/PersonGroup.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/PersonGroup.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/PersonGroup.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/SimilarFace.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/SimilarFace.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/SimilarFace.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/SimilarFace.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/TrainingStatus.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/TrainingStatus.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/TrainingStatus.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/TrainingStatus.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/TrainingStatusType.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/TrainingStatusType.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/TrainingStatusType.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/TrainingStatusType.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/UpdateFaceListsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/UpdateFaceListsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/UpdateFaceListsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/UpdateFaceListsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/UpdateFaceOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/UpdateFaceOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/UpdateFaceOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/UpdateFaceOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/UpdatePersonFaceRequest.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/UpdatePersonFaceRequest.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/UpdatePersonFaceRequest.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/UpdatePersonFaceRequest.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/UpdatePersonGroupPersonsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/UpdatePersonGroupPersonsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/UpdatePersonGroupPersonsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/UpdatePersonGroupPersonsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/UpdatePersonGroupsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/UpdatePersonGroupsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/UpdatePersonGroupsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/UpdatePersonGroupsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/VerifyFaceToFaceRequest.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/VerifyFaceToFaceRequest.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/VerifyFaceToFaceRequest.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/VerifyFaceToFaceRequest.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/VerifyFaceToPersonRequest.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/VerifyFaceToPersonRequest.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/VerifyFaceToPersonRequest.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/VerifyFaceToPersonRequest.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/VerifyResult.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/VerifyResult.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/VerifyResult.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/VerifyResult.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/package-info.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/models/package-info.java
diff --git a/cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/package-info.java b/sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/vision/faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-faceapi/src/main/java/com/microsoft/azure/cognitiveservices/vision/faceapi/package-info.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/pom.xml b/sdk/cognitiveservices/ms-azure-cs-imagesearch/pom.xml
similarity index 98%
rename from cognitiveservices/data-plane/search/bingimagesearch/pom.xml
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/pom.xml
index 6ec62a353a1e5..629742c83a1d1 100644
--- a/cognitiveservices/data-plane/search/bingimagesearch/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-imagesearch/pom.xml
@@ -9,7 +9,7 @@
com.microsoft.azure.cognitiveservicesazure-cognitiveservices-parent1.0.2
- ../../pom.xml
+ ../pom.xmlazure-cognitiveservices-imagesearch1.0.2
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/BingImageSearchAPI.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/BingImageSearchAPI.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/BingImageSearchAPI.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/BingImageSearchAPI.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/BingImageSearchManager.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/BingImageSearchManager.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/BingImageSearchManager.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/BingImageSearchManager.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/BingImages.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/BingImages.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/BingImages.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/BingImages.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/implementation/BingImageSearchAPIImpl.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/implementation/BingImageSearchAPIImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/implementation/BingImageSearchAPIImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/implementation/BingImageSearchAPIImpl.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/implementation/BingImagesImpl.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/implementation/BingImagesImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/implementation/BingImagesImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/implementation/BingImagesImpl.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/implementation/package-info.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/implementation/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/implementation/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/implementation/package-info.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/AggregateOffer.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/AggregateOffer.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/AggregateOffer.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/AggregateOffer.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/AggregateRating.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/AggregateRating.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/AggregateRating.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/AggregateRating.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Answer.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Answer.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Answer.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Answer.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/CollectionPage.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/CollectionPage.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/CollectionPage.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/CollectionPage.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/CreativeWork.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/CreativeWork.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/CreativeWork.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/CreativeWork.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Currency.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Currency.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Currency.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Currency.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/DetailsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/DetailsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/DetailsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/DetailsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Error.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Error.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Error.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Error.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ErrorCode.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ErrorCode.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ErrorCode.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ErrorCode.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ErrorResponse.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ErrorResponse.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ErrorResponse.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ErrorResponse.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ErrorResponseException.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ErrorResponseException.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ErrorResponseException.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ErrorResponseException.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ErrorSubCode.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ErrorSubCode.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ErrorSubCode.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ErrorSubCode.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Freshness.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Freshness.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Freshness.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Freshness.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Identifiable.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Identifiable.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Identifiable.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Identifiable.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageAspect.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageAspect.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageAspect.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageAspect.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageColor.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageColor.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageColor.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageColor.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageContent.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageContent.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageContent.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageContent.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageCropType.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageCropType.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageCropType.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageCropType.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageGallery.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageGallery.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageGallery.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageGallery.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageInsightModule.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageInsightModule.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageInsightModule.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageInsightModule.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageInsights.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageInsights.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageInsights.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageInsights.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageInsightsImageCaption.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageInsightsImageCaption.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageInsightsImageCaption.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageInsightsImageCaption.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageLicense.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageLicense.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageLicense.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageLicense.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageObject.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageObject.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageObject.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageObject.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageSize.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageSize.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageSize.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageSize.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageTagsModule.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageTagsModule.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageTagsModule.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageTagsModule.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageType.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageType.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageType.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImageType.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImagesImageMetadata.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImagesImageMetadata.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImagesImageMetadata.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImagesImageMetadata.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImagesModel.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImagesModel.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImagesModel.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImagesModel.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImagesModule.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImagesModule.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImagesModule.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ImagesModule.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/InsightsTag.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/InsightsTag.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/InsightsTag.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/InsightsTag.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Intangible.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Intangible.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Intangible.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Intangible.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ItemAvailability.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ItemAvailability.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ItemAvailability.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ItemAvailability.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/MediaObject.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/MediaObject.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/MediaObject.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/MediaObject.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/NormalizedRectangle.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/NormalizedRectangle.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/NormalizedRectangle.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/NormalizedRectangle.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Offer.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Offer.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Offer.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Offer.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Organization.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Organization.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Organization.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Organization.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Person.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Person.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Person.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Person.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/PivotSuggestions.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/PivotSuggestions.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/PivotSuggestions.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/PivotSuggestions.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/PropertiesItem.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/PropertiesItem.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/PropertiesItem.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/PropertiesItem.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Query.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Query.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Query.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Query.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Rating.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Rating.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Rating.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Rating.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Recipe.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Recipe.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Recipe.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Recipe.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RecipesModule.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RecipesModule.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RecipesModule.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RecipesModule.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RecognizedEntitiesModule.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RecognizedEntitiesModule.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RecognizedEntitiesModule.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RecognizedEntitiesModule.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RecognizedEntity.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RecognizedEntity.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RecognizedEntity.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RecognizedEntity.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RecognizedEntityGroup.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RecognizedEntityGroup.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RecognizedEntityGroup.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RecognizedEntityGroup.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RecognizedEntityRegion.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RecognizedEntityRegion.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RecognizedEntityRegion.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RecognizedEntityRegion.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RelatedCollectionsModule.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RelatedCollectionsModule.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RelatedCollectionsModule.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RelatedCollectionsModule.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RelatedSearchesModule.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RelatedSearchesModule.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RelatedSearchesModule.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/RelatedSearchesModule.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Response.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Response.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Response.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Response.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ResponseBase.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ResponseBase.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ResponseBase.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/ResponseBase.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/SafeSearch.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/SafeSearch.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/SafeSearch.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/SafeSearch.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/SearchOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/SearchOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/SearchOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/SearchOptionalParameter.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/SearchResultsAnswer.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/SearchResultsAnswer.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/SearchResultsAnswer.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/SearchResultsAnswer.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/StructuredValue.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/StructuredValue.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/StructuredValue.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/StructuredValue.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Thing.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Thing.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Thing.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/Thing.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/TrendingImages.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/TrendingImages.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/TrendingImages.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/TrendingImages.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/TrendingImagesCategory.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/TrendingImagesCategory.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/TrendingImagesCategory.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/TrendingImagesCategory.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/TrendingImagesTile.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/TrendingImagesTile.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/TrendingImagesTile.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/TrendingImagesTile.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/TrendingOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/TrendingOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/TrendingOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/TrendingOptionalParameter.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/WebPage.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/WebPage.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/WebPage.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/WebPage.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/package-info.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/models/package-info.java
diff --git a/cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/package-info.java b/sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingimagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-imagesearch/src/main/java/com/microsoft/azure/cognitiveservices/search/imagesearch/package-info.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/pom.xml b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/pom.xml
similarity index 98%
rename from cognitiveservices/data-plane/language/luis/authoring/pom.xml
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/pom.xml
index 878d915c0ed1b..9989b6af3ece1 100644
--- a/cognitiveservices/data-plane/language/luis/authoring/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/pom.xml
@@ -9,7 +9,7 @@
com.microsoft.azure.cognitiveservicesazure-cognitiveservices-parent1.0.2
- ../../../pom.xml
+ ../pom.xmlazure-cognitiveservices-luis-authoring1.0.2-beta
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Apps.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Apps.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Apps.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Apps.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/EndpointAPI.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/EndpointAPI.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/EndpointAPI.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/EndpointAPI.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Examples.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Examples.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Examples.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Examples.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Features.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Features.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Features.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Features.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/LUISAuthoringClient.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/LUISAuthoringClient.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/LUISAuthoringClient.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/LUISAuthoringClient.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/LUISAuthoringManager.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/LUISAuthoringManager.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/LUISAuthoringManager.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/LUISAuthoringManager.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Models.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Models.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Models.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Models.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Patterns.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Patterns.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Patterns.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Patterns.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Permissions.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Permissions.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Permissions.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Permissions.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Trains.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Trains.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Trains.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Trains.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Versions.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Versions.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Versions.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/Versions.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/AppsImpl.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/AppsImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/AppsImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/AppsImpl.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/ExamplesImpl.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/ExamplesImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/ExamplesImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/ExamplesImpl.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/FeaturesImpl.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/FeaturesImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/FeaturesImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/FeaturesImpl.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/LUISAuthoringClientImpl.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/LUISAuthoringClientImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/LUISAuthoringClientImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/LUISAuthoringClientImpl.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/ModelsImpl.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/ModelsImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/ModelsImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/ModelsImpl.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/PatternsImpl.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/PatternsImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/PatternsImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/PatternsImpl.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/PermissionsImpl.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/PermissionsImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/PermissionsImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/PermissionsImpl.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/TrainsImpl.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/TrainsImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/TrainsImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/TrainsImpl.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/VersionsImpl.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/VersionsImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/VersionsImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/VersionsImpl.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/package-info.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/implementation/package-info.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddCompositeEntityChildOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddCompositeEntityChildOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddCompositeEntityChildOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddCompositeEntityChildOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddCustomPrebuiltDomainModelsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddCustomPrebuiltDomainModelsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddCustomPrebuiltDomainModelsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddCustomPrebuiltDomainModelsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddEntityOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddEntityOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddEntityOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddEntityOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddExplicitListItemOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddExplicitListItemOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddExplicitListItemOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddExplicitListItemOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddHierarchicalEntityChildOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddHierarchicalEntityChildOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddHierarchicalEntityChildOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddHierarchicalEntityChildOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddIntentOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddIntentOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddIntentOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddIntentOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddPermissionsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddPermissionsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddPermissionsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AddPermissionsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ApplicationCreateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ApplicationCreateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ApplicationCreateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ApplicationCreateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ApplicationInfoResponse.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ApplicationInfoResponse.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ApplicationInfoResponse.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ApplicationInfoResponse.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ApplicationPublishObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ApplicationPublishObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ApplicationPublishObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ApplicationPublishObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ApplicationSettingUpdateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ApplicationSettingUpdateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ApplicationSettingUpdateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ApplicationSettingUpdateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ApplicationSettings.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ApplicationSettings.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ApplicationSettings.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ApplicationSettings.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ApplicationUpdateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ApplicationUpdateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ApplicationUpdateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ApplicationUpdateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AvailableCulture.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AvailableCulture.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AvailableCulture.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AvailableCulture.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AvailablePrebuiltEntityModel.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AvailablePrebuiltEntityModel.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AvailablePrebuiltEntityModel.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/AvailablePrebuiltEntityModel.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/BatchLabelExample.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/BatchLabelExample.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/BatchLabelExample.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/BatchLabelExample.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ChildEntity.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ChildEntity.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ChildEntity.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ChildEntity.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CloneOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CloneOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CloneOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CloneOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ClosedList.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ClosedList.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ClosedList.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ClosedList.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ClosedListEntityExtractor.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ClosedListEntityExtractor.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ClosedListEntityExtractor.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ClosedListEntityExtractor.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ClosedListModelCreateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ClosedListModelCreateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ClosedListModelCreateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ClosedListModelCreateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ClosedListModelPatchObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ClosedListModelPatchObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ClosedListModelPatchObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ClosedListModelPatchObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ClosedListModelUpdateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ClosedListModelUpdateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ClosedListModelUpdateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ClosedListModelUpdateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CollaboratorsArray.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CollaboratorsArray.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CollaboratorsArray.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CollaboratorsArray.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CompositeChildModelCreateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CompositeChildModelCreateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CompositeChildModelCreateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CompositeChildModelCreateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CompositeEntityExtractor.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CompositeEntityExtractor.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CompositeEntityExtractor.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CompositeEntityExtractor.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CompositeEntityModel.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CompositeEntityModel.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CompositeEntityModel.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CompositeEntityModel.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreateClosedListEntityRoleOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreateClosedListEntityRoleOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreateClosedListEntityRoleOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreateClosedListEntityRoleOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreateCompositeEntityRoleOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreateCompositeEntityRoleOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreateCompositeEntityRoleOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreateCompositeEntityRoleOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreateCustomPrebuiltEntityRoleOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreateCustomPrebuiltEntityRoleOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreateCustomPrebuiltEntityRoleOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreateCustomPrebuiltEntityRoleOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreateEntityRoleOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreateEntityRoleOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreateEntityRoleOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreateEntityRoleOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreateHierarchicalEntityRoleOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreateHierarchicalEntityRoleOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreateHierarchicalEntityRoleOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreateHierarchicalEntityRoleOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreatePatternAnyEntityRoleOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreatePatternAnyEntityRoleOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreatePatternAnyEntityRoleOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreatePatternAnyEntityRoleOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreatePrebuiltEntityRoleOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreatePrebuiltEntityRoleOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreatePrebuiltEntityRoleOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreatePrebuiltEntityRoleOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreateRegexEntityRoleOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreateRegexEntityRoleOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreateRegexEntityRoleOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CreateRegexEntityRoleOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CustomPrebuiltModel.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CustomPrebuiltModel.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CustomPrebuiltModel.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/CustomPrebuiltModel.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/DeleteIntentOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/DeleteIntentOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/DeleteIntentOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/DeleteIntentOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/DeletePermissionsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/DeletePermissionsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/DeletePermissionsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/DeletePermissionsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EndpointInfo.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EndpointInfo.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EndpointInfo.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EndpointInfo.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EnqueueTrainingResponse.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EnqueueTrainingResponse.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EnqueueTrainingResponse.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EnqueueTrainingResponse.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntitiesSuggestionExample.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntitiesSuggestionExample.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntitiesSuggestionExample.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntitiesSuggestionExample.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityExtractor.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityExtractor.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityExtractor.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityExtractor.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityLabel.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityLabel.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityLabel.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityLabel.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityLabelObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityLabelObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityLabelObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityLabelObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityModelInfo.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityModelInfo.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityModelInfo.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityModelInfo.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityPrediction.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityPrediction.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityPrediction.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityPrediction.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityRole.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityRole.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityRole.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityRole.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityRoleCreateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityRoleCreateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityRoleCreateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityRoleCreateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityRoleUpdateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityRoleUpdateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityRoleUpdateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/EntityRoleUpdateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ErrorResponse.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ErrorResponse.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ErrorResponse.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ErrorResponse.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ErrorResponseException.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ErrorResponseException.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ErrorResponseException.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ErrorResponseException.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ExampleLabelObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ExampleLabelObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ExampleLabelObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ExampleLabelObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ExamplesMethodOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ExamplesMethodOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ExamplesMethodOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ExamplesMethodOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ExplicitListItem.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ExplicitListItem.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ExplicitListItem.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ExplicitListItem.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ExplicitListItemCreateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ExplicitListItemCreateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ExplicitListItemCreateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ExplicitListItemCreateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ExplicitListItemUpdateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ExplicitListItemUpdateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ExplicitListItemUpdateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ExplicitListItemUpdateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/FeatureInfoObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/FeatureInfoObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/FeatureInfoObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/FeatureInfoObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/FeaturesResponseObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/FeaturesResponseObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/FeaturesResponseObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/FeaturesResponseObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/GetEntitySuggestionsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/GetEntitySuggestionsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/GetEntitySuggestionsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/GetEntitySuggestionsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/GetIntentPatternsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/GetIntentPatternsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/GetIntentPatternsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/GetIntentPatternsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/GetIntentSuggestionsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/GetIntentSuggestionsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/GetIntentSuggestionsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/GetIntentSuggestionsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/GetPatternAnyEntityInfosOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/GetPatternAnyEntityInfosOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/GetPatternAnyEntityInfosOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/GetPatternAnyEntityInfosOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/GetPatternsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/GetPatternsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/GetPatternsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/GetPatternsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/GetRegexEntityInfosOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/GetRegexEntityInfosOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/GetRegexEntityInfosOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/GetRegexEntityInfosOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/HierarchicalChildEntity.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/HierarchicalChildEntity.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/HierarchicalChildEntity.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/HierarchicalChildEntity.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/HierarchicalChildModelCreateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/HierarchicalChildModelCreateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/HierarchicalChildModelCreateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/HierarchicalChildModelCreateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/HierarchicalChildModelUpdateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/HierarchicalChildModelUpdateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/HierarchicalChildModelUpdateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/HierarchicalChildModelUpdateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/HierarchicalEntityExtractor.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/HierarchicalEntityExtractor.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/HierarchicalEntityExtractor.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/HierarchicalEntityExtractor.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/HierarchicalEntityModel.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/HierarchicalEntityModel.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/HierarchicalEntityModel.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/HierarchicalEntityModel.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/HierarchicalModel.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/HierarchicalModel.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/HierarchicalModel.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/HierarchicalModel.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ImportMethodAppsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ImportMethodAppsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ImportMethodAppsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ImportMethodAppsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ImportMethodVersionsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ImportMethodVersionsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ImportMethodVersionsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ImportMethodVersionsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/IntentClassifier.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/IntentClassifier.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/IntentClassifier.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/IntentClassifier.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/IntentPrediction.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/IntentPrediction.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/IntentPrediction.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/IntentPrediction.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/IntentsSuggestionExample.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/IntentsSuggestionExample.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/IntentsSuggestionExample.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/IntentsSuggestionExample.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/JSONEntity.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/JSONEntity.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/JSONEntity.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/JSONEntity.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/JSONModelFeature.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/JSONModelFeature.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/JSONModelFeature.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/JSONModelFeature.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/JSONRegexFeature.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/JSONRegexFeature.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/JSONRegexFeature.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/JSONRegexFeature.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/JSONUtterance.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/JSONUtterance.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/JSONUtterance.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/JSONUtterance.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/LabelExampleResponse.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/LabelExampleResponse.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/LabelExampleResponse.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/LabelExampleResponse.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/LabelTextObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/LabelTextObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/LabelTextObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/LabelTextObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/LabeledUtterance.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/LabeledUtterance.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/LabeledUtterance.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/LabeledUtterance.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListAppsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListAppsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListAppsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListAppsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListClosedListsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListClosedListsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListClosedListsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListClosedListsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListCompositeEntitiesOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListCompositeEntitiesOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListCompositeEntitiesOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListCompositeEntitiesOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListEntitiesOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListEntitiesOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListEntitiesOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListEntitiesOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListExamplesOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListExamplesOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListExamplesOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListExamplesOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListFeaturesOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListFeaturesOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListFeaturesOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListFeaturesOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListHierarchicalEntitiesOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListHierarchicalEntitiesOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListHierarchicalEntitiesOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListHierarchicalEntitiesOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListIntentsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListIntentsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListIntentsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListIntentsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListModelsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListModelsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListModelsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListModelsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListPhraseListsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListPhraseListsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListPhraseListsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListPhraseListsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListPrebuiltsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListPrebuiltsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListPrebuiltsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListPrebuiltsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListVersionsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListVersionsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListVersionsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ListVersionsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/LuisApp.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/LuisApp.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/LuisApp.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/LuisApp.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ModelCreateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ModelCreateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ModelCreateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ModelCreateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ModelInfo.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ModelInfo.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ModelInfo.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ModelInfo.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ModelInfoResponse.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ModelInfoResponse.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ModelInfoResponse.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ModelInfoResponse.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ModelTrainingDetails.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ModelTrainingDetails.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ModelTrainingDetails.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ModelTrainingDetails.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ModelTrainingInfo.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ModelTrainingInfo.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ModelTrainingInfo.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ModelTrainingInfo.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ModelUpdateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ModelUpdateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ModelUpdateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ModelUpdateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/OperationError.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/OperationError.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/OperationError.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/OperationError.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/OperationStatus.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/OperationStatus.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/OperationStatus.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/OperationStatus.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/OperationStatusType.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/OperationStatusType.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/OperationStatusType.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/OperationStatusType.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatchClosedListOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatchClosedListOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatchClosedListOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatchClosedListOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternAny.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternAny.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternAny.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternAny.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternAnyEntityExtractor.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternAnyEntityExtractor.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternAnyEntityExtractor.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternAnyEntityExtractor.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternAnyModelCreateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternAnyModelCreateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternAnyModelCreateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternAnyModelCreateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternAnyModelUpdateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternAnyModelUpdateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternAnyModelUpdateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternAnyModelUpdateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternCreateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternCreateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternCreateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternCreateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternFeatureInfo.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternFeatureInfo.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternFeatureInfo.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternFeatureInfo.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternRule.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternRule.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternRule.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternRule.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternRuleCreateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternRuleCreateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternRuleCreateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternRuleCreateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternRuleInfo.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternRuleInfo.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternRuleInfo.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternRuleInfo.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternRuleUpdateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternRuleUpdateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternRuleUpdateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternRuleUpdateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternUpdateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternUpdateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternUpdateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PatternUpdateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PersonalAssistantsResponse.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PersonalAssistantsResponse.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PersonalAssistantsResponse.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PersonalAssistantsResponse.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PhraseListFeatureInfo.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PhraseListFeatureInfo.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PhraseListFeatureInfo.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PhraseListFeatureInfo.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PhraselistCreateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PhraselistCreateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PhraselistCreateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PhraselistCreateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PhraselistUpdateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PhraselistUpdateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PhraselistUpdateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PhraselistUpdateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltDomain.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltDomain.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltDomain.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltDomain.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltDomainCreateBaseObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltDomainCreateBaseObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltDomainCreateBaseObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltDomainCreateBaseObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltDomainCreateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltDomainCreateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltDomainCreateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltDomainCreateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltDomainItem.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltDomainItem.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltDomainItem.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltDomainItem.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltDomainModelCreateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltDomainModelCreateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltDomainModelCreateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltDomainModelCreateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltDomainObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltDomainObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltDomainObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltDomainObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltEntity.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltEntity.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltEntity.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltEntity.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltEntityExtractor.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltEntityExtractor.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltEntityExtractor.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PrebuiltEntityExtractor.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ProductionOrStagingEndpointInfo.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ProductionOrStagingEndpointInfo.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ProductionOrStagingEndpointInfo.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/ProductionOrStagingEndpointInfo.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PublishSettingUpdateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PublishSettingUpdateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PublishSettingUpdateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PublishSettingUpdateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PublishSettings.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PublishSettings.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PublishSettings.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/PublishSettings.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/RegexEntity.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/RegexEntity.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/RegexEntity.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/RegexEntity.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/RegexEntityExtractor.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/RegexEntityExtractor.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/RegexEntityExtractor.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/RegexEntityExtractor.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/RegexModelCreateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/RegexModelCreateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/RegexModelCreateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/RegexModelCreateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/RegexModelUpdateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/RegexModelUpdateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/RegexModelUpdateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/RegexModelUpdateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/SubClosedList.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/SubClosedList.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/SubClosedList.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/SubClosedList.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/SubClosedListResponse.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/SubClosedListResponse.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/SubClosedListResponse.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/SubClosedListResponse.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/TaskUpdateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/TaskUpdateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/TaskUpdateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/TaskUpdateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/TrainingStatus.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/TrainingStatus.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/TrainingStatus.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/TrainingStatus.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateClosedListEntityRoleOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateClosedListEntityRoleOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateClosedListEntityRoleOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateClosedListEntityRoleOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateCompositeEntityRoleOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateCompositeEntityRoleOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateCompositeEntityRoleOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateCompositeEntityRoleOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateCustomPrebuiltEntityRoleOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateCustomPrebuiltEntityRoleOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateCustomPrebuiltEntityRoleOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateCustomPrebuiltEntityRoleOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateEntityOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateEntityOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateEntityOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateEntityOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateEntityRoleOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateEntityRoleOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateEntityRoleOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateEntityRoleOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateExplicitListItemOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateExplicitListItemOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateExplicitListItemOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateExplicitListItemOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateHierarchicalEntityChildOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateHierarchicalEntityChildOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateHierarchicalEntityChildOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateHierarchicalEntityChildOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateHierarchicalEntityRoleOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateHierarchicalEntityRoleOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateHierarchicalEntityRoleOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateHierarchicalEntityRoleOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateIntentOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateIntentOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateIntentOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateIntentOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdatePatternAnyEntityRoleOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdatePatternAnyEntityRoleOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdatePatternAnyEntityRoleOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdatePatternAnyEntityRoleOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdatePermissionsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdatePermissionsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdatePermissionsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdatePermissionsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdatePhraseListOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdatePhraseListOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdatePhraseListOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdatePhraseListOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdatePrebuiltEntityRoleOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdatePrebuiltEntityRoleOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdatePrebuiltEntityRoleOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdatePrebuiltEntityRoleOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateRegexEntityRoleOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateRegexEntityRoleOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateRegexEntityRoleOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateRegexEntityRoleOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateSettingsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateSettingsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateSettingsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateSettingsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateVersionsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateVersionsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateVersionsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UpdateVersionsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UserAccessList.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UserAccessList.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UserAccessList.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UserAccessList.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UserCollaborator.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UserCollaborator.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UserCollaborator.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/UserCollaborator.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/VersionInfo.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/VersionInfo.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/VersionInfo.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/VersionInfo.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/WordListBaseUpdateObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/WordListBaseUpdateObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/WordListBaseUpdateObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/WordListBaseUpdateObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/WordListObject.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/WordListObject.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/WordListObject.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/WordListObject.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/package-info.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/models/package-info.java
diff --git a/cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/package-info.java b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-authoring/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/authoring/package-info.java
diff --git a/cognitiveservices/data-plane/language/luis/runtime/pom.xml b/sdk/cognitiveservices/ms-azure-cs-luis-runtime/pom.xml
old mode 100755
new mode 100644
similarity index 98%
rename from cognitiveservices/data-plane/language/luis/runtime/pom.xml
rename to sdk/cognitiveservices/ms-azure-cs-luis-runtime/pom.xml
index e8beb81425867..5975fc3328ad7
--- a/cognitiveservices/data-plane/language/luis/runtime/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-luis-runtime/pom.xml
@@ -9,7 +9,7 @@
com.microsoft.azure.cognitiveservicesazure-cognitiveservices-parent1.0.2
- ../../../pom.xml
+ ../pom.xmlazure-cognitiveservices-luis-runtime1.0.2-beta
diff --git a/cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/EndpointAPI.java b/sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/EndpointAPI.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/EndpointAPI.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/EndpointAPI.java
diff --git a/cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/LuisRuntimeAPI.java b/sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/LuisRuntimeAPI.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/LuisRuntimeAPI.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/LuisRuntimeAPI.java
diff --git a/cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/LuisRuntimeManager.java b/sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/LuisRuntimeManager.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/LuisRuntimeManager.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/LuisRuntimeManager.java
diff --git a/cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/Predictions.java b/sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/Predictions.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/Predictions.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/Predictions.java
diff --git a/cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/implementation/LuisRuntimeAPIImpl.java b/sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/implementation/LuisRuntimeAPIImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/implementation/LuisRuntimeAPIImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/implementation/LuisRuntimeAPIImpl.java
diff --git a/cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/implementation/PredictionsImpl.java b/sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/implementation/PredictionsImpl.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/implementation/PredictionsImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/implementation/PredictionsImpl.java
diff --git a/cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/implementation/package-info.java b/sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/implementation/package-info.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/implementation/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/implementation/package-info.java
diff --git a/cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/APIError.java b/sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/APIError.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/APIError.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/APIError.java
diff --git a/cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/APIErrorException.java b/sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/APIErrorException.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/APIErrorException.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/APIErrorException.java
diff --git a/cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/AzureRegions.java b/sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/AzureRegions.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/AzureRegions.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/AzureRegions.java
diff --git a/cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/CompositeChildModel.java b/sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/CompositeChildModel.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/CompositeChildModel.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/CompositeChildModel.java
diff --git a/cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/CompositeEntityModel.java b/sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/CompositeEntityModel.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/CompositeEntityModel.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/CompositeEntityModel.java
diff --git a/cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/EntityModel.java b/sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/EntityModel.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/EntityModel.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/EntityModel.java
diff --git a/cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/EntityWithResolution.java b/sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/EntityWithResolution.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/EntityWithResolution.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/EntityWithResolution.java
diff --git a/cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/EntityWithScore.java b/sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/EntityWithScore.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/EntityWithScore.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/EntityWithScore.java
diff --git a/cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/IntentModel.java b/sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/IntentModel.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/IntentModel.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/IntentModel.java
diff --git a/cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/LuisResult.java b/sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/LuisResult.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/LuisResult.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/LuisResult.java
diff --git a/cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/ResolveOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/ResolveOptionalParameter.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/ResolveOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/ResolveOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/Sentiment.java b/sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/Sentiment.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/Sentiment.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/Sentiment.java
diff --git a/cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/package-info.java b/sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/package-info.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/models/package-info.java
diff --git a/cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/package-info.java b/sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/package-info.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/luis/runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-luis-runtime/src/main/java/com/microsoft/azure/cognitiveservices/language/luis/runtime/package-info.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/pom.xml b/sdk/cognitiveservices/ms-azure-cs-newssearch/pom.xml
similarity index 98%
rename from cognitiveservices/data-plane/search/bingnewssearch/pom.xml
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/pom.xml
index 97d457b0420a1..e876be271200c 100644
--- a/cognitiveservices/data-plane/search/bingnewssearch/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-newssearch/pom.xml
@@ -9,7 +9,7 @@
com.microsoft.azure.cognitiveservicesazure-cognitiveservices-parent1.0.2
- ../../pom.xml
+ ../pom.xmlazure-cognitiveservices-newssearch1.0.2
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/BingNews.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/BingNews.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/BingNews.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/BingNews.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/BingNewsSearchAPI.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/BingNewsSearchAPI.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/BingNewsSearchAPI.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/BingNewsSearchAPI.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/BingNewsSearchManager.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/BingNewsSearchManager.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/BingNewsSearchManager.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/BingNewsSearchManager.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/implementation/BingNewsImpl.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/implementation/BingNewsImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/implementation/BingNewsImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/implementation/BingNewsImpl.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/implementation/BingNewsSearchAPIImpl.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/implementation/BingNewsSearchAPIImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/implementation/BingNewsSearchAPIImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/implementation/BingNewsSearchAPIImpl.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/implementation/package-info.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/implementation/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/implementation/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/implementation/package-info.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Answer.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Answer.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Answer.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Answer.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Article.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Article.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Article.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Article.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/CategoryOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/CategoryOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/CategoryOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/CategoryOptionalParameter.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/CreativeWork.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/CreativeWork.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/CreativeWork.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/CreativeWork.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Error.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Error.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Error.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Error.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/ErrorCode.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/ErrorCode.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/ErrorCode.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/ErrorCode.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/ErrorResponse.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/ErrorResponse.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/ErrorResponse.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/ErrorResponse.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/ErrorResponseException.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/ErrorResponseException.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/ErrorResponseException.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/ErrorResponseException.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/ErrorSubCode.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/ErrorSubCode.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/ErrorSubCode.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/ErrorSubCode.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Freshness.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Freshness.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Freshness.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Freshness.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Identifiable.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Identifiable.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Identifiable.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Identifiable.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/ImageObject.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/ImageObject.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/ImageObject.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/ImageObject.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/MediaObject.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/MediaObject.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/MediaObject.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/MediaObject.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/NewsArticle.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/NewsArticle.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/NewsArticle.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/NewsArticle.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/NewsModel.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/NewsModel.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/NewsModel.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/NewsModel.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/NewsTopic.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/NewsTopic.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/NewsTopic.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/NewsTopic.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Organization.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Organization.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Organization.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Organization.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Query.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Query.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Query.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Query.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Response.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Response.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Response.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Response.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/ResponseBase.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/ResponseBase.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/ResponseBase.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/ResponseBase.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/SafeSearch.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/SafeSearch.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/SafeSearch.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/SafeSearch.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/SearchOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/SearchOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/SearchOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/SearchOptionalParameter.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/SearchResultsAnswer.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/SearchResultsAnswer.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/SearchResultsAnswer.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/SearchResultsAnswer.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/TextFormat.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/TextFormat.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/TextFormat.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/TextFormat.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Thing.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Thing.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Thing.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/Thing.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/TrendingOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/TrendingOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/TrendingOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/TrendingOptionalParameter.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/TrendingTopics.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/TrendingTopics.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/TrendingTopics.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/TrendingTopics.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/VideoObject.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/VideoObject.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/VideoObject.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/VideoObject.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/package-info.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/models/package-info.java
diff --git a/cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/package-info.java b/sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingnewssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-newssearch/src/main/java/com/microsoft/azure/cognitiveservices/search/newssearch/package-info.java
diff --git a/cognitiveservices/data-plane/language/bingspellcheck/pom.xml b/sdk/cognitiveservices/ms-azure-cs-spellcheck/pom.xml
old mode 100755
new mode 100644
similarity index 98%
rename from cognitiveservices/data-plane/language/bingspellcheck/pom.xml
rename to sdk/cognitiveservices/ms-azure-cs-spellcheck/pom.xml
index a175bc04e384f..3d2478a24caee
--- a/cognitiveservices/data-plane/language/bingspellcheck/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-spellcheck/pom.xml
@@ -9,7 +9,7 @@
com.microsoft.azure.cognitiveservicesazure-cognitiveservices-parent1.0.2
- ../../pom.xml
+ ../pom.xml1.0.2azure-cognitiveservices-spellcheck
diff --git a/cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/BingSpellCheckAPI.java b/sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/BingSpellCheckAPI.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/BingSpellCheckAPI.java
rename to sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/BingSpellCheckAPI.java
diff --git a/cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/BingSpellCheckManager.java b/sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/BingSpellCheckManager.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/BingSpellCheckManager.java
rename to sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/BingSpellCheckManager.java
diff --git a/cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/BingSpellCheckOperations.java b/sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/BingSpellCheckOperations.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/BingSpellCheckOperations.java
rename to sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/BingSpellCheckOperations.java
diff --git a/cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/implementation/BingSpellCheckAPIImpl.java b/sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/implementation/BingSpellCheckAPIImpl.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/implementation/BingSpellCheckAPIImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/implementation/BingSpellCheckAPIImpl.java
diff --git a/cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/implementation/BingSpellCheckOperationsImpl.java b/sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/implementation/BingSpellCheckOperationsImpl.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/implementation/BingSpellCheckOperationsImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/implementation/BingSpellCheckOperationsImpl.java
diff --git a/cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/implementation/package-info.java b/sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/implementation/package-info.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/implementation/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/implementation/package-info.java
diff --git a/cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ActionType.java b/sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ActionType.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ActionType.java
rename to sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ActionType.java
diff --git a/cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/Answer.java b/sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/Answer.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/Answer.java
rename to sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/Answer.java
diff --git a/cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/Error.java b/sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/Error.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/Error.java
rename to sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/Error.java
diff --git a/cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ErrorCode.java b/sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ErrorCode.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ErrorCode.java
rename to sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ErrorCode.java
diff --git a/cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ErrorResponse.java b/sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ErrorResponse.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ErrorResponse.java
rename to sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ErrorResponse.java
diff --git a/cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ErrorResponseException.java b/sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ErrorResponseException.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ErrorResponseException.java
rename to sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ErrorResponseException.java
diff --git a/cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ErrorSubCode.java b/sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ErrorSubCode.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ErrorSubCode.java
rename to sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ErrorSubCode.java
diff --git a/cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ErrorType.java b/sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ErrorType.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ErrorType.java
rename to sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ErrorType.java
diff --git a/cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/Identifiable.java b/sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/Identifiable.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/Identifiable.java
rename to sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/Identifiable.java
diff --git a/cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/Response.java b/sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/Response.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/Response.java
rename to sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/Response.java
diff --git a/cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ResponseBase.java b/sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ResponseBase.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ResponseBase.java
rename to sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/ResponseBase.java
diff --git a/cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/SpellCheck.java b/sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/SpellCheck.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/SpellCheck.java
rename to sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/SpellCheck.java
diff --git a/cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/SpellCheckerOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/SpellCheckerOptionalParameter.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/SpellCheckerOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/SpellCheckerOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/SpellingFlaggedToken.java b/sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/SpellingFlaggedToken.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/SpellingFlaggedToken.java
rename to sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/SpellingFlaggedToken.java
diff --git a/cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/SpellingTokenSuggestion.java b/sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/SpellingTokenSuggestion.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/SpellingTokenSuggestion.java
rename to sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/SpellingTokenSuggestion.java
diff --git a/cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/package-info.java b/sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/package-info.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/models/package-info.java
diff --git a/cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/package-info.java b/sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/package-info.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/bingspellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-spellcheck/src/main/java/com/microsoft/azure/cognitiveservices/language/spellcheck/package-info.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/pom.xml b/sdk/cognitiveservices/ms-azure-cs-textanalytics/pom.xml
old mode 100755
new mode 100644
similarity index 98%
rename from cognitiveservices/data-plane/language/textanalytics/pom.xml
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/pom.xml
index 3f19296b15696..ed884313899dc
--- a/cognitiveservices/data-plane/language/textanalytics/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-textanalytics/pom.xml
@@ -11,7 +11,7 @@
com.microsoft.azure.cognitiveservicesazure-cognitiveservices-parent1.0.2
- ../../pom.xml
+ ../pom.xmlazure-cognitiveservices-textanalytics1.0.2-beta
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/TextAnalytics.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/TextAnalytics.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/TextAnalytics.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/TextAnalytics.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/TextAnalyticsAPI.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/TextAnalyticsAPI.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/TextAnalyticsAPI.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/TextAnalyticsAPI.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/TextAnalyticsManager.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/TextAnalyticsManager.java
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/TextAnalyticsManager.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/TextAnalyticsManager.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/implementation/TextAnalyticsAPIImpl.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/implementation/TextAnalyticsAPIImpl.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/implementation/TextAnalyticsAPIImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/implementation/TextAnalyticsAPIImpl.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/implementation/TextAnalyticsImpl.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/implementation/TextAnalyticsImpl.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/implementation/TextAnalyticsImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/implementation/TextAnalyticsImpl.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/implementation/package-info.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/implementation/package-info.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/implementation/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/implementation/package-info.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/AzureRegions.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/AzureRegions.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/AzureRegions.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/AzureRegions.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/BatchInput.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/BatchInput.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/BatchInput.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/BatchInput.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/DetectLanguageOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/DetectLanguageOptionalParameter.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/DetectLanguageOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/DetectLanguageOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/DetectedLanguage.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/DetectedLanguage.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/DetectedLanguage.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/DetectedLanguage.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/EntitiesBatchResult.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/EntitiesBatchResult.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/EntitiesBatchResult.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/EntitiesBatchResult.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/EntitiesBatchResultItem.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/EntitiesBatchResultItem.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/EntitiesBatchResultItem.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/EntitiesBatchResultItem.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/EntitiesOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/EntitiesOptionalParameter.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/EntitiesOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/EntitiesOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/EntityRecord.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/EntityRecord.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/EntityRecord.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/EntityRecord.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/ErrorRecord.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/ErrorRecord.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/ErrorRecord.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/ErrorRecord.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/ErrorResponse.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/ErrorResponse.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/ErrorResponse.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/ErrorResponse.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/ErrorResponseException.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/ErrorResponseException.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/ErrorResponseException.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/ErrorResponseException.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/Input.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/Input.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/Input.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/Input.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/InternalError.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/InternalError.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/InternalError.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/InternalError.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/KeyPhraseBatchResult.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/KeyPhraseBatchResult.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/KeyPhraseBatchResult.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/KeyPhraseBatchResult.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/KeyPhraseBatchResultItem.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/KeyPhraseBatchResultItem.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/KeyPhraseBatchResultItem.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/KeyPhraseBatchResultItem.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/KeyPhrasesOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/KeyPhrasesOptionalParameter.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/KeyPhrasesOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/KeyPhrasesOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/LanguageBatchResult.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/LanguageBatchResult.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/LanguageBatchResult.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/LanguageBatchResult.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/LanguageBatchResultItem.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/LanguageBatchResultItem.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/LanguageBatchResultItem.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/LanguageBatchResultItem.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/MatchRecord.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/MatchRecord.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/MatchRecord.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/MatchRecord.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/MultiLanguageBatchInput.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/MultiLanguageBatchInput.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/MultiLanguageBatchInput.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/MultiLanguageBatchInput.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/MultiLanguageInput.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/MultiLanguageInput.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/MultiLanguageInput.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/MultiLanguageInput.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/SentimentBatchResult.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/SentimentBatchResult.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/SentimentBatchResult.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/SentimentBatchResult.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/SentimentBatchResultItem.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/SentimentBatchResultItem.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/SentimentBatchResultItem.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/SentimentBatchResultItem.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/SentimentOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/SentimentOptionalParameter.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/SentimentOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/SentimentOptionalParameter.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/package-info.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/package-info.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/models/package-info.java
diff --git a/cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/package-info.java b/sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/package-info.java
old mode 100755
new mode 100644
similarity index 100%
rename from cognitiveservices/data-plane/language/textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-textanalytics/src/main/java/com/microsoft/azure/cognitiveservices/language/textanalytics/package-info.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/pom.xml b/sdk/cognitiveservices/ms-azure-cs-videosearch/pom.xml
similarity index 98%
rename from cognitiveservices/data-plane/search/bingvideosearch/pom.xml
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/pom.xml
index 149edcf09ea97..665291eabc7f1 100644
--- a/cognitiveservices/data-plane/search/bingvideosearch/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-videosearch/pom.xml
@@ -9,7 +9,7 @@
com.microsoft.azure.cognitiveservicesazure-cognitiveservices-parent1.0.2
- ../../pom.xml
+ ../pom.xmlazure-cognitiveservices-videosearch1.0.2
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/BingVideoSearchAPI.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/BingVideoSearchAPI.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/BingVideoSearchAPI.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/BingVideoSearchAPI.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/BingVideoSearchManager.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/BingVideoSearchManager.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/BingVideoSearchManager.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/BingVideoSearchManager.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/BingVideos.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/BingVideos.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/BingVideos.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/BingVideos.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/implementation/BingVideoSearchAPIImpl.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/implementation/BingVideoSearchAPIImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/implementation/BingVideoSearchAPIImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/implementation/BingVideoSearchAPIImpl.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/implementation/BingVideosImpl.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/implementation/BingVideosImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/implementation/BingVideosImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/implementation/BingVideosImpl.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/implementation/package-info.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/implementation/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/implementation/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/implementation/package-info.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Answer.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Answer.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Answer.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Answer.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/CreativeWork.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/CreativeWork.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/CreativeWork.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/CreativeWork.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/DetailsOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/DetailsOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/DetailsOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/DetailsOptionalParameter.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Error.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Error.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Error.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Error.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/ErrorCode.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/ErrorCode.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/ErrorCode.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/ErrorCode.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/ErrorResponse.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/ErrorResponse.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/ErrorResponse.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/ErrorResponse.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/ErrorResponseException.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/ErrorResponseException.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/ErrorResponseException.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/ErrorResponseException.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/ErrorSubCode.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/ErrorSubCode.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/ErrorSubCode.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/ErrorSubCode.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Freshness.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Freshness.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Freshness.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Freshness.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Identifiable.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Identifiable.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Identifiable.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Identifiable.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/ImageObject.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/ImageObject.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/ImageObject.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/ImageObject.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/MediaObject.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/MediaObject.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/MediaObject.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/MediaObject.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/PivotSuggestions.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/PivotSuggestions.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/PivotSuggestions.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/PivotSuggestions.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Query.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Query.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Query.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Query.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/QueryContext.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/QueryContext.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/QueryContext.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/QueryContext.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Response.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Response.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Response.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Response.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/ResponseBase.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/ResponseBase.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/ResponseBase.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/ResponseBase.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/SafeSearch.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/SafeSearch.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/SafeSearch.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/SafeSearch.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/SearchOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/SearchOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/SearchOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/SearchOptionalParameter.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/SearchResultsAnswer.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/SearchResultsAnswer.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/SearchResultsAnswer.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/SearchResultsAnswer.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/TextFormat.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/TextFormat.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/TextFormat.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/TextFormat.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Thing.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Thing.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Thing.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/Thing.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/TrendingOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/TrendingOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/TrendingOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/TrendingOptionalParameter.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/TrendingVideos.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/TrendingVideos.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/TrendingVideos.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/TrendingVideos.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/TrendingVideosCategory.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/TrendingVideosCategory.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/TrendingVideosCategory.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/TrendingVideosCategory.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/TrendingVideosSubcategory.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/TrendingVideosSubcategory.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/TrendingVideosSubcategory.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/TrendingVideosSubcategory.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/TrendingVideosTile.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/TrendingVideosTile.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/TrendingVideosTile.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/TrendingVideosTile.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoDetails.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoDetails.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoDetails.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoDetails.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoInsightModule.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoInsightModule.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoInsightModule.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoInsightModule.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoLength.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoLength.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoLength.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoLength.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoObject.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoObject.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoObject.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoObject.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoPricing.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoPricing.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoPricing.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoPricing.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoQueryScenario.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoQueryScenario.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoQueryScenario.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoQueryScenario.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoResolution.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoResolution.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoResolution.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideoResolution.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideosModel.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideosModel.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideosModel.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideosModel.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideosModule.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideosModule.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideosModule.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/VideosModule.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/package-info.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/models/package-info.java
diff --git a/cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/package-info.java b/sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvideosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-videosearch/src/main/java/com/microsoft/azure/cognitiveservices/search/videosearch/package-info.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/pom.xml b/sdk/cognitiveservices/ms-azure-cs-visualsearch/pom.xml
similarity index 98%
rename from cognitiveservices/data-plane/search/bingvisualsearch/pom.xml
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/pom.xml
index bf6ba0b59e493..1ba947143e7ab 100644
--- a/cognitiveservices/data-plane/search/bingvisualsearch/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-visualsearch/pom.xml
@@ -9,7 +9,7 @@
com.microsoft.azure.cognitiveservicesazure-cognitiveservices-parent1.0.2
- ../../pom.xml
+ ../pom.xmlazure-cognitiveservices-visualsearch1.0.2-beta
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/BingImages.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/BingImages.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/BingImages.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/BingImages.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/BingVisualSearchAPI.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/BingVisualSearchAPI.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/BingVisualSearchAPI.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/BingVisualSearchAPI.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/BingVisualSearchManager.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/BingVisualSearchManager.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/BingVisualSearchManager.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/BingVisualSearchManager.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/implementation/BingImagesImpl.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/implementation/BingImagesImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/implementation/BingImagesImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/implementation/BingImagesImpl.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/implementation/BingVisualSearchAPIImpl.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/implementation/BingVisualSearchAPIImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/implementation/BingVisualSearchAPIImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/implementation/BingVisualSearchAPIImpl.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/implementation/package-info.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/implementation/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/implementation/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/implementation/package-info.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Action.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Action.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Action.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Action.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/AggregateOffer.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/AggregateOffer.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/AggregateOffer.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/AggregateOffer.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/AggregateRating.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/AggregateRating.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/AggregateRating.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/AggregateRating.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/CreativeWork.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/CreativeWork.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/CreativeWork.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/CreativeWork.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/CropArea.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/CropArea.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/CropArea.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/CropArea.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Currency.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Currency.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Currency.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Currency.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Error.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Error.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Error.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Error.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ErrorCode.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ErrorCode.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ErrorCode.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ErrorCode.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ErrorResponse.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ErrorResponse.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ErrorResponse.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ErrorResponse.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ErrorResponseException.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ErrorResponseException.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ErrorResponseException.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ErrorResponseException.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ErrorSubCode.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ErrorSubCode.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ErrorSubCode.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ErrorSubCode.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Filters.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Filters.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Filters.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Filters.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Identifiable.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Identifiable.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Identifiable.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Identifiable.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageAction.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageAction.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageAction.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageAction.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageEntityAction.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageEntityAction.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageEntityAction.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageEntityAction.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageInfo.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageInfo.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageInfo.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageInfo.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageKnowledge.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageKnowledge.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageKnowledge.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageKnowledge.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageModuleAction.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageModuleAction.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageModuleAction.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageModuleAction.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageObject.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageObject.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageObject.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageObject.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageRecipesAction.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageRecipesAction.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageRecipesAction.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageRecipesAction.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageRelatedSearchesAction.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageRelatedSearchesAction.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageRelatedSearchesAction.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageRelatedSearchesAction.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageShoppingSourcesAction.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageShoppingSourcesAction.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageShoppingSourcesAction.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageShoppingSourcesAction.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageTag.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageTag.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageTag.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageTag.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageTagRegion.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageTagRegion.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageTagRegion.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImageTagRegion.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImagesImageMetadata.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImagesImageMetadata.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImagesImageMetadata.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImagesImageMetadata.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImagesModule.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImagesModule.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImagesModule.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ImagesModule.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Intangible.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Intangible.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Intangible.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Intangible.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ItemAvailability.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ItemAvailability.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ItemAvailability.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ItemAvailability.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/KnowledgeRequest.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/KnowledgeRequest.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/KnowledgeRequest.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/KnowledgeRequest.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/MediaObject.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/MediaObject.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/MediaObject.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/MediaObject.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/NormalizedQuadrilateral.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/NormalizedQuadrilateral.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/NormalizedQuadrilateral.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/NormalizedQuadrilateral.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Offer.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Offer.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Offer.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Offer.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Organization.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Organization.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Organization.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Organization.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Person.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Person.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Person.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Person.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Point2D.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Point2D.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Point2D.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Point2D.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/PropertiesItem.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/PropertiesItem.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/PropertiesItem.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/PropertiesItem.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Query.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Query.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Query.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Query.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Rating.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Rating.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Rating.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Rating.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Recipe.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Recipe.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Recipe.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Recipe.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/RecipesModule.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/RecipesModule.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/RecipesModule.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/RecipesModule.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/RelatedSearchesModule.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/RelatedSearchesModule.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/RelatedSearchesModule.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/RelatedSearchesModule.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Response.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Response.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Response.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Response.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ResponseBase.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ResponseBase.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ResponseBase.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/ResponseBase.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/StructuredValue.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/StructuredValue.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/StructuredValue.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/StructuredValue.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Thing.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Thing.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Thing.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/Thing.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/VisualSearchOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/VisualSearchOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/VisualSearchOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/VisualSearchOptionalParameter.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/VisualSearchRequest.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/VisualSearchRequest.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/VisualSearchRequest.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/VisualSearchRequest.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/package-info.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/models/package-info.java
diff --git a/cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/package-info.java b/sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingvisualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-visualsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/visualsearch/package-info.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/pom.xml b/sdk/cognitiveservices/ms-azure-cs-websearch/pom.xml
similarity index 98%
rename from cognitiveservices/data-plane/search/bingwebsearch/pom.xml
rename to sdk/cognitiveservices/ms-azure-cs-websearch/pom.xml
index 82b74ceb2e931..1fad4bab508b9 100644
--- a/cognitiveservices/data-plane/search/bingwebsearch/pom.xml
+++ b/sdk/cognitiveservices/ms-azure-cs-websearch/pom.xml
@@ -9,7 +9,7 @@
com.microsoft.azure.cognitiveservicesazure-cognitiveservices-parent1.0.2
- ../../pom.xml
+ ../pom.xmlazure-cognitiveservices-websearch1.0.2
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/BingWebSearch.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/BingWebSearch.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/BingWebSearch.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/BingWebSearch.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/BingWebSearchAPI.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/BingWebSearchAPI.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/BingWebSearchAPI.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/BingWebSearchAPI.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/BingWebSearchManager.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/BingWebSearchManager.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/BingWebSearchManager.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/BingWebSearchManager.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/implementation/BingWebSearchAPIImpl.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/implementation/BingWebSearchAPIImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/implementation/BingWebSearchAPIImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/implementation/BingWebSearchAPIImpl.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/implementation/BingWebSearchImpl.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/implementation/BingWebSearchImpl.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/implementation/BingWebSearchImpl.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/implementation/BingWebSearchImpl.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/implementation/package-info.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/implementation/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/implementation/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/implementation/package-info.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Answer.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Answer.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Answer.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Answer.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/AnswerType.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/AnswerType.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/AnswerType.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/AnswerType.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Article.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Article.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Article.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Article.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Computation.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Computation.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Computation.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Computation.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/CreativeWork.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/CreativeWork.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/CreativeWork.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/CreativeWork.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Error.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Error.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Error.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Error.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/ErrorCode.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/ErrorCode.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/ErrorCode.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/ErrorCode.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/ErrorResponse.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/ErrorResponse.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/ErrorResponse.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/ErrorResponse.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/ErrorResponseException.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/ErrorResponseException.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/ErrorResponseException.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/ErrorResponseException.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/ErrorSubCode.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/ErrorSubCode.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/ErrorSubCode.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/ErrorSubCode.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Freshness.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Freshness.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Freshness.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Freshness.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Identifiable.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Identifiable.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Identifiable.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Identifiable.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/ImageObject.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/ImageObject.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/ImageObject.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/ImageObject.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Images.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Images.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Images.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Images.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Intangible.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Intangible.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Intangible.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Intangible.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/MediaObject.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/MediaObject.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/MediaObject.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/MediaObject.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/News.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/News.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/News.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/News.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/NewsArticle.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/NewsArticle.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/NewsArticle.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/NewsArticle.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Places.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Places.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Places.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Places.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Query.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Query.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Query.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Query.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/QueryContext.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/QueryContext.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/QueryContext.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/QueryContext.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/RankingRankingGroup.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/RankingRankingGroup.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/RankingRankingGroup.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/RankingRankingGroup.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/RankingRankingItem.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/RankingRankingItem.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/RankingRankingItem.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/RankingRankingItem.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/RankingRankingResponse.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/RankingRankingResponse.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/RankingRankingResponse.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/RankingRankingResponse.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/RelatedSearchesRelatedSearchAnswer.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/RelatedSearchesRelatedSearchAnswer.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/RelatedSearchesRelatedSearchAnswer.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/RelatedSearchesRelatedSearchAnswer.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Response.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Response.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Response.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Response.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/ResponseBase.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/ResponseBase.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/ResponseBase.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/ResponseBase.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/SafeSearch.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/SafeSearch.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/SafeSearch.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/SafeSearch.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/SearchOptionalParameter.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/SearchOptionalParameter.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/SearchOptionalParameter.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/SearchOptionalParameter.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/SearchResponse.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/SearchResponse.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/SearchResponse.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/SearchResponse.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/SearchResultsAnswer.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/SearchResultsAnswer.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/SearchResultsAnswer.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/SearchResultsAnswer.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/SpellSuggestions.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/SpellSuggestions.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/SpellSuggestions.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/SpellSuggestions.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/StructuredValue.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/StructuredValue.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/StructuredValue.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/StructuredValue.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/TextFormat.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/TextFormat.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/TextFormat.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/TextFormat.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Thing.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Thing.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Thing.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Thing.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/TimeZone.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/TimeZone.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/TimeZone.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/TimeZone.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/TimeZoneTimeZoneInformation.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/TimeZoneTimeZoneInformation.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/TimeZoneTimeZoneInformation.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/TimeZoneTimeZoneInformation.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/VideoObject.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/VideoObject.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/VideoObject.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/VideoObject.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Videos.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Videos.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Videos.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/Videos.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/WebMetaTag.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/WebMetaTag.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/WebMetaTag.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/WebMetaTag.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/WebPage.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/WebPage.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/WebPage.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/WebPage.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/WebWebAnswer.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/WebWebAnswer.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/WebWebAnswer.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/WebWebAnswer.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/WebWebGrouping.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/WebWebGrouping.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/WebWebGrouping.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/WebWebGrouping.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/package-info.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/models/package-info.java
diff --git a/cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/package-info.java b/sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/package-info.java
similarity index 100%
rename from cognitiveservices/data-plane/search/bingwebsearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/package-info.java
rename to sdk/cognitiveservices/ms-azure-cs-websearch/src/main/java/com/microsoft/azure/cognitiveservices/search/websearch/package-info.java
diff --git a/sdk/cognitiveservices/pom.service.xml b/sdk/cognitiveservices/pom.service.xml
index b05ef1bce0107..a65c5aa0bb467 100644
--- a/sdk/cognitiveservices/pom.service.xml
+++ b/sdk/cognitiveservices/pom.service.xml
@@ -9,6 +9,23 @@
pom1.0.0
-
+ ms-azure-cs-spellcheck
+ ms-azure-cs-textanalytics
+ ms-azure-cs-luis-runtime
+ ms-azure-cs-luis-authoring
+ ms-azure-cs-autosuggest
+ ms-azure-cs-customimagesearch
+ ms-azure-cs-customsearch
+ ms-azure-cs-entitysearch
+ ms-azure-cs-imagesearch
+ ms-azure-cs-newssearch
+ ms-azure-cs-videosearch
+ ms-azure-cs-visualsearch
+ ms-azure-cs-websearch
+ ms-azure-cs-computervision
+ ms-azure-cs-contentmoderator
+ ms-azure-cs-customvision-prediction
+ ms-azure-cs-customvision-training
+ ms-azure-cs-faceapi
diff --git a/cognitiveservices/data-plane/pom.xml b/sdk/cognitiveservices/pom.xml
old mode 100755
new mode 100644
similarity index 92%
rename from cognitiveservices/data-plane/pom.xml
rename to sdk/cognitiveservices/pom.xml
index 2e2e36b91d2c9..b563ba399f475
--- a/cognitiveservices/data-plane/pom.xml
+++ b/sdk/cognitiveservices/pom.xml
@@ -296,23 +296,23 @@
- ./language/bingspellcheck
- ./language/luis/authoring
- ./language/luis/runtime
- ./language/textanalytics
- ./search/bingautosuggest
- ./search/bingcustomimagesearch
- ./search/bingcustomsearch
- ./search/bingentitysearch
- ./search/bingimagesearch
- ./search/bingnewssearch
- ./search/bingvideosearch
- ./search/bingvisualsearch
- ./search/bingwebsearch
- ./vision/computervision
- ./vision/contentmoderator
- ./vision/customvision/prediction
- ./vision/customvision/training
- ./vision/faceapi
+ ms-azure-cs-spellcheck
+ ms-azure-cs-luis-authoring
+ ms-azure-cs-luis-runtime
+ ms-azure-cs-textanalytics
+ ms-azure-cs-autosuggest
+ ms-azure-cs-customimagesearch
+ ms-azure-cs-customsearch
+ ms-azure-cs-entitysearch
+ ms-azure-cs-imagesearch
+ ms-azure-cs-newssearch
+ ms-azure-cs-videosearch
+ ms-azure-cs-visualsearch
+ ms-azure-cs-websearch
+ ms-azure-cs-computervision
+ ms-azure-cs-contentmoderator
+ ms-azure-cs-customvision-prediction
+ ms-azure-cs-customvision-training
+ ms-azure-cs-faceapi
\ No newline at end of file
diff --git a/core/.gitignore b/sdk/core/.gitignore
similarity index 100%
rename from core/.gitignore
rename to sdk/core/.gitignore
diff --git a/core/README.md b/sdk/core/README.md
similarity index 100%
rename from core/README.md
rename to sdk/core/README.md
diff --git a/core/azure-core-amqp/README.md b/sdk/core/azure-core-amqp/README.md
similarity index 100%
rename from core/azure-core-amqp/README.md
rename to sdk/core/azure-core-amqp/README.md
diff --git a/core/azure-core-amqp/pom.xml b/sdk/core/azure-core-amqp/pom.xml
similarity index 100%
rename from core/azure-core-amqp/pom.xml
rename to sdk/core/azure-core-amqp/pom.xml
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpConnection.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpConnection.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpConnection.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpConnection.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpEndpointState.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpEndpointState.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpEndpointState.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpEndpointState.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpExceptionHandler.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpExceptionHandler.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpExceptionHandler.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpExceptionHandler.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpLink.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpLink.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpLink.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpLink.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpSession.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpSession.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpSession.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpSession.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpShutdownSignal.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpShutdownSignal.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpShutdownSignal.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/AmqpShutdownSignal.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/CBSNode.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/CBSNode.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/CBSNode.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/CBSNode.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/EndpointStateNotifier.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/EndpointStateNotifier.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/EndpointStateNotifier.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/EndpointStateNotifier.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/ExponentialRetry.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/ExponentialRetry.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/ExponentialRetry.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/ExponentialRetry.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/MessageConstant.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/MessageConstant.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/MessageConstant.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/MessageConstant.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/Retry.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/Retry.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/Retry.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/Retry.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/TransportType.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/TransportType.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/TransportType.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/TransportType.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/AmqpException.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/AmqpException.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/AmqpException.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/AmqpException.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/AmqpResponseCode.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/AmqpResponseCode.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/AmqpResponseCode.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/AmqpResponseCode.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/ErrorCondition.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/ErrorCondition.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/ErrorCondition.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/ErrorCondition.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/ErrorContext.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/ErrorContext.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/ErrorContext.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/ErrorContext.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/ExceptionUtil.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/ExceptionUtil.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/ExceptionUtil.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/ExceptionUtil.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/LinkErrorContext.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/LinkErrorContext.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/LinkErrorContext.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/LinkErrorContext.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/OperationCancelledException.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/OperationCancelledException.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/OperationCancelledException.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/OperationCancelledException.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/SessionErrorContext.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/SessionErrorContext.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/SessionErrorContext.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/SessionErrorContext.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/package-info.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/package-info.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/package-info.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/exception/package-info.java
diff --git a/core/azure-core-amqp/src/main/java/com/azure/core/amqp/package-info.java b/sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/package-info.java
similarity index 100%
rename from core/azure-core-amqp/src/main/java/com/azure/core/amqp/package-info.java
rename to sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/package-info.java
diff --git a/core/azure-core-amqp/src/test/java/com/azure/core/amqp/AmqpShutdownSignalTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/AmqpShutdownSignalTest.java
similarity index 100%
rename from core/azure-core-amqp/src/test/java/com/azure/core/amqp/AmqpShutdownSignalTest.java
rename to sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/AmqpShutdownSignalTest.java
diff --git a/core/azure-core-amqp/src/test/java/com/azure/core/amqp/ExponentialRetryTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/ExponentialRetryTest.java
similarity index 100%
rename from core/azure-core-amqp/src/test/java/com/azure/core/amqp/ExponentialRetryTest.java
rename to sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/ExponentialRetryTest.java
diff --git a/core/azure-core-amqp/src/test/java/com/azure/core/amqp/MessageConstantTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/MessageConstantTest.java
similarity index 100%
rename from core/azure-core-amqp/src/test/java/com/azure/core/amqp/MessageConstantTest.java
rename to sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/MessageConstantTest.java
diff --git a/core/azure-core-amqp/src/test/java/com/azure/core/amqp/RetryTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/RetryTest.java
similarity index 100%
rename from core/azure-core-amqp/src/test/java/com/azure/core/amqp/RetryTest.java
rename to sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/RetryTest.java
diff --git a/core/azure-core-amqp/src/test/java/com/azure/core/amqp/TransportTypeTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/TransportTypeTest.java
similarity index 100%
rename from core/azure-core-amqp/src/test/java/com/azure/core/amqp/TransportTypeTest.java
rename to sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/TransportTypeTest.java
diff --git a/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/AmqpExceptionTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/AmqpExceptionTest.java
similarity index 100%
rename from core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/AmqpExceptionTest.java
rename to sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/AmqpExceptionTest.java
diff --git a/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/AmqpResponseCodeTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/AmqpResponseCodeTest.java
similarity index 100%
rename from core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/AmqpResponseCodeTest.java
rename to sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/AmqpResponseCodeTest.java
diff --git a/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/ErrorContextTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/ErrorContextTest.java
similarity index 100%
rename from core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/ErrorContextTest.java
rename to sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/ErrorContextTest.java
diff --git a/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/ExceptionUtilTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/ExceptionUtilTest.java
similarity index 100%
rename from core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/ExceptionUtilTest.java
rename to sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/ExceptionUtilTest.java
diff --git a/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/LinkErrorContextTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/LinkErrorContextTest.java
similarity index 100%
rename from core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/LinkErrorContextTest.java
rename to sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/LinkErrorContextTest.java
diff --git a/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/OperationCancelledExceptionTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/OperationCancelledExceptionTest.java
similarity index 100%
rename from core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/OperationCancelledExceptionTest.java
rename to sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/OperationCancelledExceptionTest.java
diff --git a/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/SessionErrorContextTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/SessionErrorContextTest.java
similarity index 100%
rename from core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/SessionErrorContextTest.java
rename to sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/exception/SessionErrorContextTest.java
diff --git a/core/azure-core-management/pom.xml b/sdk/core/azure-core-management/pom.xml
similarity index 100%
rename from core/azure-core-management/pom.xml
rename to sdk/core/azure-core-management/pom.xml
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/AsyncOperationResource.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/AsyncOperationResource.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/AsyncOperationResource.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/AsyncOperationResource.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/CloudError.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/CloudError.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/CloudError.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/CloudError.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/CloudException.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/CloudException.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/CloudException.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/CloudException.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/OperationState.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/OperationState.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/OperationState.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/OperationState.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/Page.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/Page.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/Page.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/Page.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/PagedList.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/PagedList.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/PagedList.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/PagedList.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/Resource.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/Resource.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/Resource.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/Resource.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/SubResource.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/SubResource.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/SubResource.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/SubResource.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/annotations/AzureHost.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/annotations/AzureHost.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/annotations/AzureHost.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/annotations/AzureHost.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/annotations/package-info.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/annotations/package-info.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/annotations/package-info.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/annotations/package-info.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/implementation/AzureAsyncOperationPollStrategy.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/AzureAsyncOperationPollStrategy.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/implementation/AzureAsyncOperationPollStrategy.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/AzureAsyncOperationPollStrategy.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/implementation/AzureProxy.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/AzureProxy.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/implementation/AzureProxy.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/AzureProxy.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/implementation/CompletedPollStrategy.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/CompletedPollStrategy.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/implementation/CompletedPollStrategy.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/CompletedPollStrategy.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/implementation/LocationPollStrategy.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/LocationPollStrategy.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/implementation/LocationPollStrategy.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/LocationPollStrategy.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/implementation/OperationStatus.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/OperationStatus.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/implementation/OperationStatus.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/OperationStatus.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/implementation/PollStrategy.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/PollStrategy.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/implementation/PollStrategy.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/PollStrategy.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/implementation/ProvisioningStatePollStrategy.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/ProvisioningStatePollStrategy.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/implementation/ProvisioningStatePollStrategy.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/ProvisioningStatePollStrategy.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/implementation/ResourceWithProvisioningState.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/ResourceWithProvisioningState.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/implementation/ResourceWithProvisioningState.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/implementation/ResourceWithProvisioningState.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/package-info.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/package-info.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/package-info.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/package-info.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/serializer/AzureJacksonAdapter.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/serializer/AzureJacksonAdapter.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/serializer/AzureJacksonAdapter.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/serializer/AzureJacksonAdapter.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/serializer/CloudErrorDeserializer.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/serializer/CloudErrorDeserializer.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/serializer/CloudErrorDeserializer.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/serializer/CloudErrorDeserializer.java
diff --git a/core/azure-core-management/src/main/java/com/azure/core/management/serializer/package-info.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/serializer/package-info.java
similarity index 100%
rename from core/azure-core-management/src/main/java/com/azure/core/management/serializer/package-info.java
rename to sdk/core/azure-core-management/src/main/java/com/azure/core/management/serializer/package-info.java
diff --git a/core/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyTests.java b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyTests.java
similarity index 100%
rename from core/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyTests.java
rename to sdk/core/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyTests.java
diff --git a/core/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyWithMockTests.java b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyWithMockTests.java
similarity index 100%
rename from core/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyWithMockTests.java
rename to sdk/core/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyWithMockTests.java
diff --git a/core/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyWithNettyTests.java b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyWithNettyTests.java
similarity index 100%
rename from core/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyWithNettyTests.java
rename to sdk/core/azure-core-management/src/test/java/com/azure/core/management/AzureProxyToRestProxyWithNettyTests.java
diff --git a/core/azure-core-management/src/test/java/com/azure/core/management/AzureTests.java b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/AzureTests.java
similarity index 100%
rename from core/azure-core-management/src/test/java/com/azure/core/management/AzureTests.java
rename to sdk/core/azure-core-management/src/test/java/com/azure/core/management/AzureTests.java
diff --git a/core/azure-core-management/src/test/java/com/azure/core/management/HttpBinJSON.java b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/HttpBinJSON.java
similarity index 100%
rename from core/azure-core-management/src/test/java/com/azure/core/management/HttpBinJSON.java
rename to sdk/core/azure-core-management/src/test/java/com/azure/core/management/HttpBinJSON.java
diff --git a/core/azure-core-management/src/test/java/com/azure/core/management/MockResource.java b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/MockResource.java
similarity index 100%
rename from core/azure-core-management/src/test/java/com/azure/core/management/MockResource.java
rename to sdk/core/azure-core-management/src/test/java/com/azure/core/management/MockResource.java
diff --git a/core/azure-core-management/src/test/java/com/azure/core/management/MyAzureException.java b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/MyAzureException.java
similarity index 100%
rename from core/azure-core-management/src/test/java/com/azure/core/management/MyAzureException.java
rename to sdk/core/azure-core-management/src/test/java/com/azure/core/management/MyAzureException.java
diff --git a/core/azure-core-management/src/test/java/com/azure/core/management/PagedListTests.java b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/PagedListTests.java
similarity index 100%
rename from core/azure-core-management/src/test/java/com/azure/core/management/PagedListTests.java
rename to sdk/core/azure-core-management/src/test/java/com/azure/core/management/PagedListTests.java
diff --git a/core/azure-core-management/src/test/java/com/azure/core/management/http/MockAzureHttpClient.java b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/http/MockAzureHttpClient.java
similarity index 100%
rename from core/azure-core-management/src/test/java/com/azure/core/management/http/MockAzureHttpClient.java
rename to sdk/core/azure-core-management/src/test/java/com/azure/core/management/http/MockAzureHttpClient.java
diff --git a/core/azure-core-management/src/test/java/com/azure/core/management/implementation/AzureProxyTests.java b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/implementation/AzureProxyTests.java
similarity index 100%
rename from core/azure-core-management/src/test/java/com/azure/core/management/implementation/AzureProxyTests.java
rename to sdk/core/azure-core-management/src/test/java/com/azure/core/management/implementation/AzureProxyTests.java
diff --git a/core/azure-core-management/src/test/java/com/azure/core/management/implementation/Value.java b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/implementation/Value.java
similarity index 100%
rename from core/azure-core-management/src/test/java/com/azure/core/management/implementation/Value.java
rename to sdk/core/azure-core-management/src/test/java/com/azure/core/management/implementation/Value.java
diff --git a/core/azure-core-management/src/test/java/com/azure/core/management/implementation/ValueTests.java b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/implementation/ValueTests.java
similarity index 100%
rename from core/azure-core-management/src/test/java/com/azure/core/management/implementation/ValueTests.java
rename to sdk/core/azure-core-management/src/test/java/com/azure/core/management/implementation/ValueTests.java
diff --git a/core/azure-core-test/README.md b/sdk/core/azure-core-test/README.md
similarity index 100%
rename from core/azure-core-test/README.md
rename to sdk/core/azure-core-test/README.md
diff --git a/core/azure-core-test/pom.xml b/sdk/core/azure-core-test/pom.xml
similarity index 100%
rename from core/azure-core-test/pom.xml
rename to sdk/core/azure-core-test/pom.xml
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/InterceptorManager.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/InterceptorManager.java
similarity index 100%
rename from core/azure-core-test/src/main/java/com/azure/core/test/InterceptorManager.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/InterceptorManager.java
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/TestBase.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/TestBase.java
similarity index 100%
rename from core/azure-core-test/src/main/java/com/azure/core/test/TestBase.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/TestBase.java
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/TestMode.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/TestMode.java
similarity index 100%
rename from core/azure-core-test/src/main/java/com/azure/core/test/TestMode.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/TestMode.java
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/http/MockHttpResponse.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/http/MockHttpResponse.java
similarity index 100%
rename from core/azure-core-test/src/main/java/com/azure/core/test/http/MockHttpResponse.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/http/MockHttpResponse.java
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/http/PlaybackClient.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/http/PlaybackClient.java
similarity index 100%
rename from core/azure-core-test/src/main/java/com/azure/core/test/http/PlaybackClient.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/http/PlaybackClient.java
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/http/package-info.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/http/package-info.java
similarity index 62%
rename from core/azure-core-test/src/main/java/com/azure/core/test/http/package-info.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/http/package-info.java
index eb3778c87cbc5..f98e81b7f4faa 100644
--- a/core/azure-core-test/src/main/java/com/azure/core/test/http/package-info.java
+++ b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/http/package-info.java
@@ -2,6 +2,6 @@
// Licensed under the MIT License.
/**
- * Package contains classes to test HTTP communications in Azure client libraries.
+ * Package containing classes to test HTTP communications in Azure client libraries.
*/
package com.azure.core.test.http;
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/models/NetworkCallRecord.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/models/NetworkCallRecord.java
similarity index 100%
rename from core/azure-core-test/src/main/java/com/azure/core/test/models/NetworkCallRecord.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/models/NetworkCallRecord.java
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/models/RecordedData.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/models/RecordedData.java
similarity index 100%
rename from core/azure-core-test/src/main/java/com/azure/core/test/models/RecordedData.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/models/RecordedData.java
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/models/package-info.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/models/package-info.java
similarity index 67%
rename from core/azure-core-test/src/main/java/com/azure/core/test/models/package-info.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/models/package-info.java
index b22156f6f6c01..060fb7b50dca9 100644
--- a/core/azure-core-test/src/main/java/com/azure/core/test/models/package-info.java
+++ b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/models/package-info.java
@@ -1,6 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
/**
- * Package contains models used to test Azure client libraries.
+ * Package containing models used to test Azure client libraries.
*/
package com.azure.core.test.models;
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/package-info.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/package-info.java
similarity index 65%
rename from core/azure-core-test/src/main/java/com/azure/core/test/package-info.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/package-info.java
index 82c5f9e75223e..1dd6f464254ff 100644
--- a/core/azure-core-test/src/main/java/com/azure/core/test/package-info.java
+++ b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/package-info.java
@@ -1,6 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
/**
- * Package contains common test classes for Azure client libraries.
+ * Package containing common test classes for Azure client libraries.
*/
package com.azure.core.test;
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/policy/RecordNetworkCallPolicy.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/policy/RecordNetworkCallPolicy.java
similarity index 100%
rename from core/azure-core-test/src/main/java/com/azure/core/test/policy/RecordNetworkCallPolicy.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/policy/RecordNetworkCallPolicy.java
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/policy/package-info.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/policy/package-info.java
similarity index 58%
rename from core/azure-core-test/src/main/java/com/azure/core/test/policy/package-info.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/policy/package-info.java
index 804d94478d955..28a5327ecbb69 100644
--- a/core/azure-core-test/src/main/java/com/azure/core/test/policy/package-info.java
+++ b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/policy/package-info.java
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
/**
- * Package contains {@link com.azure.core.http.policy.HttpPipelinePolicy HttpPipelinePolicies} used to test Azure
+ * Package containing {@link com.azure.core.http.policy.HttpPipelinePolicy HttpPipelinePolicies} used to test Azure
* client libraries.
*/
package com.azure.core.test.policy;
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/utils/ResourceNamer.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/utils/ResourceNamer.java
similarity index 100%
rename from core/azure-core-test/src/main/java/com/azure/core/test/utils/ResourceNamer.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/utils/ResourceNamer.java
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/utils/TestResourceNamer.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/utils/TestResourceNamer.java
similarity index 100%
rename from core/azure-core-test/src/main/java/com/azure/core/test/utils/TestResourceNamer.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/utils/TestResourceNamer.java
diff --git a/core/azure-core-test/src/main/java/com/azure/core/test/utils/package-info.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/utils/package-info.java
similarity index 63%
rename from core/azure-core-test/src/main/java/com/azure/core/test/utils/package-info.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/utils/package-info.java
index 8b13830f047fd..f6b311ed0d560 100644
--- a/core/azure-core-test/src/main/java/com/azure/core/test/utils/package-info.java
+++ b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/utils/package-info.java
@@ -1,6 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
/**
- * Package contains utility classes used for testing Azure client libraries.
+ * Package containing utility classes used for testing Azure client libraries.
*/
package com.azure.core.test.utils;
diff --git a/core/azure-core/README.md b/sdk/core/azure-core/README.md
similarity index 100%
rename from core/azure-core/README.md
rename to sdk/core/azure-core/README.md
diff --git a/core/azure-core/pom.xml b/sdk/core/azure-core/pom.xml
similarity index 100%
rename from core/azure-core/pom.xml
rename to sdk/core/azure-core/pom.xml
diff --git a/core/azure-core/src/main/java/com/azure/core/AzureEnvironment.java b/sdk/core/azure-core/src/main/java/com/azure/core/AzureEnvironment.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/AzureEnvironment.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/AzureEnvironment.java
diff --git a/core/azure-core/src/main/java/com/azure/core/credentials/AccessToken.java b/sdk/core/azure-core/src/main/java/com/azure/core/credentials/AccessToken.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/credentials/AccessToken.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/credentials/AccessToken.java
diff --git a/core/azure-core/src/main/java/com/azure/core/credentials/BasicAuthenticationCredential.java b/sdk/core/azure-core/src/main/java/com/azure/core/credentials/BasicAuthenticationCredential.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/credentials/BasicAuthenticationCredential.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/credentials/BasicAuthenticationCredential.java
diff --git a/core/azure-core/src/main/java/com/azure/core/credentials/SimpleTokenCache.java b/sdk/core/azure-core/src/main/java/com/azure/core/credentials/SimpleTokenCache.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/credentials/SimpleTokenCache.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/credentials/SimpleTokenCache.java
diff --git a/core/azure-core/src/main/java/com/azure/core/credentials/TokenCredential.java b/sdk/core/azure-core/src/main/java/com/azure/core/credentials/TokenCredential.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/credentials/TokenCredential.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/credentials/TokenCredential.java
diff --git a/core/azure-core/src/main/java/com/azure/core/credentials/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/credentials/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/credentials/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/credentials/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/exception/AzureException.java b/sdk/core/azure-core/src/main/java/com/azure/core/exception/AzureException.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/exception/AzureException.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/exception/AzureException.java
diff --git a/core/azure-core/src/main/java/com/azure/core/exception/ClientAuthenticationException.java b/sdk/core/azure-core/src/main/java/com/azure/core/exception/ClientAuthenticationException.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/exception/ClientAuthenticationException.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/exception/ClientAuthenticationException.java
diff --git a/core/azure-core/src/main/java/com/azure/core/exception/DecodeException.java b/sdk/core/azure-core/src/main/java/com/azure/core/exception/DecodeException.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/exception/DecodeException.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/exception/DecodeException.java
diff --git a/core/azure-core/src/main/java/com/azure/core/exception/HttpRequestException.java b/sdk/core/azure-core/src/main/java/com/azure/core/exception/HttpRequestException.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/exception/HttpRequestException.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/exception/HttpRequestException.java
diff --git a/core/azure-core/src/main/java/com/azure/core/exception/HttpResponseException.java b/sdk/core/azure-core/src/main/java/com/azure/core/exception/HttpResponseException.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/exception/HttpResponseException.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/exception/HttpResponseException.java
diff --git a/core/azure-core/src/main/java/com/azure/core/exception/ResourceExistsException.java b/sdk/core/azure-core/src/main/java/com/azure/core/exception/ResourceExistsException.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/exception/ResourceExistsException.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/exception/ResourceExistsException.java
diff --git a/core/azure-core/src/main/java/com/azure/core/exception/ResourceModifiedException.java b/sdk/core/azure-core/src/main/java/com/azure/core/exception/ResourceModifiedException.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/exception/ResourceModifiedException.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/exception/ResourceModifiedException.java
diff --git a/core/azure-core/src/main/java/com/azure/core/exception/ResourceNotFoundException.java b/sdk/core/azure-core/src/main/java/com/azure/core/exception/ResourceNotFoundException.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/exception/ResourceNotFoundException.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/exception/ResourceNotFoundException.java
diff --git a/core/azure-core/src/main/java/com/azure/core/exception/ServiceResponseException.java b/sdk/core/azure-core/src/main/java/com/azure/core/exception/ServiceResponseException.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/exception/ServiceResponseException.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/exception/ServiceResponseException.java
diff --git a/core/azure-core/src/main/java/com/azure/core/exception/TooManyRedirectsException.java b/sdk/core/azure-core/src/main/java/com/azure/core/exception/TooManyRedirectsException.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/exception/TooManyRedirectsException.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/exception/TooManyRedirectsException.java
diff --git a/core/azure-core/src/main/java/com/azure/core/exception/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/exception/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/exception/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/exception/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/HttpClient.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/HttpClient.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/HttpClient.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/HttpClient.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/HttpHeader.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/HttpHeader.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/HttpHeader.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/HttpHeader.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/HttpHeaders.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/HttpHeaders.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/HttpHeaders.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/HttpHeaders.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/HttpMethod.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/HttpMethod.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/HttpMethod.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/HttpMethod.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/HttpPipeline.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/HttpPipeline.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/HttpPipeline.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/HttpPipeline.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/HttpPipelineBuilder.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/HttpPipelineBuilder.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/HttpPipelineBuilder.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/HttpPipelineBuilder.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/HttpPipelineCallContext.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/HttpPipelineCallContext.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/HttpPipelineCallContext.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/HttpPipelineCallContext.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/HttpPipelineNextPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/HttpPipelineNextPolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/HttpPipelineNextPolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/HttpPipelineNextPolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/HttpRequest.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/HttpRequest.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/HttpRequest.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/HttpRequest.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/HttpResponse.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/HttpResponse.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/HttpResponse.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/HttpResponse.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/ProxyOptions.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/ProxyOptions.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/ProxyOptions.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/ProxyOptions.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/ReactorNettyClient.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/ReactorNettyClient.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/ReactorNettyClient.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/ReactorNettyClient.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/AddDatePolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/AddDatePolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/AddDatePolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/AddDatePolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/AddHeadersPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/AddHeadersPolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/AddHeadersPolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/AddHeadersPolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/BearerTokenAuthenticationPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/BearerTokenAuthenticationPolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/BearerTokenAuthenticationPolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/BearerTokenAuthenticationPolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/CookiePolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/CookiePolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/CookiePolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/CookiePolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/HostPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HostPolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/HostPolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HostPolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLogDetailLevel.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLogDetailLevel.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/HttpLogDetailLevel.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLogDetailLevel.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/HttpPipelinePolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpPipelinePolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/HttpPipelinePolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpPipelinePolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/PortPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/PortPolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/PortPolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/PortPolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/ProtocolPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/ProtocolPolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/ProtocolPolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/ProtocolPolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/ProxyAuthenticationPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/ProxyAuthenticationPolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/ProxyAuthenticationPolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/ProxyAuthenticationPolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/RequestIdPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/RequestIdPolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/RequestIdPolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/RequestIdPolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/RetryPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/RetryPolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/RetryPolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/RetryPolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/TimeoutPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/TimeoutPolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/TimeoutPolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/TimeoutPolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/UserAgentPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/UserAgentPolicy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/UserAgentPolicy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/UserAgentPolicy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/policy/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/policy/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/policy/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/rest/Page.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/Page.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/rest/Page.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/rest/Page.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/rest/PagedFlux.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/PagedFlux.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/rest/PagedFlux.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/rest/PagedFlux.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/rest/PagedResponse.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/PagedResponse.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/rest/PagedResponse.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/rest/PagedResponse.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/rest/Response.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/Response.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/rest/Response.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/rest/Response.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/rest/ResponseBase.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/ResponseBase.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/rest/ResponseBase.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/rest/ResponseBase.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/rest/SimpleResponse.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/SimpleResponse.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/rest/SimpleResponse.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/rest/SimpleResponse.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/rest/StreamResponse.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/StreamResponse.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/rest/StreamResponse.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/rest/StreamResponse.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/rest/VoidResponse.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/VoidResponse.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/rest/VoidResponse.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/rest/VoidResponse.java
diff --git a/core/azure-core/src/main/java/com/azure/core/http/rest/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/http/rest/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/http/rest/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/Base64Url.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/Base64Url.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/Base64Url.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/Base64Url.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/CollectionFormat.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/CollectionFormat.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/CollectionFormat.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/CollectionFormat.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/DateTimeRfc1123.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/DateTimeRfc1123.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/DateTimeRfc1123.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/DateTimeRfc1123.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/EncodedParameter.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/EncodedParameter.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/EncodedParameter.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/EncodedParameter.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/OperationDescription.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/OperationDescription.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/OperationDescription.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/OperationDescription.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/PercentEscaper.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/PercentEscaper.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/PercentEscaper.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/PercentEscaper.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/RestProxy.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/RestProxy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/RestProxy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/RestProxy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/Substitution.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/Substitution.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/Substitution.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/Substitution.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/SwaggerInterfaceParser.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/SwaggerInterfaceParser.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/SwaggerInterfaceParser.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/SwaggerInterfaceParser.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/SwaggerMethodParser.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/SwaggerMethodParser.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/SwaggerMethodParser.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/SwaggerMethodParser.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/UnexpectedExceptionInformation.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/UnexpectedExceptionInformation.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/UnexpectedExceptionInformation.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/UnexpectedExceptionInformation.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/UnixTime.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/UnixTime.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/UnixTime.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/UnixTime.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/UrlEscapers.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/UrlEscapers.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/UrlEscapers.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/UrlEscapers.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/Validator.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/Validator.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/Validator.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/Validator.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Beta.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Beta.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/Beta.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Beta.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/BodyParam.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/BodyParam.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/BodyParam.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/BodyParam.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Delete.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Delete.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/Delete.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Delete.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ExpectedResponses.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ExpectedResponses.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/ExpectedResponses.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ExpectedResponses.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Fluent.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Fluent.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/Fluent.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Fluent.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/FormParam.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/FormParam.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/FormParam.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/FormParam.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Get.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Get.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/Get.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Get.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Head.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Head.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/Head.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Head.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/HeaderCollection.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/HeaderCollection.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/HeaderCollection.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/HeaderCollection.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/HeaderParam.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/HeaderParam.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/HeaderParam.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/HeaderParam.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Headers.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Headers.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/Headers.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Headers.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Host.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Host.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/Host.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Host.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/HostParam.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/HostParam.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/HostParam.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/HostParam.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Immutable.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Immutable.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/Immutable.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Immutable.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/JsonFlatten.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/JsonFlatten.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/JsonFlatten.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/JsonFlatten.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Patch.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Patch.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/Patch.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Patch.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/PathParam.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/PathParam.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/PathParam.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/PathParam.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Post.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Post.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/Post.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Post.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Put.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Put.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/Put.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/Put.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/QueryParam.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/QueryParam.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/QueryParam.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/QueryParam.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ResumeOperation.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ResumeOperation.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/ResumeOperation.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ResumeOperation.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ReturnType.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ReturnType.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/ReturnType.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ReturnType.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ReturnValueWireType.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ReturnValueWireType.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/ReturnValueWireType.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ReturnValueWireType.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceClient.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceClient.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceClient.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceClient.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceClientBuilder.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceClientBuilder.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceClientBuilder.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceClientBuilder.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceInterface.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceInterface.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceInterface.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceInterface.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceMethod.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceMethod.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceMethod.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/ServiceMethod.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/SkipParentValidation.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/SkipParentValidation.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/SkipParentValidation.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/SkipParentValidation.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/UnexpectedResponseExceptionType.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/UnexpectedResponseExceptionType.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/UnexpectedResponseExceptionType.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/UnexpectedResponseExceptionType.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/UnexpectedResponseExceptionTypes.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/UnexpectedResponseExceptionTypes.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/UnexpectedResponseExceptionTypes.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/UnexpectedResponseExceptionTypes.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/annotation/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/annotation/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/annotation/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/exception/InvalidReturnTypeException.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/exception/InvalidReturnTypeException.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/exception/InvalidReturnTypeException.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/exception/InvalidReturnTypeException.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/exception/MissingRequiredAnnotationException.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/exception/MissingRequiredAnnotationException.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/exception/MissingRequiredAnnotationException.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/exception/MissingRequiredAnnotationException.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/exception/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/exception/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/exception/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/exception/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/BufferedHttpResponse.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/BufferedHttpResponse.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/BufferedHttpResponse.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/BufferedHttpResponse.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/ContentType.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/ContentType.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/ContentType.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/ContentType.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/PagedResponseBase.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/PagedResponseBase.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/PagedResponseBase.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/PagedResponseBase.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlBuilder.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlBuilder.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/UrlBuilder.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlBuilder.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlToken.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlToken.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/UrlToken.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlToken.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlTokenType.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlTokenType.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/UrlTokenType.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlTokenType.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlTokenizer.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlTokenizer.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/UrlTokenizer.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlTokenizer.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlTokenizerState.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlTokenizerState.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/UrlTokenizerState.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/UrlTokenizerState.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/AfterRetryPolicyProvider.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/AfterRetryPolicyProvider.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/AfterRetryPolicyProvider.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/AfterRetryPolicyProvider.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/BeforeRetryPolicyProvider.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/BeforeRetryPolicyProvider.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/BeforeRetryPolicyProvider.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/BeforeRetryPolicyProvider.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/HttpPolicyProviders.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/HttpPolicyProviders.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/HttpPolicyProviders.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/HttpPolicyProviders.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/PolicyProvider.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/PolicyProvider.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/PolicyProvider.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/PolicyProvider.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/policy/spi/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseBodyDecoder.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseBodyDecoder.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseBodyDecoder.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseBodyDecoder.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseDecodeData.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseDecodeData.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseDecodeData.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseDecodeData.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseDecoder.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseDecoder.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseDecoder.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseDecoder.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseHeaderDecoder.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseHeaderDecoder.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseHeaderDecoder.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseHeaderDecoder.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/ItemPage.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/ItemPage.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/ItemPage.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/ItemPage.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/MalformedValueException.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/MalformedValueException.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/MalformedValueException.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/MalformedValueException.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/SerializerAdapter.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/SerializerAdapter.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/SerializerAdapter.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/SerializerAdapter.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/SerializerEncoding.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/SerializerEncoding.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/SerializerEncoding.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/SerializerEncoding.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/AdditionalPropertiesDeserializer.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/AdditionalPropertiesDeserializer.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/AdditionalPropertiesDeserializer.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/AdditionalPropertiesDeserializer.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/AdditionalPropertiesSerializer.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/AdditionalPropertiesSerializer.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/AdditionalPropertiesSerializer.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/AdditionalPropertiesSerializer.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/Base64UrlSerializer.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/Base64UrlSerializer.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/Base64UrlSerializer.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/Base64UrlSerializer.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/ByteArraySerializer.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/ByteArraySerializer.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/ByteArraySerializer.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/ByteArraySerializer.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/DateTimeRfc1123Serializer.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/DateTimeRfc1123Serializer.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/DateTimeRfc1123Serializer.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/DateTimeRfc1123Serializer.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/DateTimeSerializer.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/DateTimeSerializer.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/DateTimeSerializer.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/DateTimeSerializer.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/DurationSerializer.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/DurationSerializer.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/DurationSerializer.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/DurationSerializer.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/FlatteningDeserializer.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/FlatteningDeserializer.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/FlatteningDeserializer.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/FlatteningDeserializer.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/FlatteningSerializer.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/FlatteningSerializer.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/FlatteningSerializer.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/FlatteningSerializer.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/JacksonAdapter.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/JacksonAdapter.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/JacksonAdapter.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/JacksonAdapter.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/jackson/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/serializer/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/serializer/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/tracing/Tracer.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/tracing/Tracer.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/tracing/Tracer.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/tracing/Tracer.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/tracing/TracerProxy.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/tracing/TracerProxy.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/tracing/TracerProxy.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/tracing/TracerProxy.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/util/Base64Util.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/util/Base64Util.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/util/Base64Util.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/util/Base64Util.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/util/FluxUtil.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/util/FluxUtil.java
similarity index 87%
rename from core/azure-core/src/main/java/com/azure/core/implementation/util/FluxUtil.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/util/FluxUtil.java
index 1ec6329fdf95d..f8541f0983931 100644
--- a/core/azure-core/src/main/java/com/azure/core/implementation/util/FluxUtil.java
+++ b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/util/FluxUtil.java
@@ -3,11 +3,22 @@
package com.azure.core.implementation.util;
+import com.azure.core.util.Context;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
import io.netty.buffer.CompositeByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.util.ReferenceCountUtil;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.nio.channels.AsynchronousFileChannel;
+import java.nio.channels.CompletionHandler;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+import java.util.concurrent.atomic.AtomicLongFieldUpdater;
+import java.util.function.Function;
+import java.util.stream.Collectors;
import org.reactivestreams.Subscriber;
import org.reactivestreams.Subscription;
import reactor.core.CoreSubscriber;
@@ -16,13 +27,6 @@
import reactor.core.publisher.MonoSink;
import reactor.core.publisher.Operators;
-import java.io.IOException;
-import java.lang.reflect.Type;
-import java.nio.channels.AsynchronousFileChannel;
-import java.nio.channels.CompletionHandler;
-import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
-import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-
/**
* Utility type exposing methods to deal with {@link Flux}.
*/
@@ -174,6 +178,64 @@ public static Mono bytebufStreamToFile(Flux content, Asynchronous
return Mono.create(emitter -> content.subscribe(new ByteBufToFileSubscriber(outFile, position, emitter)));
}
+ /**
+ * This method converts the incoming {@code subscriberContext} from {@link reactor.util.context.Context Reactor
+ * Context} to {@link Context Azure Context} and calls the given lambda function with this context and returns a
+ * single entity of type {@code T}
+ *
+ * If the reactor context is empty, {@link Context#NONE} will be used to call the lambda function
+ *
+ *
+ *
Code samples
+ * {@codesnippet com.azure.core.implementation.util.fluxutil.monocontext}
+ *
+ * @param serviceCall The lambda function that makes the service call into which azure context will be passed
+ * @param The type of response returned from the service call
+ * @return The response from service call
+ */
+ public static Mono monoContext(Function> serviceCall) {
+ return Mono.subscriberContext()
+ .map(FluxUtil::toAzureContext)
+ .flatMap(serviceCall);
+ }
+
+ /**
+ * This method converts the incoming {@code subscriberContext} from {@link reactor.util.context.Context Reactor
+ * Context} to {@link Context Azure Context} and calls the given lambda function with this context and returns a
+ * collection of type {@code T}
+ *
+ * If the reactor context is empty, {@link Context#NONE} will be used to call the lambda function
+ *
+ *
+ *
Code samples
+ * {@codesnippet com.azure.core.implementation.util.fluxutil.fluxcontext}
+ *
+ * @param serviceCall The lambda function that makes the service call into which the context will be passed
+ * @param The type of response returned from the service call
+ * @return The response from service call
+ */
+ public static Flux fluxContext(Function> serviceCall) {
+ return Mono.subscriberContext()
+ .map(FluxUtil::toAzureContext)
+ .flatMapMany(serviceCall);
+ }
+
+ /**
+ * Converts a reactor context to azure context. If the reactor context is {@code null} or empty,
+ * {@link Context#NONE} will be returned.
+ *
+ * @param context The reactor context
+ * @return The azure context
+ */
+ private static Context toAzureContext(reactor.util.context.Context context) {
+ Map keyValues = context.stream()
+ .collect(Collectors.toMap(Entry::getKey, Entry::getValue));
+ if (ImplUtils.isNullOrEmpty(keyValues)) {
+ return Context.NONE;
+ }
+ return Context.of(keyValues);
+ }
+
private static class ByteBufToFileSubscriber implements Subscriber {
private ByteBufToFileSubscriber(AsynchronousFileChannel outFile, long position, MonoSink emitter) {
this.outFile = outFile;
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/util/ImplUtils.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/util/ImplUtils.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/util/ImplUtils.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/util/ImplUtils.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/util/ScopeUtil.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/util/ScopeUtil.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/util/ScopeUtil.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/util/ScopeUtil.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/util/TypeUtil.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/util/TypeUtil.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/util/TypeUtil.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/util/TypeUtil.java
diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/util/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/util/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/implementation/util/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/implementation/util/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/util/Context.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/Context.java
similarity index 73%
rename from core/azure-core/src/main/java/com/azure/core/util/Context.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/util/Context.java
index 9d3b1d83477d0..bb58ed2987377 100644
--- a/core/azure-core/src/main/java/com/azure/core/util/Context.java
+++ b/sdk/core/azure-core/src/main/java/com/azure/core/util/Context.java
@@ -4,6 +4,8 @@
package com.azure.core.util;
import com.azure.core.implementation.annotation.Immutable;
+import com.azure.core.implementation.util.ImplUtils;
+import java.util.Map;
import java.util.Optional;
/**
@@ -63,6 +65,30 @@ public Context addData(Object key, Object value) {
return new Context(this, key, value);
}
+ /**
+ * Creates a new immutable {@link Context} object with all the keys and values provided by
+ * the input {@link Map}
+ *
+ * @param keyValues The input key value pairs that will be added to this context
+ * @return Context object containing all the key-value pairs in the input map
+ * @throws IllegalArgumentException If {@code keyValues} is {@code null} or empty
+ */
+ public static Context of(Map keyValues) {
+ if (ImplUtils.isNullOrEmpty(keyValues)) {
+ throw new IllegalArgumentException("Key value map cannot be null or empty");
+ }
+
+ Context context = null;
+ for (Map.Entry entry : keyValues.entrySet()) {
+ if (context == null) {
+ context = new Context(entry.getKey(), entry.getValue());
+ } else {
+ context = context.addData(entry.getKey(), entry.getValue());
+ }
+ }
+ return context;
+ }
+
/**
* Scans the linked-list of {@link Context} objects looking for one with the specified key.
* Note that the first key found, i.e. the most recently added, will be returned.
diff --git a/core/azure-core/src/main/java/com/azure/core/util/ExpandableStringEnum.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/ExpandableStringEnum.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/util/ExpandableStringEnum.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/util/ExpandableStringEnum.java
diff --git a/core/azure-core/src/main/java/com/azure/core/util/configuration/BaseConfigurations.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/configuration/BaseConfigurations.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/util/configuration/BaseConfigurations.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/util/configuration/BaseConfigurations.java
diff --git a/core/azure-core/src/main/java/com/azure/core/util/configuration/Configuration.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/configuration/Configuration.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/util/configuration/Configuration.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/util/configuration/Configuration.java
diff --git a/core/azure-core/src/main/java/com/azure/core/util/configuration/ConfigurationManager.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/configuration/ConfigurationManager.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/util/configuration/ConfigurationManager.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/util/configuration/ConfigurationManager.java
diff --git a/core/azure-core/src/main/java/com/azure/core/util/configuration/NoopConfiguration.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/configuration/NoopConfiguration.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/util/configuration/NoopConfiguration.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/util/configuration/NoopConfiguration.java
diff --git a/core/azure-core/src/main/java/com/azure/core/util/configuration/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/configuration/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/util/configuration/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/util/configuration/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/util/logging/ClientLogger.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/logging/ClientLogger.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/util/logging/ClientLogger.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/util/logging/ClientLogger.java
diff --git a/core/azure-core/src/main/java/com/azure/core/util/logging/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/logging/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/util/logging/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/util/logging/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/util/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/util/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/util/package-info.java
diff --git a/core/azure-core/src/main/java/com/azure/core/util/polling/PollResponse.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/polling/PollResponse.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/util/polling/PollResponse.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/util/polling/PollResponse.java
diff --git a/core/azure-core/src/main/java/com/azure/core/util/polling/Poller.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/polling/Poller.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/util/polling/Poller.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/util/polling/Poller.java
diff --git a/core/azure-core/src/main/java/com/azure/core/util/polling/package-info.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/polling/package-info.java
similarity index 100%
rename from core/azure-core/src/main/java/com/azure/core/util/polling/package-info.java
rename to sdk/core/azure-core/src/main/java/com/azure/core/util/polling/package-info.java
diff --git a/core/azure-core/src/samples/java/com/azure/core/http/rest/PagedFluxJavaDocCodeSnippets.java b/sdk/core/azure-core/src/samples/java/com/azure/core/http/rest/PagedFluxJavaDocCodeSnippets.java
similarity index 100%
rename from core/azure-core/src/samples/java/com/azure/core/http/rest/PagedFluxJavaDocCodeSnippets.java
rename to sdk/core/azure-core/src/samples/java/com/azure/core/http/rest/PagedFluxJavaDocCodeSnippets.java
diff --git a/core/azure-core/src/samples/java/com/azure/core/implementation/util/ClientLoggerJavaDocCodeSnippets.java b/sdk/core/azure-core/src/samples/java/com/azure/core/implementation/util/ClientLoggerJavaDocCodeSnippets.java
similarity index 100%
rename from core/azure-core/src/samples/java/com/azure/core/implementation/util/ClientLoggerJavaDocCodeSnippets.java
rename to sdk/core/azure-core/src/samples/java/com/azure/core/implementation/util/ClientLoggerJavaDocCodeSnippets.java
diff --git a/sdk/core/azure-core/src/samples/java/com/azure/core/implementation/util/FluxUtilJavaDocCodeSnippets.java b/sdk/core/azure-core/src/samples/java/com/azure/core/implementation/util/FluxUtilJavaDocCodeSnippets.java
new file mode 100644
index 0000000000000..341adf9e27f7d
--- /dev/null
+++ b/sdk/core/azure-core/src/samples/java/com/azure/core/implementation/util/FluxUtilJavaDocCodeSnippets.java
@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.core.implementation.util;
+
+import com.azure.core.util.Context;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+/**
+ * Code snippets for {@link FluxUtil}
+ */
+public class FluxUtilJavaDocCodeSnippets {
+
+ /**
+ * Code snippet for using {@link FluxUtil} with single item response
+ */
+ public void codeSnippetForCallWithSingleResponse() {
+ // BEGIN: com.azure.core.implementation.util.fluxutil.monocontext
+ String prefix = "Hello, ";
+ Mono response = FluxUtil
+ .monoContext(context -> serviceCallReturnsSingle(prefix, context));
+ // END: com.azure.core.implementation.util.fluxutil.monocontext
+ }
+
+ /**
+ * Code snippet for using {@link FluxUtil} with collection response
+ */
+ public void codeSnippetForCallWithCollectionResponse() {
+ // BEGIN: com.azure.core.implementation.util.fluxutil.fluxcontext
+ String prefix = "Hello, ";
+ Flux response = FluxUtil
+ .fluxContext(context -> serviceCallReturnsCollection(prefix, context));
+ // END: com.azure.core.implementation.util.fluxutil.fluxcontext
+ }
+
+ /**
+ * Implementation not provided
+ * @param prefix The prefix
+ * @param context Azure context
+ * @return {@link Flux#empty() empty} response
+ */
+ private Flux serviceCallReturnsCollection(String prefix, Context context) {
+ return Flux.empty();
+ }
+
+ /**
+ * Implementation not provided
+ * @param prefix The prefix
+ * @param context Azure context
+ * @return {@link Mono#empty() empty} response
+ */
+ private Mono serviceCallReturnsSingle(String prefix, Context context) {
+ return Mono.empty();
+ }
+
+}
diff --git a/core/azure-core/src/samples/java/com/azure/core/util/polling/PollResponseJavaDocCodeSnippets.java b/sdk/core/azure-core/src/samples/java/com/azure/core/util/polling/PollResponseJavaDocCodeSnippets.java
similarity index 100%
rename from core/azure-core/src/samples/java/com/azure/core/util/polling/PollResponseJavaDocCodeSnippets.java
rename to sdk/core/azure-core/src/samples/java/com/azure/core/util/polling/PollResponseJavaDocCodeSnippets.java
diff --git a/core/azure-core/src/samples/java/com/azure/core/util/polling/PollerJavaDocCodeSnippets.java b/sdk/core/azure-core/src/samples/java/com/azure/core/util/polling/PollerJavaDocCodeSnippets.java
similarity index 100%
rename from core/azure-core/src/samples/java/com/azure/core/util/polling/PollerJavaDocCodeSnippets.java
rename to sdk/core/azure-core/src/samples/java/com/azure/core/util/polling/PollerJavaDocCodeSnippets.java
diff --git a/core/azure-core/src/test/java/com/azure/core/ConfigurationTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/ConfigurationTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/ConfigurationTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/ConfigurationTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/MockServer.java b/sdk/core/azure-core/src/test/java/com/azure/core/MockServer.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/MockServer.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/MockServer.java
diff --git a/core/azure-core/src/test/java/com/azure/core/MyOtherRestException.java b/sdk/core/azure-core/src/test/java/com/azure/core/MyOtherRestException.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/MyOtherRestException.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/MyOtherRestException.java
diff --git a/core/azure-core/src/test/java/com/azure/core/MyRestException.java b/sdk/core/azure-core/src/test/java/com/azure/core/MyRestException.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/MyRestException.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/MyRestException.java
diff --git a/core/azure-core/src/test/java/com/azure/core/UserAgentTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/UserAgentTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/UserAgentTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/UserAgentTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/credentials/CredentialsTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/credentials/CredentialsTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/credentials/CredentialsTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/credentials/CredentialsTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/credentials/TokenCacheTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/credentials/TokenCacheTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/credentials/TokenCacheTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/credentials/TokenCacheTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/entities/AccessPolicy.java b/sdk/core/azure-core/src/test/java/com/azure/core/entities/AccessPolicy.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/entities/AccessPolicy.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/entities/AccessPolicy.java
diff --git a/core/azure-core/src/test/java/com/azure/core/entities/HttpBinFormDataJSON.java b/sdk/core/azure-core/src/test/java/com/azure/core/entities/HttpBinFormDataJSON.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/entities/HttpBinFormDataJSON.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/entities/HttpBinFormDataJSON.java
diff --git a/core/azure-core/src/test/java/com/azure/core/entities/HttpBinHeaders.java b/sdk/core/azure-core/src/test/java/com/azure/core/entities/HttpBinHeaders.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/entities/HttpBinHeaders.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/entities/HttpBinHeaders.java
diff --git a/core/azure-core/src/test/java/com/azure/core/entities/HttpBinJSON.java b/sdk/core/azure-core/src/test/java/com/azure/core/entities/HttpBinJSON.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/entities/HttpBinJSON.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/entities/HttpBinJSON.java
diff --git a/core/azure-core/src/test/java/com/azure/core/entities/SignedIdentifierInner.java b/sdk/core/azure-core/src/test/java/com/azure/core/entities/SignedIdentifierInner.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/entities/SignedIdentifierInner.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/entities/SignedIdentifierInner.java
diff --git a/core/azure-core/src/test/java/com/azure/core/entities/SignedIdentifiersWrapper.java b/sdk/core/azure-core/src/test/java/com/azure/core/entities/SignedIdentifiersWrapper.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/entities/SignedIdentifiersWrapper.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/entities/SignedIdentifiersWrapper.java
diff --git a/core/azure-core/src/test/java/com/azure/core/entities/Slide.java b/sdk/core/azure-core/src/test/java/com/azure/core/entities/Slide.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/entities/Slide.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/entities/Slide.java
diff --git a/core/azure-core/src/test/java/com/azure/core/entities/Slideshow.java b/sdk/core/azure-core/src/test/java/com/azure/core/entities/Slideshow.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/entities/Slideshow.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/entities/Slideshow.java
diff --git a/core/azure-core/src/test/java/com/azure/core/http/HttpHeaderTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/HttpHeaderTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/http/HttpHeaderTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/HttpHeaderTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/http/HttpHeadersTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/HttpHeadersTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/http/HttpHeadersTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/HttpHeadersTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/http/HttpMethodTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/HttpMethodTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/http/HttpMethodTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/HttpMethodTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/http/HttpPipelineTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/HttpPipelineTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/http/HttpPipelineTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/HttpPipelineTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/http/HttpRequestTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/HttpRequestTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/http/HttpRequestTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/HttpRequestTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/http/MockHttpClient.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/MockHttpClient.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/http/MockHttpClient.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/MockHttpClient.java
diff --git a/core/azure-core/src/test/java/com/azure/core/http/MockHttpResponse.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/MockHttpResponse.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/http/MockHttpResponse.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/MockHttpResponse.java
diff --git a/core/azure-core/src/test/java/com/azure/core/http/ReactorNettyClientTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/ReactorNettyClientTests.java
similarity index 99%
rename from core/azure-core/src/test/java/com/azure/core/http/ReactorNettyClientTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/ReactorNettyClientTests.java
index 4d486fc00cdf1..d5b182d585927 100644
--- a/core/azure-core/src/test/java/com/azure/core/http/ReactorNettyClientTests.java
+++ b/sdk/core/azure-core/src/test/java/com/azure/core/http/ReactorNettyClientTests.java
@@ -72,7 +72,6 @@ public void testFlowableResponseLongBodyAsByteArrayAsync() {
checkBodyReceived(LONG_BODY, "/long");
}
-
@Test
public void testMultipleSubscriptionsEmitsError() {
HttpResponse response = getResponse("/short");
@@ -94,8 +93,6 @@ public void testDispose() throws InterruptedException {
Assert.assertTrue(response.internConnection().isDisposed());
}
-
-
@Test
public void testCancel() {
HttpResponse response = getResponse("/long");
@@ -217,6 +214,7 @@ public void testServerShutsDownSocketShouldPushErrorToContentFlowable()
}
}
+ @Ignore("This flakey test fails often on MacOS. https://github.com/Azure/azure-sdk-for-java/issues/4357.")
@Test
public void testConcurrentRequests() throws NoSuchAlgorithmException {
long t = System.currentTimeMillis();
diff --git a/core/azure-core/src/test/java/com/azure/core/http/policy/HostPolicyTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/policy/HostPolicyTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/http/policy/HostPolicyTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/policy/HostPolicyTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/http/policy/ProtocolPolicyTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/policy/ProtocolPolicyTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/http/policy/ProtocolPolicyTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/policy/ProtocolPolicyTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/http/policy/ProxyAuthenticationPolicyTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/policy/ProxyAuthenticationPolicyTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/http/policy/ProxyAuthenticationPolicyTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/policy/ProxyAuthenticationPolicyTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/http/policy/RequestIdPolicyTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/policy/RequestIdPolicyTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/http/policy/RequestIdPolicyTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/policy/RequestIdPolicyTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/http/policy/RetryPolicyTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/policy/RetryPolicyTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/http/policy/RetryPolicyTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/policy/RetryPolicyTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/http/rest/PagedFluxTest.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/rest/PagedFluxTest.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/http/rest/PagedFluxTest.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/http/rest/PagedFluxTest.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/Base64UrlTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/Base64UrlTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/Base64UrlTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/Base64UrlTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/EncodedParameterTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/EncodedParameterTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/EncodedParameterTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/EncodedParameterTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyStressTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyStressTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/RestProxyStressTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyStressTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/RestProxyTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyWithHttpProxyNettyTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyWithHttpProxyNettyTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/RestProxyWithHttpProxyNettyTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyWithHttpProxyNettyTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyWithMockTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyWithMockTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/RestProxyWithMockTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyWithMockTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyWithNettyTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyWithNettyTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/RestProxyWithNettyTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyWithNettyTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyXMLTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyXMLTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/RestProxyXMLTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/RestProxyXMLTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/SubstitutionTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/SubstitutionTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/SubstitutionTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/SubstitutionTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/SwaggerInterfaceParserTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/SwaggerInterfaceParserTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/SwaggerInterfaceParserTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/SwaggerInterfaceParserTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/SwaggerMethodParserTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/SwaggerMethodParserTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/SwaggerMethodParserTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/SwaggerMethodParserTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/UrlEscaperTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/UrlEscaperTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/UrlEscaperTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/UrlEscaperTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/ValidatorTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/ValidatorTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/ValidatorTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/ValidatorTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/http/UrlBuilderTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/http/UrlBuilderTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/http/UrlBuilderTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/http/UrlBuilderTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/http/UrlTokenizerTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/http/UrlTokenizerTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/http/UrlTokenizerTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/http/UrlTokenizerTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/AdditionalPropertiesSerializerTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/AdditionalPropertiesSerializerTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/AdditionalPropertiesSerializerTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/AdditionalPropertiesSerializerTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/DateTimeSerializerTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/DateTimeSerializerTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/DateTimeSerializerTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/DateTimeSerializerTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/DurationSerializerTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/DurationSerializerTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/DurationSerializerTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/DurationSerializerTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/FlatteningSerializerTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/FlatteningSerializerTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/FlatteningSerializerTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/FlatteningSerializerTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/JacksonAdapterTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/JacksonAdapterTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/JacksonAdapterTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/serializer/jackson/JacksonAdapterTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/util/FluxUtilTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/util/FluxUtilTests.java
similarity index 68%
rename from core/azure-core/src/test/java/com/azure/core/implementation/util/FluxUtilTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/util/FluxUtilTests.java
index d357bd83c494c..76cd1feb04a5e 100644
--- a/core/azure-core/src/test/java/com/azure/core/implementation/util/FluxUtilTests.java
+++ b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/util/FluxUtilTests.java
@@ -3,31 +3,46 @@
package com.azure.core.implementation.util;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import com.azure.core.http.HttpHeaders;
+import com.azure.core.http.HttpMethod;
+import com.azure.core.http.HttpRequest;
+import com.azure.core.http.rest.PagedFlux;
+import com.azure.core.http.rest.PagedResponse;
+import com.azure.core.implementation.http.PagedResponseBase;
+import com.azure.core.util.Context;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufUtil;
import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.util.ReferenceCountUtil;
-import org.junit.Ignore;
-import org.junit.Test;
-import reactor.core.Exceptions;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-import reactor.test.StepVerifier;
-
import java.io.BufferedOutputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.nio.channels.AsynchronousFileChannel;
import java.nio.charset.StandardCharsets;
import java.nio.file.StandardOpenOption;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+import reactor.core.Exceptions;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
public class FluxUtilTests {
@@ -262,6 +277,114 @@ public void testCollectByteBufStream() {
0, 0, 0, (byte) 255,
0, 0, 1, 0}, bytes);
}
+
+ @Test
+ public void testCallWithContextGetSingle() {
+ String response = getSingle("Hello, ")
+ .subscriberContext(reactor.util.context.Context.of("FirstName", "Foo", "LastName", "Bar"))
+ .block();
+ Assert.assertEquals("Hello, Foo Bar", response);
+ }
+
+ @Test
+ public void testCallWithContextGetCollection() {
+ List expectedLines = Arrays.asList("Hello,", "Foo", "Bar");
+ List actualLines = new ArrayList<>();
+ getCollection("Hello, ")
+ .subscriberContext(reactor.util.context.Context.of("FirstName", "Foo", "LastName", "Bar"))
+ .doOnNext(line -> actualLines.add(line))
+ .subscribe();
+ Assert.assertEquals(expectedLines, actualLines);
+ }
+
+ @Test
+ public void testCallWithContextGetPagedCollection() throws Exception {
+ // Simulates the customer code that includes context
+ getPagedCollection()
+ .subscriberContext(
+ reactor.util.context.Context.of("Key1", "Val1", "Key2", "Val2"))
+ .doOnNext(System.out::println)
+ .subscribe();
+ }
+
+ private PagedFlux getPagedCollection()
+ throws Exception {
+ // Simulates the client library API
+ List> pagedResponses = getPagedResponses(4);
+ return new PagedFlux<>(
+ () -> FluxUtil.monoContext(context -> getFirstPage(pagedResponses, context)),
+ continuationToken -> FluxUtil
+ .monoContext(context -> getNextPage(continuationToken, pagedResponses, context)));
+ }
+
+ private List> getPagedResponses(int noOfPages)
+ throws MalformedURLException {
+ HttpHeaders httpHeaders = new HttpHeaders().put("header1", "value1")
+ .put("header2", "value2");
+ HttpRequest httpRequest = new HttpRequest(HttpMethod.GET, new URL("http://localhost"));
+ String deserializedHeaders = "header1,value1,header2,value2";
+ return IntStream.range(0, noOfPages)
+ .boxed()
+ .map(i -> createPagedResponse(httpRequest, httpHeaders, deserializedHeaders, i, noOfPages))
+ .collect(Collectors.toList());
+ }
+
+ private Mono> getFirstPage(List> pagedResponses,
+ Context context) {
+ // Simulates the service side code which should get the context provided by customer code
+ Assert.assertEquals("Val1", context.getData("Key1").get());
+ return pagedResponses.isEmpty() ? Mono.empty() : Mono.just(pagedResponses.get(0));
+ }
+
+ private Mono> getNextPage(String continuationToken,
+ List> pagedResponses, Context context) {
+ // Simulates the service side code which should get the context provided by customer code
+ Assert.assertEquals("Val2", context.getData("Key2").get());
+ if (continuationToken == null || continuationToken.isEmpty()) {
+ return Mono.empty();
+ }
+ return Mono.just(pagedResponses.get(Integer.valueOf(continuationToken)));
+ }
+
+ private PagedResponseBase createPagedResponse(HttpRequest httpRequest,
+ HttpHeaders httpHeaders, String deserializedHeaders, int i, int noOfPages) {
+ return new PagedResponseBase<>(httpRequest, HttpResponseStatus.OK.code(),
+ httpHeaders,
+ getItems(i),
+ i < noOfPages - 1 ? String.valueOf(i + 1) : null,
+ deserializedHeaders);
+ }
+
+ private List getItems(Integer i) {
+ return IntStream.range(i * 3, i * 3 + 3).boxed().collect(Collectors.toList());
+ }
+
+
+ private Mono getSingle(String prefix) {
+ return FluxUtil.monoContext(context -> serviceCallSingle(prefix, context));
+ }
+
+ private Flux getCollection(String prefix) {
+ return FluxUtil
+ .fluxContext(context -> serviceCallCollection(prefix, context));
+ }
+
+ private Mono serviceCallSingle(String prefix, Context context) {
+ String msg = prefix
+ + context.getData("FirstName").orElse("Stranger")
+ + " "
+ + context.getData("LastName").orElse("");
+ return Mono.just(msg);
+ }
+
+ private Flux serviceCallCollection(String prefix, Context context) {
+ String msg = prefix
+ + context.getData("FirstName").orElse("Stranger")
+ + " "
+ + context.getData("LastName").orElse("");
+
+ return Flux.just(msg.split(" "));
+ }
//
private static byte[] toBytes(ByteBuf bb) {
byte[] bytes = new byte[bb.readableBytes()];
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/util/Foo.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/util/Foo.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/util/Foo.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/util/Foo.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/util/FooChild.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/util/FooChild.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/util/FooChild.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/util/FooChild.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/util/ImplUtilsTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/util/ImplUtilsTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/util/ImplUtilsTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/util/ImplUtilsTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/implementation/util/TypeUtilTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/util/TypeUtilTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/implementation/util/TypeUtilTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/implementation/util/TypeUtilTests.java
diff --git a/core/azure-core/src/test/java/com/azure/core/util/polling/PollerTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/util/polling/PollerTests.java
similarity index 100%
rename from core/azure-core/src/test/java/com/azure/core/util/polling/PollerTests.java
rename to sdk/core/azure-core/src/test/java/com/azure/core/util/polling/PollerTests.java
diff --git a/core/azure-core/src/test/resources/GetContainerACLs.xml b/sdk/core/azure-core/src/test/resources/GetContainerACLs.xml
similarity index 100%
rename from core/azure-core/src/test/resources/GetContainerACLs.xml
rename to sdk/core/azure-core/src/test/resources/GetContainerACLs.xml
diff --git a/core/azure-core/src/test/resources/GetXMLWithAttributes.xml b/sdk/core/azure-core/src/test/resources/GetXMLWithAttributes.xml
similarity index 100%
rename from core/azure-core/src/test/resources/GetXMLWithAttributes.xml
rename to sdk/core/azure-core/src/test/resources/GetXMLWithAttributes.xml
diff --git a/core/azure-core/src/test/resources/upload.txt b/sdk/core/azure-core/src/test/resources/upload.txt
similarity index 100%
rename from core/azure-core/src/test/resources/upload.txt
rename to sdk/core/azure-core/src/test/resources/upload.txt
diff --git a/sdk/core/ci.yml b/sdk/core/ci.yml
new file mode 100644
index 0000000000000..a4eb3bc813cf7
--- /dev/null
+++ b/sdk/core/ci.yml
@@ -0,0 +1,23 @@
+# DO NOT EDIT THIS FILE
+# This file is generated automatically and any changes will be lost.
+
+trigger:
+ branches:
+ include:
+ - master
+ paths:
+ include:
+ - sdk/core/
+
+pr:
+ branches:
+ include:
+ - master
+ paths:
+ include:
+ - sdk/core/
+
+jobs:
+ - template: ../../eng/pipelines/templates/jobs/archetype-sdk-client.yml
+ parameters:
+ ServiceDirectory: core
\ No newline at end of file
diff --git a/sdk/core/pom.service.xml b/sdk/core/pom.service.xml
new file mode 100644
index 0000000000000..10c012fa679b8
--- /dev/null
+++ b/sdk/core/pom.service.xml
@@ -0,0 +1,17 @@
+
+
+ 4.0.0
+ com.azure
+ azure-core-service
+ pom
+ 1.0.0
+
+ azure-core
+ azure-core-amqp
+ azure-core-management
+ azure-core-test
+
+
diff --git a/core/pom.xml b/sdk/core/pom.xml
similarity index 97%
rename from core/pom.xml
rename to sdk/core/pom.xml
index 8a99642ce90cc..033b535580980 100644
--- a/core/pom.xml
+++ b/sdk/core/pom.xml
@@ -10,7 +10,7 @@
com.azureazure-client-sdk-parent1.1.0
- ../pom.client.xml
+ ../../pom.client.xmlcom.azure
diff --git a/sdk/cosmos/CODEOWNERS b/sdk/cosmos/CODEOWNERS
new file mode 100644
index 0000000000000..26da20e9f2cf2
--- /dev/null
+++ b/sdk/cosmos/CODEOWNERS
@@ -0,0 +1,10 @@
+# CODEOWNERS is a GitHub standard to specify who is automatically assigned pull requests to review.
+# This helps to prevent pull requests from languishing without review.
+# GitHub can also be configured to require review from code owners before a pull request can be merged.
+
+# Further reading is available from the following two URLs:
+# https://blog.github.com/2017-07-06-introducing-code-owners/
+# https://help.github.com/articles/about-codeowners/
+
+# Default owner for repo
+* @moderakh @christopheranderson @kushagraThapar
diff --git a/sdk/cosmos/LICENSE b/sdk/cosmos/LICENSE
new file mode 100644
index 0000000000000..21071075c2459
--- /dev/null
+++ b/sdk/cosmos/LICENSE
@@ -0,0 +1,21 @@
+ MIT License
+
+ Copyright (c) Microsoft Corporation. All rights reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE
diff --git a/sdk/cosmos/README.md b/sdk/cosmos/README.md
new file mode 100644
index 0000000000000..b6ec762cc2cd3
--- /dev/null
+++ b/sdk/cosmos/README.md
@@ -0,0 +1,323 @@
+# Java SDK for SQL API of Azure Cosmos DB
+
+[](https://search.maven.org/artifact/com.microsoft.azure/azure-cosmosdb/2.4.3/jar)
+[](https://travis-ci.org/Azure/azure-cosmosdb-java)
+[](https://snyk.io/test/github/Azure/azure-cosmosdb-java?targetFile=sdk%2Fpom.xml)
+
+
+
+
+
+- [Consuming the official Microsoft Azure Cosmos DB Java SDK](#consuming-the-official-microsoft-azure-cosmos-db-java-sdk)
+- [Prerequisites](#prerequisites)
+- [API Documentation](#api-documentation)
+- [Usage Code Sample](#usage-code-sample)
+- [Guide for Prod](#guide-for-prod)
+- [Future, CompletableFuture, and ListenableFuture](#future-completablefuture-and-listenablefuture)
+- [Checking out the Source Code](#checking-out-the-source-code)
+- [FAQ](#faq)
+- [Release changes](#release-changes)
+- [Contribution and Feedback](#contribution-and-feedback)
+- [License](#license)
+
+
+
+## Consuming the official Microsoft Azure Cosmos DB Java SDK
+
+This project provides a SDK library in Java for interacting with [SQL API](https://docs.microsoft.com/en-us/azure/cosmos-db/sql-api-sql-query) of [Azure Cosmos DB
+Database Service](https://azure.microsoft.com/en-us/services/cosmos-db/). This project also includes samples, tools, and utilities.
+
+Jar dependency binary information for maven and gradle can be found here at [maven](https://mvnrepository.com/artifact/com.microsoft.azure/azure-cosmosdb/2.4.3).
+
+For example, using maven, you can add the following dependency to your maven pom file:
+
+```xml
+
+ com.microsoft.azure
+ azure-cosmosdb
+ 2.4.3
+
+```
+
+Useful links:
+
+- [Sample Get Started APP](https://github.com/Azure-Samples/azure-cosmos-db-sql-api-async-java-getting-started)
+- [Introduction to Resource Model of Azure Cosmos DB Service](https://docs.microsoft.com/en-us/azure/cosmos-db/sql-api-resources)
+- [Introduction to SQL API of Azure Cosmos DB Service](https://docs.microsoft.com/en-us/azure/cosmos-db/sql-api-sql-query)
+- [SDK JavaDoc API](https://azure.github.io/azure-cosmosdb-java/2.4.0/com/microsoft/azure/cosmosdb/rx/AsyncDocumentClient.html)
+- [RxJava Observable JavaDoc API](http://reactivex.io/RxJava/1.x/javadoc/rx/Observable.html)
+- [SDK FAQ](faq/)
+
+## Prerequisites
+
+- Java Development Kit 8
+- An active Azure account. If you don't have one, you can sign up for a [free account](https://azure.microsoft.com/free/). Alternatively, you can use the [Azure Cosmos DB Emulator](https://azure.microsoft.com/documentation/articles/documentdb-nosql-local-emulator) for development and testing. As emulator https certificate is self signed, you need to import its certificate to java trusted cert store as [explained here](https://docs.microsoft.com/en-us/azure/cosmos-db/local-emulator-export-ssl-certificates)
+- (Optional) SLF4J is a logging facade.
+- (Optional) [SLF4J binding](http://www.slf4j.org/manual.html) is used to associate a specific logging framework with SLF4J.
+- (Optional) Maven
+
+SLF4J is only needed if you plan to use logging, please also download an SLF4J binding which will link the SLF4J API with the logging implementation of your choice. See the [SLF4J user manual](http://www.slf4j.org/manual.html) for more information.
+
+## API Documentation
+
+Javadoc is available [here](https://azure.github.io/azure-cosmosdb-java/2.4.0/com/microsoft/azure/cosmosdb/rx/AsyncDocumentClient.html).
+
+The SDK provide Reactive Extension Observable based async API. You can read more about RxJava and [Observable APIs here](http://reactivex.io/RxJava/1.x/javadoc/rx/Observable.html).
+
+## Usage Code Sample
+
+Code Sample for creating a Document:
+
+```java
+import com.azure.data.cosmos.rx.*;
+import com.azure.data.cosmos.*;
+
+ConnectionPolicy policy = new ConnectionPolicy();
+policy.setConnectionMode(ConnectionMode.Direct);
+
+AsyncDocumentClient asyncClient = new AsyncDocumentClient.Builder()
+ .withServiceEndpoint(HOST)
+ .withMasterKeyOrResourceToken(MASTER_KEY)
+ .withConnectionPolicy(policy)
+ .withConsistencyLevel(ConsistencyLevel.Eventual)
+ .build();
+
+Document doc = new Document(String.format("{ 'id': 'doc%d', 'counter': '%d'}", 1, 1));
+
+Observable> createDocumentObservable =
+ asyncClient.createDocument(collectionLink, doc, null, false);
+ createDocumentObservable
+ .single() // we know there will be one response
+ .subscribe(
+
+ documentResourceResponse -> {
+ System.out.println(documentResourceResponse.getRequestCharge());
+ },
+
+ error -> {
+ System.err.println("an error happened: " + error.getMessage());
+ });
+```
+
+We have a get started sample app available [here](https://github.com/Azure-Samples/azure-cosmos-db-sql-api-async-java-getting-started).
+
+Also We have more examples in form of standalone unit tests in [examples project](examples/src/test/java/com/microsoft/azure/cosmosdb/rx/examples).
+
+## Guide for Prod
+
+To achieve better performance and higher throughput there are a few tips that are helpful to follow:
+
+### Use Appropriate Scheduler (Avoid stealing Eventloop IO Netty threads)
+
+SDK uses [netty](https://netty.io/) for non-blocking IO. The SDK uses a fixed number of IO netty eventloop threads (as many CPU cores your machine has) for executing IO operations.
+
+The Observable returned by API emits the result on one of the shared IO eventloop netty threads. So it is important to not block the shared IO eventloop netty threads. Doing CPU intensive work or blocking operation on the IO eventloop netty thread may cause deadlock or significantly reduce SDK throughput.
+
+For example the following code executes a cpu intensive work on the eventloop IO netty thread:
+
+```java
+Observable> createDocObs = asyncDocumentClient.createDocument(
+ collectionLink, document, null, true);
+
+createDocObs.subscribe(
+ resourceResponse -> {
+ //this is executed on eventloop IO netty thread.
+ //the eventloop thread is shared and is meant to return back quickly.
+ //
+ // DON'T do this on eventloop IO netty thread.
+ veryCpuIntensiveWork();
+ });
+
+```
+
+After result is received if you want to do CPU intensive work on the result you should avoid doing so on eventloop IO netty thread. You can instead provide your own Scheduler to provide your own thread for running your work.
+
+```java
+import rx.schedulers;
+
+Observable> createDocObs = asyncDocumentClient.createDocument(
+ collectionLink, document, null, true);
+
+createDocObs.subscribeOn(Schedulers.computation())
+subscribe(
+ resourceResponse -> {
+ // this is executed on threads provided by Scheduler.computation()
+ // Schedulers.computation() should be used only the work is cpu intensive and you are not doing blocking IO, thread sleep, etc. in this thread against other resources.
+ veryCpuIntensiveWork();
+ });
+
+```
+
+Based on the type of your work you should use the appropriate existing RxJava Scheduler for your work. Please read here
+[`Schedulers`](http://reactivex.io/RxJava/1.x/javadoc/rx/schedulers/Schedulers.html).
+
+### Disable netty's logging
+
+Netty library logging is very chatty and need to be turned off (suppressing log in the configuration may not be enough) to avoid additional CPU costs.
+If you are not in debugging mode disable netty's logging altogether. So if you are using log4j to remove the additional CPU costs incurred by `org.apache.log4j.Category.callAppenders()` from netty add the following line to your codebase:
+
+```java
+org.apache.log4j.Logger.getLogger("io.netty").setLevel(org.apache.log4j.Level.OFF);
+```
+
+### OS Open files Resource Limit
+
+Some Linux systems (like Redhat) have an upper limit on the number of open files and so the total number of connections. Run the following to view the current limits:
+
+```bash
+ulimit -a
+```
+
+The number of open files (nofile) need to be large enough to have enough room for your configured connection pool size and other open files by the OS. It can be modified to allow for a larger connection pool size.
+
+Open the limits.conf file:
+
+```bash
+vim /etc/security/limits.conf
+```
+
+Add/modify the following lines:
+
+```
+* - nofile 100000
+```
+
+### Use native SSL implementation for netty
+
+Netty can use OpenSSL directly for SSL implementation stack to achieve better performance.
+In the absence of this configuration netty will fall back to Java's default SSL implementation.
+
+on Ubuntu:
+
+```bash
+sudo apt-get install openssl
+sudo apt-get install libapr1
+```
+
+and add the following dependency to your project maven dependencies:
+
+```xml
+
+ io.netty
+ netty-tcnative
+ 2.0.20.Final
+ linux-x86_64
+
+```
+
+For other platforms (Redhat, Windows, Mac, etc) please refer to these instructions https://netty.io/wiki/forked-tomcat-native.html
+
+### Common Perf Tips
+
+There is a set of common perf tips written for our sync SDK. The majority of them also apply to the async SDK. It is available [here](https://docs.microsoft.com/en-us/azure/cosmos-db/performance-tips-java).
+
+## Future, CompletableFuture, and ListenableFuture
+
+The SDK provide Reactive Extension (Rx) [Observable](http://reactivex.io/RxJava/1.x/javadoc/rx/Observable.html) based async API.
+
+RX API has advantages over Future based APIs. But if you wish to use `Future` you can translate Observables to Java native Futures:
+
+```java
+// You can convert an Observable to a ListenableFuture.
+// ListenableFuture (part of google guava library) is a popular extension
+// of Java's Future which allows registering listener callbacks:
+// https://github.com/google/guava/wiki/ListenableFutureExplained
+
+import rx.observable.ListenableFutureObservable;
+
+Observable> createDocObservable = asyncClient.createDocument(
+ collectionLink, document, null, false);
+
+// NOTE: if you are going to do CPU intensive work
+// on the result thread consider changing the scheduler see Use Proper Scheduler
+// (Avoid Stealing Eventloop IO Netty threads) section
+ListenableFuture> listenableFuture =
+ ListenableFutureObservable.to(createDocObservable);
+
+ResourceResponse rrd = listenableFuture.get();
+```
+
+For this to work you will need [RxJava Guava library dependency ](https://mvnrepository.com/artifact/io.reactivex/rxjava-guava/1.0.3). More information available here https://github.com/ReactiveX/RxJavaGuava.
+
+You can see more details on how to convert Observables to Futures here:
+https://dzone.com/articles/converting-between
+
+## Checking out the Source Code
+
+The SDK is open source and is available here [sdk](sdk/).
+
+Clone the Repo
+
+```bash
+git clone https://github.com/Azure/azure-cosmosdb-java.git
+cd azure-cosmosdb-java
+```
+
+### How to Build from Command Line
+
+- Run the following maven command to build:
+
+```bash
+maven clean package -DskipTests
+```
+
+### How to generate directory structure for publishing
+
+- Run the following maven command to collect the jars needed for publishing
+
+```bash
+mvn antrun:run -N
+```
+
+Note: the `-N` is required to assert this command is only run in the parent pom.
+
+Afterwards, you can upload the contents of `./target/collectedArtifactsForRelease` for publishing.
+
+#### Running Tests from Command Line
+
+Running tests require Azure Cosmos DB Endpoint credentials:
+
+```bash
+mvn test -DACCOUNT_HOST="https://REPLACE_ME_WITH_YOURS.documents.azure.com:443/" -DACCOUNT_KEY="REPLACE_ME_WITH_YOURS"
+```
+
+### Import into Intellij or Eclipse
+
+- Load the main parent project pom file in Intellij/Eclipse (That should automatically load examples).
+- For running the samples you need a proper Azure Cosmos DB Endpoint. The endpoints are picked up from [TestConfigurations.java](examples/src/test/java/com/microsoft/azure/cosmosdb/rx/examples/TestConfigurations.java). There is a similar endpoint config file for the sdk tests [here](sdk/src/test/java/com/microsoft/azure/cosmosdb/rx/TestConfigurations.java).
+- You can pass your endpoint credentials as VM Arguments in Eclipse JUnit Run Config:
+
+```bash
+ -DACCOUNT_HOST="https://REPLACE_ME.documents.azure.com:443/" -DACCOUNT_KEY="REPLACE_ME"
+```
+
+- or you can simply put your endpoint credentials in TestConfigurations.java
+- The SDK tests are written using TestNG framework, if you use Eclipse you may have to
+ add TestNG plugin to your eclipse IDE as explained [here](http://testng.org/doc/eclipse.html).
+ Intellij has builtin support for TestNG.
+- Now you can run the tests in your Intellij/Eclipse IDE.
+
+## FAQ
+
+We have a frequently asked questions which is maintained [here](faq/).
+
+## Release changes
+
+Release changelog is available [here](changelog/).
+
+## Contribution and Feedback
+
+This is an open source project and we welcome contributions.
+
+If you would like to become an active contributor to this project please follow the instructions provided in [Azure Projects Contribution Guidelines](http://azure.github.io/guidelines/).
+
+We have [travis build CI](https://travis-ci.org/Azure/azure-cosmosdb-java) which should pass for any PR.
+
+If you encounter any bugs with the SDK please file an [issue](https://github.com/Azure/azure-cosmosdb-java/issues) in the Issues section of the project.
+
+## License
+
+MIT License
+Copyright (c) 2018 Copyright (c) Microsoft Corporation
diff --git a/sdk/cosmos/benchmark/README.md b/sdk/cosmos/benchmark/README.md
new file mode 100644
index 0000000000000..4f7aadcc7796e
--- /dev/null
+++ b/sdk/cosmos/benchmark/README.md
@@ -0,0 +1,81 @@
+# Benchmark tool
+
+## Build the benchmarking tool
+
+```bash
+git clone https://github.com/Azure/azure-cosmosdb-java.git
+cd azure-cosmosdb-java
+
+mvn clean package -DskipTests
+```
+
+and then the package will be generated.
+
+## Run the WriteLatency workload
+
+```bash
+java -jar benchmark/target/azure-cosmosdb-benchmark-2.4.1-SNAPSHOT-jar-with-dependencies.jar \
+ -serviceEndpoint $endpoint -masterKey $masterkey \
+ -databaseId $dbname -collectionId $colname \
+ -consistencyLevel Eventual -concurrency 10 -numberOfOperations 1000000 \
+ -operation WriteLatency -connectionMode Direct
+```
+
+## Sample Report:
+
+```
+2/13/19 9:32:39 PM =============================================================
+
+-- Meters ----------------------------------------------------------------------
+#Successful Operations
+ count = 89934
+ mean rate = 1798.56 events/second
+ 1-minute rate = 1718.45 events/second
+ 5-minute rate = 1630.17 events/second
+ 15-minute rate = 1610.01 events/second
+#Unsuccessful Operations
+ count = 0
+ mean rate = 0.00 events/second
+ 1-minute rate = 0.00 events/second
+ 5-minute rate = 0.00 events/second
+ 15-minute rate = 0.00 events/second
+
+-- Timers ----------------------------------------------------------------------
+Latency
+ count = 89938
+ mean rate = 1798.64 calls/second
+ 1-minute rate = 1718.65 calls/second
+ 5-minute rate = 1630.37 calls/second
+ 15-minute rate = 1610.21 calls/second
+ min = 3.97 milliseconds
+ max = 22.81 milliseconds
+ mean = 5.37 milliseconds
+ stddev = 0.96 milliseconds
+ median = 5.26 milliseconds
+ 75% <= 5.70 milliseconds
+ 95% <= 6.40 milliseconds
+ 98% <= 6.93 milliseconds
+ 99% <= 7.51 milliseconds
+ 99.9% <= 17.37 milliseconds
+```
+
+## Other Currently Supported Workloads
+
+* ReadLatency,
+* WriteLatency,
+* ReadThroughput,
+* WriteThroughput,
+* QueryCross,
+* QuerySingle,
+* QuerySingleMany,
+* QueryParallel,
+* QueryOrderby,
+* QueryAggregate,
+* QueryAggregateTopOrderby,
+* QueryTopOrderby,
+* Mixed
+* ReadMyWrites
+
+
+You can provide ``--help`` to the tool to see the list of other work loads (read, etc) and other options.
+
diff --git a/sdk/cosmos/benchmark/pom.xml b/sdk/cosmos/benchmark/pom.xml
new file mode 100644
index 0000000000000..491a48a51ee6b
--- /dev/null
+++ b/sdk/cosmos/benchmark/pom.xml
@@ -0,0 +1,188 @@
+
+
+
+ 4.0.0
+
+ com.microsoft.azure
+ azure-cosmos-parent
+ 3.0.0
+
+
+ azure-cosmos-benchmark
+ Async SDK for SQL API of Azure Cosmos DB Service - Benchmarking tool
+ Benchmarking tool for Async SDK for SQL API of Azure Cosmos DB Service
+
+
+ UTF-8
+
+
+
+
+ org.codehaus.mojo
+ exec-maven-plugin
+ 1.2.1
+
+ com.azure.data.cosmos.benchmark.Main
+
+
+
+ maven-assembly-plugin
+ 2.2
+
+
+ jar-with-dependencies
+
+
+
+ com.azure.data.cosmos.benchmark.Main
+
+
+
+
+
+ make-assembly
+ package
+
+ single
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.6.0
+
+ 1.8
+ 1.8
+
+
+
+ org.apache.maven.plugins
+ maven-eclipse-plugin
+ 2.8
+
+
+
+ org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+ 1.8
+ false
+
+
+ none
+ default-cli
+
+
+
+ true
+
+
+
+
+
+
+ com.microsoft.azure
+ azure-cosmos
+
+
+ com.beust
+ jcommander
+ ${jcommander.version}
+
+
+ com.google.guava
+ guava
+ ${guava.version}
+
+
+ io.dropwizard.metrics
+ metrics-core
+ ${metrics.version}
+
+
+ io.dropwizard.metrics
+ metrics-jvm
+ ${metrics.version}
+
+
+ io.dropwizard.metrics
+ metrics-graphite
+ ${metrics.version}
+
+
+ io.netty
+ netty-tcnative
+ ${netty-tcnative.version}
+ linux-x86_64
+
+
+ log4j
+ log4j
+ ${log4j.version}
+
+
+ org.apache.commons
+ commons-lang3
+ ${commons-lang3.version}
+
+
+ org.slf4j
+ slf4j-api
+ ${slf4j.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+ ${slf4j.version}
+
+
+ org.assertj
+ assertj-core
+ ${assertj.version}
+ test
+
+
+ org.hamcrest
+ hamcrest-all
+ ${hamcrest.version}
+ test
+
+
+ org.testng
+ testng
+ ${testng.version}
+ test
+
+
+
diff --git a/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncBenchmark.java b/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncBenchmark.java
new file mode 100644
index 0000000000000..f93c9a0b53a27
--- /dev/null
+++ b/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncBenchmark.java
@@ -0,0 +1,258 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.azure.data.cosmos.benchmark;
+
+import com.azure.data.cosmos.internal.AsyncDocumentClient;
+import com.azure.data.cosmos.BridgeInternal;
+import com.azure.data.cosmos.internal.Database;
+import com.azure.data.cosmos.internal.Document;
+import com.azure.data.cosmos.internal.DocumentCollection;
+import com.azure.data.cosmos.benchmark.Configuration.Operation;
+import com.azure.data.cosmos.internal.ResourceResponse;
+import com.codahale.metrics.ConsoleReporter;
+import com.codahale.metrics.Meter;
+import com.codahale.metrics.MetricFilter;
+import com.codahale.metrics.MetricRegistry;
+import com.codahale.metrics.ScheduledReporter;
+import com.codahale.metrics.Timer;
+import com.codahale.metrics.graphite.Graphite;
+import com.codahale.metrics.graphite.GraphiteReporter;
+import com.codahale.metrics.jvm.CachedThreadStatesGaugeSet;
+import com.codahale.metrics.jvm.GarbageCollectorMetricSet;
+import com.codahale.metrics.jvm.MemoryUsageGaugeSet;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.reactivestreams.Subscription;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import reactor.core.publisher.BaseSubscriber;
+import reactor.core.publisher.Flux;
+
+import java.net.InetSocketAddress;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+
+abstract class AsyncBenchmark {
+ private final MetricRegistry metricsRegistry = new MetricRegistry();
+ private final ScheduledReporter reporter;
+ private final String nameCollectionLink;
+
+ private Meter successMeter;
+ private Meter failureMeter;
+
+ final Logger logger;
+ final AsyncDocumentClient client;
+ final DocumentCollection collection;
+ final String partitionKey;
+ final Configuration configuration;
+ final List docsToRead;
+ final Semaphore concurrencyControlSemaphore;
+ Timer latency;
+
+ AsyncBenchmark(Configuration cfg) {
+ client = new AsyncDocumentClient.Builder()
+ .withServiceEndpoint(cfg.getServiceEndpoint())
+ .withMasterKeyOrResourceToken(cfg.getMasterKey())
+ .withConnectionPolicy(cfg.getConnectionPolicy())
+ .withConsistencyLevel(cfg.getConsistencyLevel())
+ .build();
+
+ logger = LoggerFactory.getLogger(this.getClass());
+
+ Database database = DocDBUtils.getDatabase(client, cfg.getDatabaseId());
+ collection = DocDBUtils.getCollection(client, database.selfLink(), cfg.getCollectionId());
+ nameCollectionLink = String.format("dbs/%s/colls/%s", database.id(), collection.id());
+ partitionKey = collection.getPartitionKey().paths().iterator().next().split("/")[1];
+ concurrencyControlSemaphore = new Semaphore(cfg.getConcurrency());
+ configuration = cfg;
+
+ ArrayList> createDocumentObservables = new ArrayList<>();
+
+ if (configuration.getOperationType() != Operation.WriteLatency
+ && configuration.getOperationType() != Operation.WriteThroughput
+ && configuration.getOperationType() != Operation.ReadMyWrites) {
+ String dataFieldValue = RandomStringUtils.randomAlphabetic(cfg.getDocumentDataFieldSize());
+ for (int i = 0; i < cfg.getNumberOfPreCreatedDocuments(); i++) {
+ String uuid = UUID.randomUUID().toString();
+ Document newDoc = new Document();
+ newDoc.id(uuid);
+ BridgeInternal.setProperty(newDoc, partitionKey, uuid);
+ BridgeInternal.setProperty(newDoc, "dataField1", dataFieldValue);
+ BridgeInternal.setProperty(newDoc, "dataField2", dataFieldValue);
+ BridgeInternal.setProperty(newDoc, "dataField3", dataFieldValue);
+ BridgeInternal.setProperty(newDoc, "dataField4", dataFieldValue);
+ BridgeInternal.setProperty(newDoc, "dataField5", dataFieldValue);
+ Flux obs = client.createDocument(collection.selfLink(), newDoc, null, false)
+ .map(ResourceResponse::getResource);
+ createDocumentObservables.add(obs);
+ }
+ }
+
+ docsToRead = Flux.merge(Flux.fromIterable(createDocumentObservables), 100).collectList().block();
+ init();
+
+ if (configuration.isEnableJvmStats()) {
+ metricsRegistry.register("gc", new GarbageCollectorMetricSet());
+ metricsRegistry.register("threads", new CachedThreadStatesGaugeSet(10, TimeUnit.SECONDS));
+ metricsRegistry.register("memory", new MemoryUsageGaugeSet());
+ }
+
+ if (configuration.getGraphiteEndpoint() != null) {
+ final Graphite graphite = new Graphite(new InetSocketAddress(configuration.getGraphiteEndpoint(), configuration.getGraphiteEndpointPort()));
+ reporter = GraphiteReporter.forRegistry(metricsRegistry)
+ .prefixedWith(configuration.getOperationType().name())
+ .convertRatesTo(TimeUnit.SECONDS)
+ .convertDurationsTo(TimeUnit.MILLISECONDS)
+ .filter(MetricFilter.ALL)
+ .build(graphite);
+ } else {
+ reporter = ConsoleReporter.forRegistry(metricsRegistry).convertRatesTo(TimeUnit.SECONDS)
+ .convertDurationsTo(TimeUnit.MILLISECONDS).build();
+ }
+ }
+
+ protected void init() {
+ }
+
+ void shutdown() {
+ client.close();
+ }
+
+ protected void onSuccess() {
+ }
+
+ protected void onError(Throwable throwable) {
+ }
+
+ protected String getCollectionLink() {
+ if (configuration.isUseNameLink()) {
+ return this.nameCollectionLink;
+ } else {
+ return collection.selfLink();
+ }
+ }
+
+ protected String getDocumentLink(Document doc) {
+ if (configuration.isUseNameLink()) {
+ return this.nameCollectionLink + "/docs/" + doc.id();
+ } else {
+ return doc.selfLink();
+ }
+ }
+
+ protected abstract void performWorkload(BaseSubscriber baseSubscriber, long i) throws Exception;
+
+ private boolean shouldContinue(long startTimeMillis, long iterationCount) {
+ Duration maxDurationTime = configuration.getMaxRunningTimeDuration();
+ int maxNumberOfOperations = configuration.getNumberOfOperations();
+ if (maxDurationTime == null) {
+ return iterationCount < maxNumberOfOperations;
+ }
+
+ if (startTimeMillis + maxDurationTime.toMillis() < System.currentTimeMillis()) {
+ return false;
+ }
+
+ if (maxNumberOfOperations < 0) {
+ return true;
+ }
+
+ return iterationCount < maxNumberOfOperations;
+ }
+
+ void run() throws Exception {
+
+ successMeter = metricsRegistry.meter("#Successful Operations");
+ failureMeter = metricsRegistry.meter("#Unsuccessful Operations");
+ if (configuration.getOperationType() == Operation.ReadLatency
+ || configuration.getOperationType() == Operation.WriteLatency)
+ latency = metricsRegistry.timer("Latency");
+
+ reporter.start(configuration.getPrintingInterval(), TimeUnit.SECONDS);
+
+ long startTime = System.currentTimeMillis();
+
+ AtomicLong count = new AtomicLong(0);
+ long i;
+ for ( i = 0; shouldContinue(startTime, i); i++) {
+
+ BaseSubscriber baseSubscriber = new BaseSubscriber() {
+ @Override
+ protected void hookOnSubscribe(Subscription subscription) {
+ super.hookOnSubscribe(subscription);
+ }
+
+ @Override
+ protected void hookOnNext(T value) {
+
+ }
+
+ @Override
+ protected void hookOnComplete() {
+ successMeter.mark();
+ concurrencyControlSemaphore.release();
+ AsyncBenchmark.this.onSuccess();
+
+ synchronized (count) {
+ count.incrementAndGet();
+ count.notify();
+ }
+ }
+
+ @Override
+ protected void hookOnError(Throwable throwable) {
+ failureMeter.mark();
+ logger.error("Encountered failure {} on thread {}" ,
+ throwable.getMessage(), Thread.currentThread().getName(), throwable);
+ concurrencyControlSemaphore.release();
+ AsyncBenchmark.this.onError(throwable);
+
+ synchronized (count) {
+ count.incrementAndGet();
+ count.notify();
+ }
+ }
+ };
+
+ performWorkload(baseSubscriber, i);
+ }
+
+ synchronized (count) {
+ while (count.get() < i) {
+ count.wait();
+ }
+ }
+
+ long endTime = System.currentTimeMillis();
+ logger.info("[{}] operations performed in [{}] seconds.",
+ configuration.getNumberOfOperations(), (int) ((endTime - startTime) / 1000));
+
+ reporter.report();
+ reporter.close();
+ }
+}
diff --git a/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncMixedBenchmark.java b/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncMixedBenchmark.java
new file mode 100644
index 0000000000000..618d80556beee
--- /dev/null
+++ b/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncMixedBenchmark.java
@@ -0,0 +1,92 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.azure.data.cosmos.benchmark;
+
+import com.azure.data.cosmos.BridgeInternal;
+import com.azure.data.cosmos.internal.Document;
+import com.azure.data.cosmos.FeedOptions;
+import com.azure.data.cosmos.PartitionKey;
+import com.azure.data.cosmos.internal.RequestOptions;
+import com.azure.data.cosmos.internal.ResourceResponse;
+import org.apache.commons.lang3.RandomStringUtils;
+import reactor.core.publisher.BaseSubscriber;
+import reactor.core.publisher.Flux;
+import reactor.core.scheduler.Schedulers;
+
+import java.util.Random;
+import java.util.UUID;
+
+class AsyncMixedBenchmark extends AsyncBenchmark {
+
+ private final String uuid;
+ private final String dataFieldValue;
+ private final Random r;
+
+ AsyncMixedBenchmark(Configuration cfg) {
+ super(cfg);
+ uuid = UUID.randomUUID().toString();
+ dataFieldValue = RandomStringUtils.randomAlphabetic(configuration.getDocumentDataFieldSize());
+ r = new Random();
+ }
+
+ @Override
+ protected void performWorkload(BaseSubscriber documentBaseSubscriber, long i) throws InterruptedException {
+ Flux obs;
+ if (i % 10 == 0 && i % 100 != 0) {
+
+ String idString = uuid + i;
+ Document newDoc = new Document();
+ newDoc.id(idString);
+ BridgeInternal.setProperty(newDoc, partitionKey, idString);
+ BridgeInternal.setProperty(newDoc, "dataField1", dataFieldValue);
+ BridgeInternal.setProperty(newDoc, "dataField2", dataFieldValue);
+ BridgeInternal.setProperty(newDoc, "dataField3", dataFieldValue);
+ BridgeInternal.setProperty(newDoc, "dataField4", dataFieldValue);
+ BridgeInternal.setProperty(newDoc, "dataField5", dataFieldValue);
+ obs = client.createDocument(getCollectionLink(), newDoc, null, false).map(ResourceResponse::getResource);
+
+ } else if (i % 100 == 0) {
+
+ FeedOptions options = new FeedOptions();
+ options.maxItemCount(10);
+ options.enableCrossPartitionQuery(true);
+
+ String sqlQuery = "Select top 100 * from c order by c._ts";
+ obs = client.queryDocuments(getCollectionLink(), sqlQuery, options)
+ .map(frp -> frp.results().get(0));
+ } else {
+
+ int index = r.nextInt(1000);
+
+ RequestOptions options = new RequestOptions();
+ options.setPartitionKey(new PartitionKey(docsToRead.get(index).id()));
+
+ obs = client.readDocument(getDocumentLink(docsToRead.get(index)), options).map(ResourceResponse::getResource);
+ }
+
+ concurrencyControlSemaphore.acquire();
+
+ obs.subscribeOn(Schedulers.parallel()).subscribe(documentBaseSubscriber);
+ }
+}
diff --git a/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncQueryBenchmark.java b/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncQueryBenchmark.java
new file mode 100644
index 0000000000000..ee592ad291eeb
--- /dev/null
+++ b/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncQueryBenchmark.java
@@ -0,0 +1,110 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.azure.data.cosmos.benchmark;
+
+import com.azure.data.cosmos.internal.Document;
+import com.azure.data.cosmos.FeedOptions;
+import com.azure.data.cosmos.FeedResponse;
+import com.azure.data.cosmos.PartitionKey;
+import reactor.core.publisher.BaseSubscriber;
+import reactor.core.publisher.Flux;
+import reactor.core.scheduler.Schedulers;
+
+import java.util.Random;
+
+class AsyncQueryBenchmark extends AsyncBenchmark> {
+
+ private int pageCount = 0;
+
+ AsyncQueryBenchmark(Configuration cfg) {
+ super(cfg);
+ }
+
+ @Override
+ protected void onSuccess() {
+ pageCount++;
+ if (pageCount % 10000 == 0) {
+ if (pageCount == 0) {
+ return;
+ }
+ logger.info("total pages so far: {}", pageCount);
+ }
+ }
+
+ @Override
+ protected void performWorkload(BaseSubscriber> baseSubscriber, long i) throws InterruptedException {
+
+ Flux> obs;
+ Random r = new Random();
+ FeedOptions options = new FeedOptions();
+
+ if (configuration.getOperationType() == Configuration.Operation.QueryCross) {
+
+ int index = r.nextInt(1000);
+ options.enableCrossPartitionQuery(true);
+ String sqlQuery = "Select * from c where c._rid = \"" + docsToRead.get(index).resourceId() + "\"";
+ obs = client.queryDocuments(getCollectionLink(), sqlQuery, options);
+ } else if (configuration.getOperationType() == Configuration.Operation.QuerySingle) {
+
+ int index = r.nextInt(1000);
+ String pk = docsToRead.get(index).getString("pk");
+ options.partitionKey(new PartitionKey(pk));
+ String sqlQuery = "Select * from c where c.pk = \"" + pk + "\"";
+ obs = client.queryDocuments(getCollectionLink(), sqlQuery, options);
+ } else if (configuration.getOperationType() == Configuration.Operation.QueryParallel) {
+
+ options.maxItemCount(10);
+ options.enableCrossPartitionQuery(true);
+ String sqlQuery = "Select * from c";
+ obs = client.queryDocuments(getCollectionLink(), sqlQuery, options);
+ } else if (configuration.getOperationType() == Configuration.Operation.QueryOrderby) {
+
+ options.maxItemCount(10);
+ options.enableCrossPartitionQuery(true);
+ String sqlQuery = "Select * from c order by c._ts";
+ obs = client.queryDocuments(getCollectionLink(), sqlQuery, options);
+ } else if (configuration.getOperationType() == Configuration.Operation.QueryAggregate) {
+
+ options.maxItemCount(10);
+ options.enableCrossPartitionQuery(true);
+ String sqlQuery = "Select value max(c._ts) from c";
+ obs = client.queryDocuments(getCollectionLink(), sqlQuery, options);
+ } else if (configuration.getOperationType() == Configuration.Operation.QueryAggregateTopOrderby) {
+
+ options.enableCrossPartitionQuery(true);
+ String sqlQuery = "Select top 1 value count(c) from c order by c._ts";
+ obs = client.queryDocuments(getCollectionLink(), sqlQuery, options);
+ } else if (configuration.getOperationType() == Configuration.Operation.QueryTopOrderby) {
+
+ options.enableCrossPartitionQuery(true);
+ String sqlQuery = "Select top 1000 * from c order by c._ts";
+ obs = client.queryDocuments(getCollectionLink(), sqlQuery, options);
+ } else {
+ throw new IllegalArgumentException("Unsupported Operation: " + configuration.getOperationType());
+ }
+ concurrencyControlSemaphore.acquire();
+
+ obs.subscribeOn(Schedulers.parallel()).subscribe(baseSubscriber);
+ }
+}
diff --git a/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncQuerySinglePartitionMultiple.java b/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncQuerySinglePartitionMultiple.java
new file mode 100644
index 0000000000000..a41280c5afe28
--- /dev/null
+++ b/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncQuerySinglePartitionMultiple.java
@@ -0,0 +1,66 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.azure.data.cosmos.benchmark;
+
+import com.azure.data.cosmos.internal.Document;
+import com.azure.data.cosmos.FeedOptions;
+import com.azure.data.cosmos.FeedResponse;
+import com.azure.data.cosmos.PartitionKey;
+import reactor.core.publisher.BaseSubscriber;
+import reactor.core.publisher.Flux;
+import reactor.core.scheduler.Schedulers;
+
+class AsyncQuerySinglePartitionMultiple extends AsyncBenchmark> {
+
+ private static final String SQL_QUERY = "Select * from c where c.pk = \"pk\"";
+ private FeedOptions options;
+ private int pageCount = 0;
+
+ AsyncQuerySinglePartitionMultiple(Configuration cfg) {
+ super(cfg);
+ options = new FeedOptions();
+ options.partitionKey(new PartitionKey("pk"));
+ options.maxItemCount(10);
+ }
+
+ @Override
+ protected void onSuccess() {
+ pageCount++;
+ if (pageCount % 10000 == 0) {
+ if (pageCount == 0) {
+ return;
+ }
+ logger.info("total pages so far: {}", pageCount);
+ }
+ }
+
+ @Override
+ protected void performWorkload(BaseSubscriber> baseSubscriber, long i) throws InterruptedException {
+ Flux> obs = client.queryDocuments(getCollectionLink(), SQL_QUERY, options);
+
+ concurrencyControlSemaphore.acquire();
+
+ obs.subscribeOn(Schedulers.parallel()).subscribe(baseSubscriber);
+ }
+}
diff --git a/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncReadBenchmark.java b/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncReadBenchmark.java
new file mode 100644
index 0000000000000..0e8172ec35287
--- /dev/null
+++ b/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncReadBenchmark.java
@@ -0,0 +1,91 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.azure.data.cosmos.benchmark;
+
+import com.azure.data.cosmos.internal.Document;
+import com.azure.data.cosmos.PartitionKey;
+import com.azure.data.cosmos.internal.RequestOptions;
+import com.azure.data.cosmos.internal.ResourceResponse;
+import com.codahale.metrics.Timer;
+import org.reactivestreams.Subscription;
+import reactor.core.publisher.BaseSubscriber;
+import reactor.core.publisher.Flux;
+import reactor.core.scheduler.Schedulers;
+
+class AsyncReadBenchmark extends AsyncBenchmark> {
+
+ class LatencySubscriber extends BaseSubscriber {
+
+ Timer.Context context;
+ BaseSubscriber> baseSubscriber;
+
+ LatencySubscriber(BaseSubscriber> baseSubscriber) {
+ this.baseSubscriber = baseSubscriber;
+ }
+
+ @Override
+ protected void hookOnSubscribe(Subscription subscription) {
+ super.hookOnSubscribe(subscription);
+ }
+
+ @Override
+ protected void hookOnNext(T value) {
+ }
+
+ @Override
+ protected void hookOnComplete() {
+ context.stop();
+ baseSubscriber.onComplete();
+ }
+
+ @Override
+ protected void hookOnError(Throwable throwable) {
+ context.stop();
+ baseSubscriber.onError(throwable);
+ }
+ }
+
+ AsyncReadBenchmark(Configuration cfg) {
+ super(cfg);
+ }
+
+ @Override
+ protected void performWorkload(BaseSubscriber> baseSubscriber, long i) throws InterruptedException {
+ int index = (int) (i % docsToRead.size());
+ RequestOptions options = new RequestOptions();
+ options.setPartitionKey(new PartitionKey(docsToRead.get(index).id()));
+
+ Flux> obs = client.readDocument(getDocumentLink(docsToRead.get(index)), options);
+
+ concurrencyControlSemaphore.acquire();
+
+ if (configuration.getOperationType() == Configuration.Operation.ReadThroughput) {
+ obs.subscribeOn(Schedulers.parallel()).subscribe(baseSubscriber);
+ } else {
+ LatencySubscriber> latencySubscriber = new LatencySubscriber<>(baseSubscriber);
+ latencySubscriber.context = latency.time();
+ obs.subscribeOn(Schedulers.parallel()).subscribe(latencySubscriber);
+ }
+ }
+}
diff --git a/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncWriteBenchmark.java b/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncWriteBenchmark.java
new file mode 100644
index 0000000000000..54af2e988b8e2
--- /dev/null
+++ b/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/AsyncWriteBenchmark.java
@@ -0,0 +1,105 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.azure.data.cosmos.benchmark;
+
+import com.azure.data.cosmos.BridgeInternal;
+import com.azure.data.cosmos.internal.Document;
+import com.azure.data.cosmos.internal.ResourceResponse;
+import com.codahale.metrics.Timer;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.reactivestreams.Subscription;
+import reactor.core.publisher.BaseSubscriber;
+import reactor.core.publisher.Flux;
+import reactor.core.scheduler.Schedulers;
+
+import java.util.UUID;
+
+class AsyncWriteBenchmark extends AsyncBenchmark> {
+
+ private final String uuid;
+ private final String dataFieldValue;
+
+ class LatencySubscriber extends BaseSubscriber {
+
+ Timer.Context context;
+ BaseSubscriber> baseSubscriber;
+
+ LatencySubscriber(BaseSubscriber> baseSubscriber) {
+ this.baseSubscriber = baseSubscriber;
+ }
+
+ @Override
+ protected void hookOnSubscribe(Subscription subscription) {
+ super.hookOnSubscribe(subscription);
+ }
+
+ @Override
+ protected void hookOnNext(T value) {
+ }
+
+ @Override
+ protected void hookOnComplete() {
+ context.stop();
+ baseSubscriber.onComplete();
+ }
+
+ @Override
+ protected void hookOnError(Throwable throwable) {
+ context.stop();
+ baseSubscriber.onError(throwable);
+ }
+ }
+
+ AsyncWriteBenchmark(Configuration cfg) {
+ super(cfg);
+ uuid = UUID.randomUUID().toString();
+ dataFieldValue = RandomStringUtils.randomAlphabetic(configuration.getDocumentDataFieldSize());
+ }
+
+ @Override
+ protected void performWorkload(BaseSubscriber> baseSubscriber, long i) throws InterruptedException {
+
+ String idString = uuid + i;
+ Document newDoc = new Document();
+ newDoc.id(idString);
+ BridgeInternal.setProperty(newDoc, partitionKey, idString);
+ BridgeInternal.setProperty(newDoc, "dataField1", dataFieldValue);
+ BridgeInternal.setProperty(newDoc, "dataField2", dataFieldValue);
+ BridgeInternal.setProperty(newDoc, "dataField3", dataFieldValue);
+ BridgeInternal.setProperty(newDoc, "dataField4", dataFieldValue);
+ BridgeInternal.setProperty(newDoc, "dataField5", dataFieldValue);
+ Flux> obs = client.createDocument(getCollectionLink(), newDoc, null,
+ false);
+
+ concurrencyControlSemaphore.acquire();
+
+ if (configuration.getOperationType() == Configuration.Operation.WriteThroughput) {
+ obs.subscribeOn(Schedulers.parallel()).subscribe(baseSubscriber);
+ } else {
+ LatencySubscriber> latencySubscriber = new LatencySubscriber<>(baseSubscriber);
+ latencySubscriber.context = latency.time();
+ obs.subscribeOn(Schedulers.parallel()).subscribe(latencySubscriber);
+ }
+ }
+}
diff --git a/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/Configuration.java b/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/Configuration.java
new file mode 100644
index 0000000000000..0a54017429e28
--- /dev/null
+++ b/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/Configuration.java
@@ -0,0 +1,329 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.azure.data.cosmos.benchmark;
+
+import com.azure.data.cosmos.ConnectionMode;
+import com.azure.data.cosmos.ConnectionPolicy;
+import com.azure.data.cosmos.ConsistencyLevel;
+import com.azure.data.cosmos.benchmark.Configuration.Operation.OperationTypeConverter;
+import com.beust.jcommander.IStringConverter;
+import com.beust.jcommander.Parameter;
+import com.beust.jcommander.ParameterException;
+import com.google.common.base.Strings;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.time.Duration;
+import java.util.Arrays;
+
+class Configuration {
+ private final static int GRAPHITE_SERVER_DEFAULT_PORT = 2003;
+
+ @Parameter(names = "-serviceEndpoint", description = "Service Endpoint")
+ private String serviceEndpoint;
+
+ @Parameter(names = "-masterKey", description = "Master Key")
+ private String masterKey;
+
+ @Parameter(names = "-databaseId", description = "Database ID")
+ private String databaseId;
+
+ @Parameter(names = "-collectionId", description = "Collection ID")
+ private String collectionId;
+
+ @Parameter(names = "-useNameLink", description = "Use name Link")
+ private boolean useNameLink = false;
+
+ @Parameter(names = "-documentDataFieldSize", description = "Length of a document data field in characters (16-bit)")
+ private int documentDataFieldSize = 20;
+
+ @Parameter(names = "-maxConnectionPoolSize", description = "Max Connection Pool Size")
+ private Integer maxConnectionPoolSize = 1000;
+
+ @Parameter(names = "-consistencyLevel", description = "Consistency Level", converter = ConsistencyLevelConverter.class)
+ private ConsistencyLevel consistencyLevel = ConsistencyLevel.SESSION;
+
+ @Parameter(names = "-connectionMode", description = "Connection Mode")
+ private ConnectionMode connectionMode = ConnectionMode.DIRECT;
+
+ @Parameter(names = "-graphiteEndpoint", description = "Graphite endpoint")
+ private String graphiteEndpoint;
+
+ @Parameter(names = "-enableJvmStats", description = "Enables JVM Stats")
+ private boolean enableJvmStats;
+
+ @Parameter(names = "-operation", description = "Type of Workload:\n"
+ + "\tReadThroughput- run a READ workload that prints only throughput *\n"
+ + "\tWriteThroughput - run a Write workload that prints only throughput\n"
+ + "\tReadLatency - run a READ workload that prints both throughput and latency *\n"
+ + "\tWriteLatency - run a Write workload that prints both throughput and latency\n"
+ + "\tQueryCross - run a 'Select * from c where c._rid = SOME_RID' workload that prints throughput\n"
+ + "\tQuerySingle - run a 'Select * from c where c.pk = SOME_PK' workload that prints throughput\n"
+ + "\tQuerySingleMany - run a 'Select * from c where c.pk = \"pk\"' workload that prints throughput\n"
+ + "\tQueryParallel - run a 'Select * from c' workload that prints throughput\n"
+ + "\tQueryOrderby - run a 'Select * from c order by c._ts' workload that prints throughput\n"
+ + "\tQueryAggregate - run a 'Select value max(c._ts) from c' workload that prints throughput\n"
+ + "\tQueryAggregateTopOrderby - run a 'Select top 1 value count(c) from c order by c._ts' workload that prints throughput\n"
+ + "\tQueryTopOrderby - run a 'Select top 1000 * from c order by c._ts' workload that prints throughput\n"
+ + "\tMixed - runa workload of 90 reads, 9 writes and 1 QueryTopOrderby per 100 operations *\n"
+ + "\tReadMyWrites - run a workflow of writes followed by reads and queries attempting to read the write.*\n"
+ + "\n\t* writes 10k documents initially, which are used in the reads", converter = OperationTypeConverter.class)
+ private Operation operation = Operation.WriteThroughput;
+
+ @Parameter(names = "-concurrency", description = "Degree of Concurrency in Inserting Documents."
+ + " If this value is not specified, the max connection pool size will be used as the concurrency level.")
+ private Integer concurrency;
+
+ @Parameter(names = "-numberOfOperations", description = "Total NUMBER Of Documents To Insert")
+ private int numberOfOperations = 100000;
+
+ static class DurationConverter implements IStringConverter {
+ @Override
+ public Duration convert(String value) {
+ if (value == null) {
+ return null;
+ }
+
+ return Duration.parse(value);
+ }
+ }
+
+ @Parameter(names = "-maxRunningTimeDuration", description = "Max Running Time Duration", converter = DurationConverter.class)
+ private Duration maxRunningTimeDuration;
+
+ @Parameter(names = "-printingInterval", description = "Interval of time after which Metrics should be printed (seconds)")
+ private int printingInterval = 10;
+
+ @Parameter(names = "-numberOfPreCreatedDocuments", description = "Total NUMBER Of Documents To pre create for a read workload to use")
+ private int numberOfPreCreatedDocuments = 1000;
+
+ @Parameter(names = {"-h", "-help", "--help"}, description = "Help", help = true)
+ private boolean help = false;
+
+ enum Operation {
+ ReadThroughput,
+ WriteThroughput,
+ ReadLatency,
+ WriteLatency,
+ QueryCross,
+ QuerySingle,
+ QuerySingleMany,
+ QueryParallel,
+ QueryOrderby,
+ QueryAggregate,
+ QueryAggregateTopOrderby,
+ QueryTopOrderby,
+ Mixed,
+ ReadMyWrites;
+
+ static Operation fromString(String code) {
+
+ for (Operation output : Operation.values()) {
+ if (output.toString().equalsIgnoreCase(code)) {
+ return output;
+ }
+ }
+
+ return null;
+ }
+
+ static class OperationTypeConverter implements IStringConverter {
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.beust.jcommander.IStringConverter#convert(java.lang.STRING)
+ */
+ @Override
+ public Operation convert(String value) {
+ Operation ret = fromString(value);
+ if (ret == null) {
+ throw new ParameterException("Value " + value + " can not be converted to ClientType. "
+ + "Available values are: " + Arrays.toString(Operation.values()));
+ }
+ return ret;
+ }
+ }
+ }
+
+ private static ConsistencyLevel fromString(String code) {
+ for (ConsistencyLevel output : ConsistencyLevel.values()) {
+ if (output.toString().equalsIgnoreCase(code)) {
+ return output;
+ }
+ }
+ return null;
+ }
+
+ static class ConsistencyLevelConverter implements IStringConverter {
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.beust.jcommander.IStringConverter#convert(java.lang.STRING)
+ */
+ @Override
+ public ConsistencyLevel convert(String value) {
+ ConsistencyLevel ret = fromString(value);
+ if (ret == null) {
+ throw new ParameterException("Value " + value + " can not be converted to ClientType. "
+ + "Available values are: " + Arrays.toString(Operation.values()));
+ }
+ return ret;
+ }
+ }
+
+ Duration getMaxRunningTimeDuration() {
+ return maxRunningTimeDuration;
+ }
+
+ Operation getOperationType() {
+ return operation;
+ }
+
+ int getNumberOfOperations() {
+ return numberOfOperations;
+ }
+
+ String getServiceEndpoint() {
+ return serviceEndpoint;
+ }
+
+ String getMasterKey() {
+ return masterKey;
+ }
+
+ boolean isHelp() {
+ return help;
+ }
+
+ int getDocumentDataFieldSize() {
+ return documentDataFieldSize;
+ }
+
+ ConnectionPolicy getConnectionPolicy() {
+ ConnectionPolicy policy = new ConnectionPolicy();
+ policy.connectionMode(connectionMode);
+ policy.maxPoolSize(maxConnectionPoolSize);
+ return policy;
+ }
+
+ ConsistencyLevel getConsistencyLevel() {
+ return consistencyLevel;
+ }
+
+ String getDatabaseId() {
+ return databaseId;
+ }
+
+ String getCollectionId() {
+ return collectionId;
+ }
+
+ int getNumberOfPreCreatedDocuments() {
+ return numberOfPreCreatedDocuments;
+ }
+
+ int getPrintingInterval() {
+ return printingInterval;
+ }
+
+ int getConcurrency() {
+ if (this.concurrency != null) {
+ return concurrency;
+ } else {
+ return this.maxConnectionPoolSize;
+ }
+ }
+
+ boolean isUseNameLink() {
+ return useNameLink;
+ }
+
+ public boolean isEnableJvmStats() {
+ return enableJvmStats;
+ }
+
+ public String getGraphiteEndpoint() {
+ if (graphiteEndpoint == null) {
+ return null;
+ }
+
+ return StringUtils.substringBeforeLast(graphiteEndpoint, ":");
+ }
+
+ public int getGraphiteEndpointPort() {
+ if (graphiteEndpoint == null) {
+ return -1;
+ }
+
+ String portAsString = Strings.emptyToNull(StringUtils.substringAfterLast(graphiteEndpoint, ":"));
+ if (portAsString == null) {
+ return GRAPHITE_SERVER_DEFAULT_PORT;
+ } else {
+ return Integer.parseInt(portAsString);
+ }
+ }
+
+ public String toString() {
+ return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
+ }
+
+ void tryGetValuesFromSystem() {
+ serviceEndpoint = StringUtils.defaultString(Strings.emptyToNull(System.getenv().get("SERVICE_END_POINT")),
+ serviceEndpoint);
+
+ masterKey = StringUtils.defaultString(Strings.emptyToNull(System.getenv().get("MASTER_KEY")), masterKey);
+
+ databaseId = StringUtils.defaultString(Strings.emptyToNull(System.getenv().get("DATABASE_ID")), databaseId);
+
+ collectionId = StringUtils.defaultString(Strings.emptyToNull(System.getenv().get("COLLECTION_ID")),
+ collectionId);
+
+ documentDataFieldSize = Integer.parseInt(
+ StringUtils.defaultString(Strings.emptyToNull(System.getenv().get("DOCUMENT_DATA_FIELD_SIZE")),
+ Integer.toString(documentDataFieldSize)));
+
+ maxConnectionPoolSize = Integer.parseInt(
+ StringUtils.defaultString(Strings.emptyToNull(System.getenv().get("MAX_CONNECTION_POOL_SIZE")),
+ Integer.toString(maxConnectionPoolSize)));
+
+ ConsistencyLevelConverter consistencyLevelConverter = new ConsistencyLevelConverter();
+ consistencyLevel = consistencyLevelConverter.convert(StringUtils
+ .defaultString(Strings.emptyToNull(System.getenv().get("CONSISTENCY_LEVEL")), consistencyLevel.name()));
+
+ OperationTypeConverter operationTypeConverter = new OperationTypeConverter();
+ operation = operationTypeConverter.convert(
+ StringUtils.defaultString(Strings.emptyToNull(System.getenv().get("OPERATION")), operation.name()));
+
+ String concurrencyValue = StringUtils.defaultString(Strings.emptyToNull(System.getenv().get("CONCURRENCY")),
+ concurrency == null ? null : Integer.toString(concurrency));
+ concurrency = concurrencyValue == null ? null : Integer.parseInt(concurrencyValue);
+
+ String numberOfOperationsValue = StringUtils.defaultString(
+ Strings.emptyToNull(System.getenv().get("NUMBER_OF_OPERATIONS")), Integer.toString(numberOfOperations));
+ numberOfOperations = Integer.parseInt(numberOfOperationsValue);
+ }
+}
diff --git a/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/DocDBUtils.java b/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/DocDBUtils.java
new file mode 100644
index 0000000000000..534603bd67031
--- /dev/null
+++ b/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/DocDBUtils.java
@@ -0,0 +1,65 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.azure.data.cosmos.benchmark;
+
+import com.azure.data.cosmos.internal.AsyncDocumentClient;
+import com.azure.data.cosmos.internal.Database;
+import com.azure.data.cosmos.internal.DocumentCollection;
+import com.azure.data.cosmos.FeedResponse;
+import com.azure.data.cosmos.SqlParameter;
+import com.azure.data.cosmos.SqlParameterList;
+import com.azure.data.cosmos.SqlQuerySpec;
+
+class DocDBUtils {
+
+ private DocDBUtils() {
+ }
+
+ static Database getDatabase(AsyncDocumentClient client, String databaseId) {
+ FeedResponse feedResponsePages = client
+ .queryDatabases(new SqlQuerySpec("SELECT * FROM root r WHERE r.id=@id",
+ new SqlParameterList(new SqlParameter("@id", databaseId))), null)
+ .single().block();
+
+ if (feedResponsePages.results().isEmpty()) {
+ throw new RuntimeException("cannot find datatbase " + databaseId);
+ }
+ return feedResponsePages.results().get(0);
+ }
+
+ static DocumentCollection getCollection(AsyncDocumentClient client, String databaseLink,
+ String collectionId) {
+ FeedResponse feedResponsePages = client
+ .queryCollections(databaseLink,
+ new SqlQuerySpec("SELECT * FROM root r WHERE r.id=@id",
+ new SqlParameterList(new SqlParameter("@id", collectionId))),
+ null)
+ .single().block();
+
+ if (feedResponsePages.results().isEmpty()) {
+ throw new RuntimeException("cannot find collection " + collectionId);
+ }
+ return feedResponsePages.results().get(0);
+ }
+}
diff --git a/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/Main.java b/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/Main.java
new file mode 100644
index 0000000000000..edd3969c89f6e
--- /dev/null
+++ b/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/Main.java
@@ -0,0 +1,98 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.azure.data.cosmos.benchmark;
+
+import com.beust.jcommander.JCommander;
+import com.beust.jcommander.ParameterException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class Main {
+
+ private final static Logger LOGGER = LoggerFactory.getLogger(Main.class);
+
+ public static void main(String[] args) throws Exception {
+ org.apache.log4j.Logger.getLogger("io.netty").setLevel(org.apache.log4j.Level.OFF);
+
+ try {
+ LOGGER.debug("Parsing the arguments ...");
+ Configuration cfg = new Configuration();
+ cfg.tryGetValuesFromSystem();
+
+ JCommander jcommander = new JCommander(cfg, args);
+ if (cfg.isHelp()) {
+ // prints out the usage help
+ jcommander.usage();
+ return;
+ }
+
+ AsyncBenchmark benchmark;
+ switch (cfg.getOperationType()) {
+ case WriteThroughput:
+ case WriteLatency:
+ benchmark = new AsyncWriteBenchmark(cfg);
+ break;
+
+ case ReadThroughput:
+ case ReadLatency:
+ benchmark = new AsyncReadBenchmark(cfg);
+ break;
+
+ case QueryCross:
+ case QuerySingle:
+ case QueryParallel:
+ case QueryOrderby:
+ case QueryAggregate:
+ case QueryTopOrderby:
+ case QueryAggregateTopOrderby:
+ benchmark = new AsyncQueryBenchmark(cfg);
+ break;
+
+ case Mixed:
+ benchmark = new AsyncMixedBenchmark(cfg);
+ break;
+
+ case QuerySingleMany:
+ benchmark = new AsyncQuerySinglePartitionMultiple(cfg);
+ break;
+
+ case ReadMyWrites:
+ benchmark = new ReadMyWriteWorkflow(cfg);
+ break;
+
+ default:
+ throw new RuntimeException(cfg.getOperationType() + " is not supported");
+ }
+
+ benchmark.run();
+ benchmark.shutdown();
+
+ } catch (ParameterException e) {
+ // if any error in parsing the cmd-line options print out the usage help
+ System.err.println("INVALID Usage: " + e.getMessage());
+ System.err.println("Try '-help' for more information.");
+ throw e;
+ }
+ }
+}
diff --git a/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/ReadMyWriteWorkflow.java b/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/ReadMyWriteWorkflow.java
new file mode 100644
index 0000000000000..233f177e3bb66
--- /dev/null
+++ b/sdk/cosmos/benchmark/src/main/java/com/azure/data/cosmos/benchmark/ReadMyWriteWorkflow.java
@@ -0,0 +1,419 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.azure.data.cosmos.benchmark;
+
+import com.azure.data.cosmos.BridgeInternal;
+import com.azure.data.cosmos.internal.Document;
+import com.azure.data.cosmos.FeedOptions;
+import com.azure.data.cosmos.NotFoundException;
+import com.azure.data.cosmos.PartitionKey;
+import com.azure.data.cosmos.SqlParameter;
+import com.azure.data.cosmos.SqlParameterList;
+import com.azure.data.cosmos.SqlQuerySpec;
+import com.azure.data.cosmos.internal.RequestOptions;
+import com.azure.data.cosmos.internal.ResourceResponse;
+import com.azure.data.cosmos.internal.Utils;
+import org.apache.commons.lang3.RandomUtils;
+import reactor.core.publisher.BaseSubscriber;
+import reactor.core.publisher.Flux;
+import reactor.core.scheduler.Schedulers;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+/**
+ * This workflow is intended for session and above consistency levels.
+ *
+ * This workflow first will create some documents in cosmosdb and will store them all in its local cache.
+ * Then at each step will randomly will try to do a write, read its own write, or query for its own write.
+ */
+class ReadMyWriteWorkflow extends AsyncBenchmark {
+ private final static String QUERY_FIELD_NAME = "prop";
+ private final static String ORDER_BY_FIELD_NAME = "_ts";
+ private final static int MAX_TOP_QUERY_COUNT = 2000;
+
+ private ConcurrentHashMap cache;
+ private int cacheSize;
+
+ ReadMyWriteWorkflow(Configuration cfg) {
+ super(cfg);
+ }
+
+ @Override
+ protected void init() {
+ this.cacheSize = configuration.getNumberOfPreCreatedDocuments();
+ this.cache = new ConcurrentHashMap<>();
+ this.populateCache();
+ }
+
+ @Override
+ protected void performWorkload(BaseSubscriber baseSubscriber, long i) throws Exception {
+ Flux obs;
+ boolean readyMyWrite = RandomUtils.nextBoolean();
+ if (readyMyWrite) {
+ // will do a write and immediately upon success will either
+ // do a point read
+ // or single partition query
+ // or cross partition query to find the write.
+ int j = Math.toIntExact(Math.floorMod(i, 3));
+ switch (j) {
+ case 0:
+ // write a random document to cosmodb and update the cache.
+ // then try to read the document which just was written
+ obs = writeDocument()
+ .flatMap(this::readDocument);
+ break;
+ case 1:
+ // write a random document to cosmodb and update the cache.
+ // then try to query for the document which just was written
+ obs = writeDocument()
+ .flatMap(d -> singlePartitionQuery(d)
+ .switchIfEmpty(Flux.error(new NotFoundException(
+ "couldn't find my write in a single partition query!"))));
+ break;
+ case 2:
+ // write a random document to cosmodb and update the cache.
+ // then try to query for the document which just was written
+ obs = writeDocument()
+ .flatMap(d -> xPartitionQuery(generateQuery(d))
+ .switchIfEmpty(Flux.error(new NotFoundException(
+ "couldn't find my write in a cross partition query!"))));
+ break;
+ default:
+ assert false;
+ throw new IllegalStateException();
+ }
+ } else {
+ // will either do
+ // a write
+ // a point read for a in memory cached document
+ // or single partition query for a in memory cached document
+ // or cross partition query for a in memory cached document
+ int j = Math.toIntExact(Math.floorMod(i, 4));
+ switch (j) {
+ case 0:
+ // write a random document to cosmosdb and update the cache
+ obs = writeDocument();
+ break;
+ case 1:
+ // randomly choose a document from the cache and do a single point read
+ obs = readDocument(cache.get(cacheKey()));
+ break;
+ case 2:
+ // randomly choose a document from the cache and do a single partition query
+ obs = singlePartitionQuery(cache.get(cacheKey()))
+ .switchIfEmpty(Flux.error(new NotFoundException(
+ "couldn't find my cached write in a single partition query!")));
+ break;
+ case 3:
+ // randomly choose a document from the cache and do a cross partition query
+ obs = xPartitionQuery(generateRandomQuery())
+ .switchIfEmpty(Flux.error(new NotFoundException(
+ "couldn't find my cached write in a cross partition query!")));
+ break;
+ default:
+ assert false;
+ throw new IllegalStateException();
+ }
+ }
+
+ concurrencyControlSemaphore.acquire();
+
+ obs.subscribeOn(Schedulers.parallel()).subscribe(baseSubscriber);
+ }
+
+ private void populateCache() {
+ ArrayList> list = new ArrayList<>();
+ for (int i = 0; i < cacheSize; i++) {
+ Flux observable = writeDocument(i);
+ list.add(observable);
+ }
+
+ logger.info("PRE-populating {} documents ....", cacheSize);
+ Flux.merge(Flux.fromIterable(list), configuration.getConcurrency()).then().block();
+ logger.info("Finished pre-populating {} documents", cacheSize);
+ }
+
+ /**
+ * Writes a random document to cosmosdb and store it in a random location in the cache.
+ *
+ * @return Observable of document
+ */
+ private Flux writeDocument() {
+ return writeDocument(null);
+ }
+
+ /**
+ * Writes a random document to cosmosdb and store it in the slot i-th in the cache.
+ *
+ * @return Observable of document
+ */
+ private Flux writeDocument(Integer i) {
+ String idString = Utils.randomUUID().toString();
+ String randomVal = Utils.randomUUID().toString();
+ Document document = new Document();
+ document.id(idString);
+ BridgeInternal.setProperty(document, partitionKey, idString);
+ BridgeInternal.setProperty(document, QUERY_FIELD_NAME, randomVal);
+ BridgeInternal.setProperty(document, "dataField1", randomVal);
+ BridgeInternal.setProperty(document, "dataField2", randomVal);
+ BridgeInternal.setProperty(document, "dataField3", randomVal);
+ BridgeInternal.setProperty(document, "dataField4", randomVal);
+
+ Integer key = i == null ? cacheKey() : i;
+ return client.createDocument(getCollectionLink(), document, null, false)
+ .doOnNext(r -> cache.put(key, r.getResource()))
+ .map(ResourceResponse::getResource);
+ }
+
+ /**
+ * given a document tries to read it from cosmosdb
+ *
+ * @param d document to be read
+ * @return Observable of document
+ */
+ private Flux readDocument(Document d) {
+ RequestOptions options = new RequestOptions();
+ options.setPartitionKey(new PartitionKey(d.getString(partitionKey)));
+
+ return client.readDocument(getDocumentLink(d), options)
+ .map(ResourceResponse::getResource);
+ }
+
+ /**
+ * Generates a random query
+ *
+ * @return a randomly generated query
+ */
+ private SqlQuerySpec generateRandomQuery() {
+ int docCount = RandomUtils.nextInt(1, 2);
+ Set keys = new HashSet<>();
+ for (int i = 0; i < docCount; i++) {
+ int key = RandomUtils.nextInt(0, cacheSize);
+ keys.add(key);
+ }
+ List documentList = null;
+ if (RandomUtils.nextBoolean()) {
+ documentList = keys.stream().map(cache::get).collect(Collectors.toList());
+ }
+
+ int top = RandomUtils.nextInt(0, MAX_TOP_QUERY_COUNT);
+ boolean useOrderBy = RandomUtils.nextBoolean();
+
+ return generateQuery(documentList, top > 1000 ? top : null, useOrderBy);
+ }
+
+ /**
+ * given a query returns the corresponding observable result
+ *
+ * @param query to find document
+ * @return Observable document
+ */
+ private Flux xPartitionQuery(SqlQuerySpec query) {
+ FeedOptions options = new FeedOptions();
+ options.maxDegreeOfParallelism(-1);
+ options.enableCrossPartitionQuery(true);
+
+ return client.queryDocuments(getCollectionLink(), query, options)
+ .flatMap(p -> Flux.fromIterable(p.results()));
+ }
+
+ /**
+ * given a document returns the corresponding observable result of issuing a single partition query
+ * for the document.
+ *
+ * @param d document to be queried for.
+ * @return Observable document
+ */
+ private Flux singlePartitionQuery(Document d) {
+ FeedOptions options = new FeedOptions();
+ options.partitionKey(new PartitionKey(d.get(partitionKey)));
+
+ SqlQuerySpec sqlQuerySpec = new SqlQuerySpec(String.format("Select top 100 * from c where c.%s = '%s'",
+ QUERY_FIELD_NAME,
+ d.getString(QUERY_FIELD_NAME)));
+ return client.queryDocuments(getCollectionLink(), sqlQuerySpec, options)
+ .flatMap(p -> Flux.fromIterable(p.results()));
+ }
+
+ /**
+ * Given a document list generates a randomly generated sql query which can find only and only the documents
+ *
+ * The generated query may have a top, orderby, top and orderby.
+ *
+ * @param documentList list of documents to be queried for
+ * @return SqlQuerySpec
+ */
+ private SqlQuerySpec generateQuery(Document... documentList) {
+ return generateQuery(Arrays.asList(documentList));
+ }
+
+ /**
+ * Given a document list generates a randomly generated sql query which can find only and only the documents
+ *
+ * The generated query may have a top, orderby, top and orderby.
+ *
+ * @param documentList list of documents to be queried for
+ * @return SqlQuerySpec
+ */
+ private SqlQuerySpec generateQuery(List documentList) {
+ int top = RandomUtils.nextInt(0, MAX_TOP_QUERY_COUNT);
+ boolean useOrderBy = RandomUtils.nextBoolean();
+
+ return generateQuery(documentList, top >= documentList.size() ? top : null, useOrderBy);
+ }
+
+ /**
+ * Given a document list generates sql query which can find only and only the documents
+ *
+ * @param documentList lists of documents to find
+ * @param topCount if a valid top count, the query will have a top count
+ * @param withOrderBy if not null, the query will have an orderby clause
+ * @return SqlQuerySpec
+ */
+ private SqlQuerySpec generateQuery(List documentList, Integer topCount, boolean withOrderBy) {
+ QueryBuilder queryBuilder = new QueryBuilder();
+ if (withOrderBy) {
+ queryBuilder.orderBy(ORDER_BY_FIELD_NAME);
+ }
+ if (documentList != null && !documentList.isEmpty()) {
+ if (topCount != null) {
+ topCount = Math.max(topCount, documentList.size());
+ }
+
+ queryBuilder.whereClause(QueryBuilder.WhereClause.InWhereClause.asInWhereClause(QUERY_FIELD_NAME, documentList));
+ }
+
+ if ((documentList == null || documentList.isEmpty()) && (topCount == null || topCount <= 0)) {
+ topCount = 100;
+ }
+
+ if (topCount != null) {
+ queryBuilder.top(topCount);
+ }
+
+ return queryBuilder.toSqlQuerySpec();
+ }
+
+ private int cacheKey() {
+ return RandomUtils.nextInt(0, cacheSize);
+ }
+
+ /**
+ * This is used for making random query generation with different terms (top, orderby) easier.
+ */
+ static class QueryBuilder {
+ private String orderByFieldName;
+ private Integer topCount;
+ private WhereClause whereClause;
+
+ QueryBuilder top(int top) {
+ this.topCount = top;
+ return this;
+ }
+
+ QueryBuilder orderBy(String fieldName) {
+ this.orderByFieldName = fieldName;
+ return this;
+ }
+
+ QueryBuilder whereClause(WhereClause whereClause) {
+ this.whereClause = whereClause;
+ return this;
+ }
+
+ static abstract class WhereClause {
+ static class InWhereClause extends WhereClause {
+ private final List parameters;
+ private final String whereCondition;
+
+ static InWhereClause asInWhereClause(String fieldName, List documentList) {
+ List parameters = new ArrayList<>(documentList.size());
+ for (int i = 0; i < documentList.size(); i++) {
+ Object value = documentList.get(i).get(fieldName);
+ SqlParameter sqlParameter = new SqlParameter("@param" + i, value);
+ parameters.add(sqlParameter);
+ }
+
+ return new InWhereClause(fieldName, parameters);
+ }
+
+ InWhereClause(String fieldName, List parameters) {
+ StringBuilder stringBuilder = new StringBuilder();
+ stringBuilder.append(fieldName);
+ stringBuilder.append(" IN (");
+ List params = parameters.stream().map(SqlParameter::name).collect(Collectors.toList());
+ stringBuilder.append(String.join(", ", params));
+ stringBuilder.append(")");
+
+ this.whereCondition = stringBuilder.toString();
+ this.parameters = parameters;
+ }
+
+ @Override
+ String getWhereCondition(String rootName) {
+ return rootName + "." + this.whereCondition;
+ }
+
+ @Override
+ SqlParameterList getSqlParameterCollection() {
+ return new SqlParameterList(this.parameters);
+ }
+ }
+
+ abstract String getWhereCondition(String rootName);
+
+ abstract SqlParameterList getSqlParameterCollection();
+ }
+
+ SqlQuerySpec toSqlQuerySpec() {
+ StringBuilder stringBuilder = new StringBuilder();
+ stringBuilder.append("SELECT");
+
+ if (topCount != null) {
+ stringBuilder.append(" TOP ").append(topCount);
+ }
+
+ stringBuilder.append(" * FROM root");
+ if (whereClause != null) {
+ stringBuilder.append(" WHERE ");
+ stringBuilder.append(whereClause.getWhereCondition("root"));
+
+ }
+
+ if (orderByFieldName != null) {
+ stringBuilder.append(" ORDER BY ").append("root.").append(orderByFieldName);
+ }
+
+ return whereClause == null ?
+ new SqlQuerySpec(stringBuilder.toString()) :
+ new SqlQuerySpec(stringBuilder.toString(), whereClause.getSqlParameterCollection());
+ }
+ }
+}
diff --git a/sdk/cosmos/benchmark/src/main/resources/log4j.properties b/sdk/cosmos/benchmark/src/main/resources/log4j.properties
new file mode 100644
index 0000000000000..7a31b9cb1817a
--- /dev/null
+++ b/sdk/cosmos/benchmark/src/main/resources/log4j.properties
@@ -0,0 +1,14 @@
+# this is the log4j configuration for tests
+
+# Set root logger level to DEBUG and its only appender to A1.
+log4j.rootLogger=INFO, A1
+
+log4j.category.com.azure.data.cosmos.internal.directconnectivity.rntbd=WARN
+log4j.category.io.netty=INFO
+log4j.category.io.reactivex=INFO
+# A1 is set to be a ConsoleAppender.
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+
+# A1 uses PatternLayout.
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%d %5X{pid} [%t] %-5p %c - %m%n
\ No newline at end of file
diff --git a/sdk/cosmos/benchmark/src/test/java/com/azure/data/cosmos/benchmark/QueryBuilderTest.java b/sdk/cosmos/benchmark/src/test/java/com/azure/data/cosmos/benchmark/QueryBuilderTest.java
new file mode 100644
index 0000000000000..6e0580ddcc018
--- /dev/null
+++ b/sdk/cosmos/benchmark/src/test/java/com/azure/data/cosmos/benchmark/QueryBuilderTest.java
@@ -0,0 +1,84 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.azure.data.cosmos.benchmark;
+
+import com.azure.data.cosmos.SqlParameter;
+import com.google.common.collect.ImmutableList;
+import org.testng.annotations.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class QueryBuilderTest {
+
+ @Test(groups = {"unit"})
+ public void basic() {
+ ReadMyWriteWorkflow.QueryBuilder queryBuilder = new ReadMyWriteWorkflow.QueryBuilder();
+ assertThat(queryBuilder.toSqlQuerySpec().queryText())
+ .isEqualTo("SELECT * FROM root");
+ }
+
+ @Test(groups = {"unit"})
+ public void top() {
+ ReadMyWriteWorkflow.QueryBuilder queryBuilder = new ReadMyWriteWorkflow.QueryBuilder();
+ queryBuilder.top(50);
+ assertThat(queryBuilder.toSqlQuerySpec().queryText())
+ .isEqualTo("SELECT TOP 50 * FROM root");
+ }
+
+ @Test(groups = {"unit"})
+ public void orderBy() {
+ ReadMyWriteWorkflow.QueryBuilder queryBuilder = new ReadMyWriteWorkflow.QueryBuilder();
+ queryBuilder.orderBy("prop");
+ assertThat(queryBuilder.toSqlQuerySpec().queryText())
+ .isEqualTo("SELECT * FROM root ORDER BY root.prop");
+ }
+
+ @Test(groups = {"unit"})
+ public void whereInClause() {
+ ReadMyWriteWorkflow.QueryBuilder queryBuilder = new ReadMyWriteWorkflow.QueryBuilder();
+
+ ImmutableList parameters = ImmutableList.of(new SqlParameter("@param1", 1),
+ new SqlParameter("@param2", 2));
+ queryBuilder.whereClause(new ReadMyWriteWorkflow.QueryBuilder.WhereClause.InWhereClause("colName",
+ parameters));
+ assertThat(queryBuilder.toSqlQuerySpec().queryText())
+ .isEqualTo("SELECT * FROM root WHERE root.colName IN (@param1, @param2)");
+ assertThat(queryBuilder.toSqlQuerySpec().parameters()).containsExactlyElementsOf(parameters);
+ }
+
+ @Test(groups = {"unit"})
+ public void topOrderByWhereClause() {
+ ReadMyWriteWorkflow.QueryBuilder queryBuilder = new ReadMyWriteWorkflow.QueryBuilder();
+ queryBuilder.orderBy("prop");
+ queryBuilder.top(5);
+
+ ImmutableList parameters = ImmutableList.of(new SqlParameter("@param1", 1),
+ new SqlParameter("@param2", 2));
+ queryBuilder.whereClause(new ReadMyWriteWorkflow.QueryBuilder.WhereClause.InWhereClause("colName",
+ parameters));
+ assertThat(queryBuilder.toSqlQuerySpec().queryText())
+ .isEqualTo("SELECT TOP 5 * FROM root WHERE root.colName IN (@param1, @param2) ORDER BY root.prop");
+ assertThat(queryBuilder.toSqlQuerySpec().parameters()).containsExactlyElementsOf(parameters);
+ }
+}
diff --git a/sdk/cosmos/benchmark/src/test/java/com/azure/data/cosmos/benchmark/ReadMyWritesConsistencyTest.java b/sdk/cosmos/benchmark/src/test/java/com/azure/data/cosmos/benchmark/ReadMyWritesConsistencyTest.java
new file mode 100644
index 0000000000000..fc7086a6e82da
--- /dev/null
+++ b/sdk/cosmos/benchmark/src/test/java/com/azure/data/cosmos/benchmark/ReadMyWritesConsistencyTest.java
@@ -0,0 +1,226 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.azure.data.cosmos.benchmark;
+
+import com.azure.data.cosmos.internal.AsyncDocumentClient;
+import com.azure.data.cosmos.BridgeInternal;
+import com.azure.data.cosmos.DataType;
+import com.azure.data.cosmos.internal.Database;
+import com.azure.data.cosmos.internal.DocumentCollection;
+import com.azure.data.cosmos.IncludedPath;
+import com.azure.data.cosmos.Index;
+import com.azure.data.cosmos.IndexingPolicy;
+import com.azure.data.cosmos.PartitionKeyDefinition;
+import com.azure.data.cosmos.internal.RequestOptions;
+import com.azure.data.cosmos.internal.TestConfigurations;
+import com.beust.jcommander.JCommander;
+import com.google.common.base.CaseFormat;
+import com.google.common.base.Strings;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import reactor.core.publisher.Flux;
+import reactor.core.scheduler.Schedulers;
+
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ReadMyWritesConsistencyTest {
+ private final static Logger logger = LoggerFactory.getLogger(ReadMyWritesConsistencyTest.class);
+ private final int initialCollectionThroughput = 10_000;
+ private final int newCollectionThroughput = 100_000;
+ private final int delayForInitiationCollectionScaleUpInSeconds = 60;
+ private final Duration defaultMaxRunningTimeInSeconds = Duration.ofMinutes(45);
+
+ private final String maxRunningTime =
+ System.getProperty("MAX_RUNNING_TIME", StringUtils.defaultString(Strings.emptyToNull(
+ System.getenv().get("MAX_RUNNING_TIME")), defaultMaxRunningTimeInSeconds.toString()));
+
+ private final AtomicBoolean collectionScaleUpFailed = new AtomicBoolean(false);
+ private final String desiredConsistency =
+ System.getProperty("DESIRED_CONSISTENCY",
+ StringUtils.defaultString(Strings.emptyToNull(
+ System.getenv().get("DESIRED_CONSISTENCY")), "Session"));
+
+ private final String numberOfOperationsAsString =
+ System.getProperty("NUMBER_OF_OPERATIONS",
+ StringUtils.defaultString(Strings.emptyToNull(
+ System.getenv().get("NUMBER_OF_OPERATIONS")), "-1"));
+
+ private Database database;
+ private DocumentCollection collection;
+
+ @Test(dataProvider = "collectionLinkTypeArgProvider", groups = "e2e")
+ public void readMyWrites(boolean useNameLink) throws Exception {
+ int concurrency = 5;
+ String cmdFormat = "-serviceEndpoint %s -masterKey %s" +
+ " -databaseId %s -collectionId %s" +
+ " -consistencyLevel %s -concurrency %d" +
+ " -numberOfOperations %s" +
+ " -maxRunningTimeDuration %s" +
+ " -operation ReadMyWrites -connectionMode DIRECT -numberOfPreCreatedDocuments 100 " +
+ " -printingInterval 60";
+
+ String cmd = String.format(cmdFormat,
+ TestConfigurations.HOST,
+ TestConfigurations.MASTER_KEY,
+ database.id(),
+ collection.id(),
+ CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, desiredConsistency),
+ concurrency,
+ numberOfOperationsAsString,
+ maxRunningTime)
+ + (useNameLink ? " -useNameLink" : "");
+
+ Configuration cfg = new Configuration();
+ new JCommander(cfg, StringUtils.split(cmd));
+
+ AtomicInteger success = new AtomicInteger();
+ AtomicInteger error = new AtomicInteger();
+
+ ReadMyWriteWorkflow wf = new ReadMyWriteWorkflow(cfg) {
+ @Override
+ protected void onError(Throwable throwable) {
+ error.incrementAndGet();
+ }
+
+ @Override
+ protected void onSuccess() {
+ success.incrementAndGet();
+ }
+ };
+
+ // schedules a collection scale up after a delay
+ scheduleScaleUp(delayForInitiationCollectionScaleUpInSeconds, newCollectionThroughput);
+
+ wf.run();
+ wf.shutdown();
+
+ int numberOfOperations = Integer.parseInt(numberOfOperationsAsString);
+
+ assertThat(error).hasValue(0);
+ assertThat(collectionScaleUpFailed).isFalse();
+
+ if (numberOfOperations > 0) {
+ assertThat(success).hasValue(numberOfOperations);
+ }
+ }
+
+ @BeforeClass(groups = "e2e")
+ public void beforeClass() {
+ RequestOptions options = new RequestOptions();
+ options.setOfferThroughput(initialCollectionThroughput);
+ AsyncDocumentClient housekeepingClient = Utils.housekeepingClient();
+ database = Utils.createDatabaseForTest(housekeepingClient);
+ collection = housekeepingClient.createCollection("dbs/" + database.id(),
+ getCollectionDefinitionWithRangeRangeIndex(),
+ options)
+ .single().block().getResource();
+ housekeepingClient.close();
+ }
+
+ @DataProvider(name = "collectionLinkTypeArgProvider")
+ public Object[][] collectionLinkTypeArgProvider() {
+ return new Object[][]{
+ // is namebased
+ {true},
+ };
+ }
+
+ @AfterClass(groups = "e2e")
+ public void afterClass() {
+ AsyncDocumentClient housekeepingClient = Utils.housekeepingClient();
+ Utils.safeCleanDatabases(housekeepingClient);
+ Utils.safeClean(housekeepingClient, database);
+ Utils.safeClose(housekeepingClient);
+ }
+
+ DocumentCollection getCollectionDefinitionWithRangeRangeIndex() {
+ PartitionKeyDefinition partitionKeyDef = new PartitionKeyDefinition();
+ ArrayList paths = new ArrayList<>();
+ paths.add("/mypk");
+ partitionKeyDef.paths(paths);
+ IndexingPolicy indexingPolicy = new IndexingPolicy();
+ List includedPaths = new ArrayList<>();
+ IncludedPath includedPath = new IncludedPath();
+ includedPath.path("/*");
+ Collection indexes = new ArrayList<>();
+ Index stringIndex = Index.Range(DataType.STRING);
+ BridgeInternal.setProperty(stringIndex, "precision", -1);
+ indexes.add(stringIndex);
+
+ Index numberIndex = Index.Range(DataType.NUMBER);
+ BridgeInternal.setProperty(numberIndex, "precision", -1);
+ indexes.add(numberIndex);
+ includedPath.indexes(indexes);
+ includedPaths.add(includedPath);
+ indexingPolicy.setIncludedPaths(includedPaths);
+
+ DocumentCollection collectionDefinition = new DocumentCollection();
+ collectionDefinition.setIndexingPolicy(indexingPolicy);
+ collectionDefinition.id(UUID.randomUUID().toString());
+ collectionDefinition.setPartitionKey(partitionKeyDef);
+
+ return collectionDefinition;
+ }
+
+ private void scheduleScaleUp(int delayStartInSeconds, int newThroughput) {
+ AsyncDocumentClient housekeepingClient = Utils.housekeepingClient();
+ Flux.just(0L).delayElements(Duration.ofSeconds(delayStartInSeconds), Schedulers.newSingle("ScaleUpThread")).flatMap(aVoid -> {
+
+ // increase throughput to max for a single partition collection to avoid throttling
+ // for bulk insert and later queries.
+ return housekeepingClient.queryOffers(
+ String.format("SELECT * FROM r WHERE r.offerResourceId = '%s'",
+ collection.resourceId())
+ , null).flatMap(page -> Flux.fromIterable(page.results()))
+ .take(1).flatMap(offer -> {
+ logger.info("going to scale up collection, newThroughput {}", newThroughput);
+ offer.setThroughput(newThroughput);
+ return housekeepingClient.replaceOffer(offer);
+ });
+ }).doOnTerminate(housekeepingClient::close)
+ .subscribe(aVoid -> {
+ }, e -> {
+ logger.error("collectionScaleUpFailed to scale up collection", e);
+ collectionScaleUpFailed.set(true);
+ },
+ () -> {
+ logger.info("Collection Scale up request sent to the service");
+
+ }
+ );
+ }
+}
\ No newline at end of file
diff --git a/sdk/cosmos/benchmark/src/test/java/com/azure/data/cosmos/benchmark/Utils.java b/sdk/cosmos/benchmark/src/test/java/com/azure/data/cosmos/benchmark/Utils.java
new file mode 100644
index 0000000000000..641f85e3753a2
--- /dev/null
+++ b/sdk/cosmos/benchmark/src/test/java/com/azure/data/cosmos/benchmark/Utils.java
@@ -0,0 +1,143 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.azure.data.cosmos.benchmark;
+
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+
+import com.azure.data.cosmos.internal.AsyncDocumentClient;
+import com.azure.data.cosmos.ConnectionPolicy;
+import com.azure.data.cosmos.internal.Database;
+import com.azure.data.cosmos.internal.DatabaseForTest;
+import com.azure.data.cosmos.internal.DocumentCollection;
+import com.azure.data.cosmos.FeedResponse;
+import com.azure.data.cosmos.internal.ResourceResponse;
+import com.azure.data.cosmos.RetryOptions;
+import com.azure.data.cosmos.SqlQuerySpec;
+import com.azure.data.cosmos.internal.TestConfigurations;
+import reactor.core.publisher.Flux;
+
+public class Utils {
+ public static AsyncDocumentClient housekeepingClient() {
+ ConnectionPolicy connectionPolicy = new ConnectionPolicy();
+ RetryOptions options = new RetryOptions();
+ options.maxRetryAttemptsOnThrottledRequests(100);
+ options.maxRetryWaitTimeInSeconds(60);
+ connectionPolicy.retryOptions(options);
+ return new AsyncDocumentClient.Builder().withServiceEndpoint(TestConfigurations.HOST)
+ .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
+ .withConnectionPolicy(connectionPolicy)
+ .build();
+ }
+
+ public static String getCollectionLink(Database db, DocumentCollection collection) {
+ return "dbs/" + db.id() + "/colls/" + collection;
+ }
+
+ public static Database createDatabaseForTest(AsyncDocumentClient client) {
+ return DatabaseForTest.create(DatabaseManagerImpl.getInstance(client)).createdDatabase;
+ }
+
+ public static void safeCleanDatabases(AsyncDocumentClient client) {
+ if (client != null) {
+ DatabaseForTest.cleanupStaleTestDatabases(DatabaseManagerImpl.getInstance(client));
+ }
+ }
+
+ public static void safeClean(AsyncDocumentClient client, Database database) {
+ if (database != null) {
+ safeClean(client, database.id());
+ }
+ }
+
+ public static void safeClean(AsyncDocumentClient client, String databaseId) {
+ if (client != null) {
+ if (databaseId != null) {
+ try {
+ client.deleteDatabase("/dbs/" + databaseId, null).then().block();
+ } catch (Exception e) {
+ }
+ }
+ }
+ }
+
+ public static String generateDatabaseId() {
+ return DatabaseForTest.generateId();
+ }
+
+ public static void safeClose(AsyncDocumentClient client) {
+ if (client != null) {
+ client.close();
+ }
+ }
+
+ private static class DatabaseManagerImpl implements DatabaseForTest.DatabaseManager {
+ public static DatabaseManagerImpl getInstance(AsyncDocumentClient client) {
+ return new DatabaseManagerImpl(client);
+ }
+
+ private final AsyncDocumentClient client;
+
+ private DatabaseManagerImpl(AsyncDocumentClient client) {
+ this.client = client;
+ }
+
+ @Override
+ public Flux> queryDatabases(SqlQuerySpec query) {
+ return client.queryDatabases(query, null);
+ }
+
+ @Override
+ public Flux> createDatabase(Database databaseDefinition) {
+ return client.createDatabase(databaseDefinition, null);
+ }
+
+ @Override
+ public Flux> deleteDatabase(String id) {
+
+ return client.deleteDatabase("dbs/" + id, null);
+ }
+ }
+}
\ No newline at end of file
diff --git a/sdk/cosmos/benchmark/src/test/java/com/azure/data/cosmos/benchmark/WorkflowTest.java b/sdk/cosmos/benchmark/src/test/java/com/azure/data/cosmos/benchmark/WorkflowTest.java
new file mode 100644
index 0000000000000..57e611fec82cd
--- /dev/null
+++ b/sdk/cosmos/benchmark/src/test/java/com/azure/data/cosmos/benchmark/WorkflowTest.java
@@ -0,0 +1,350 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.azure.data.cosmos.benchmark;
+
+import com.azure.data.cosmos.internal.AsyncDocumentClient;
+import com.azure.data.cosmos.BridgeInternal;
+import com.azure.data.cosmos.DataType;
+import com.azure.data.cosmos.internal.Database;
+import com.azure.data.cosmos.internal.DocumentCollection;
+import com.azure.data.cosmos.IncludedPath;
+import com.azure.data.cosmos.Index;
+import com.azure.data.cosmos.IndexingPolicy;
+import com.azure.data.cosmos.PartitionKeyDefinition;
+import com.azure.data.cosmos.internal.RequestOptions;
+import com.azure.data.cosmos.internal.TestConfigurations;
+import com.beust.jcommander.JCommander;
+import org.apache.commons.lang3.StringUtils;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class WorkflowTest {
+ private static final int TIMEOUT = 120_000; // 2 minutes
+ private Database database;
+ private DocumentCollection collection;
+
+ @Test(groups = "simple", timeOut = TIMEOUT)
+ public void readMyWritesCLI() throws Exception {
+ String cmdFormat = "-serviceEndpoint %s -masterKey %s" +
+ " -databaseId %s -collectionId %s" +
+ " -consistencyLevel SESSION -concurrency 2 -numberOfOperations 123" +
+ " -operation ReadMyWrites -connectionMode DIRECT -numberOfPreCreatedDocuments 100";
+
+ String cmd = String.format(cmdFormat,
+ TestConfigurations.HOST,
+ TestConfigurations.MASTER_KEY,
+ database.id(),
+ collection.id());
+ Main.main(StringUtils.split(cmd));
+ }
+
+ @Test(dataProvider = "collectionLinkTypeArgProvider", groups = "simple", timeOut = TIMEOUT)
+ public void readMyWrites(boolean useNameLink) throws Exception {
+ int numberOfOperations = 123;
+ String cmdFormat = "-serviceEndpoint %s -masterKey %s" +
+ " -databaseId %s -collectionId %s" +
+ " -consistencyLevel SESSION -concurrency 2 -numberOfOperations %s" +
+ " -operation ReadMyWrites -connectionMode DIRECT -numberOfPreCreatedDocuments 100";
+
+ String cmd = String.format(cmdFormat,
+ TestConfigurations.HOST,
+ TestConfigurations.MASTER_KEY,
+ database.id(),
+ collection.id(),
+ numberOfOperations)
+ + (useNameLink ? " -useNameLink" : "");
+
+ Configuration cfg = new Configuration();
+ new JCommander(cfg, StringUtils.split(cmd));
+
+ AtomicInteger success = new AtomicInteger();
+ AtomicInteger error = new AtomicInteger();
+
+ ReadMyWriteWorkflow wf = new ReadMyWriteWorkflow(cfg) {
+ @Override
+ protected void onError(Throwable throwable) {
+ error.incrementAndGet();
+ }
+
+ @Override
+ protected void onSuccess() {
+ success.incrementAndGet();
+ }
+ };
+
+ wf.run();
+ wf.shutdown();
+
+ assertThat(error).hasValue(0);
+ assertThat(success).hasValue(numberOfOperations);
+ }
+
+ @Test(groups = "simple", timeOut = TIMEOUT)
+ public void writeLatencyCLI() throws Exception {
+ String cmdFormat = "-serviceEndpoint %s -masterKey %s" +
+ " -databaseId %s -collectionId %s" +
+ " -consistencyLevel SESSION -concurrency 2 -numberOfOperations 1000" +
+ " -operation WriteLatency -connectionMode DIRECT";
+
+ String cmd = String.format(cmdFormat,
+ TestConfigurations.HOST,
+ TestConfigurations.MASTER_KEY,
+ database.id(),
+ collection.id());
+ Main.main(StringUtils.split(cmd));
+ }
+
+ @Test(dataProvider = "collectionLinkTypeArgProvider", groups = "simple", timeOut = TIMEOUT)
+ public void writeLatency(boolean useNameLink) throws Exception {
+ int numberOfOperations = 123;
+ String cmdFormat = "-serviceEndpoint %s -masterKey %s" +
+ " -databaseId %s -collectionId %s" +
+ " -consistencyLevel SESSION -concurrency 2 -numberOfOperations %s" +
+ " -operation WriteLatency -connectionMode DIRECT";
+
+ String cmd = String.format(cmdFormat,
+ TestConfigurations.HOST,
+ TestConfigurations.MASTER_KEY,
+ database.id(),
+ collection.id(),
+ numberOfOperations)
+ + (useNameLink ? " -useNameLink" : "");
+
+ Configuration cfg = new Configuration();
+ new JCommander(cfg, StringUtils.split(cmd));
+
+ AtomicInteger success = new AtomicInteger();
+ AtomicInteger error = new AtomicInteger();
+
+ AsyncWriteBenchmark wf = new AsyncWriteBenchmark(cfg) {
+ @Override
+ protected void onError(Throwable throwable) {
+ error.incrementAndGet();
+ }
+
+ @Override
+ protected void onSuccess() {
+ success.incrementAndGet();
+ }
+ };
+
+ wf.run();
+ wf.shutdown();
+
+ assertThat(error).hasValue(0);
+ assertThat(success).hasValue(numberOfOperations);
+ }
+
+ @Test(dataProvider = "collectionLinkTypeArgProvider", groups = "simple", timeOut = TIMEOUT)
+ public void writeThroughput(boolean useNameLink) throws Exception {
+ int numberOfOperations = 123;
+ String cmdFormat = "-serviceEndpoint %s -masterKey %s" +
+ " -databaseId %s -collectionId %s" +
+ " -consistencyLevel SESSION -concurrency 2 -numberOfOperations %s" +
+ " -operation WriteThroughput -connectionMode DIRECT";
+
+ String cmd = String.format(cmdFormat,
+ TestConfigurations.HOST,
+ TestConfigurations.MASTER_KEY,
+ database.id(),
+ collection.id(),
+ numberOfOperations)
+ + (useNameLink ? " -useNameLink" : "");
+
+ Configuration cfg = new Configuration();
+ new JCommander(cfg, StringUtils.split(cmd));
+
+ AtomicInteger success = new AtomicInteger();
+ AtomicInteger error = new AtomicInteger();
+
+ AsyncWriteBenchmark wf = new AsyncWriteBenchmark(cfg) {
+ @Override
+ protected void onError(Throwable throwable) {
+ error.incrementAndGet();
+ }
+
+ @Override
+ protected void onSuccess() {
+ success.incrementAndGet();
+ }
+ };
+
+ wf.run();
+ wf.shutdown();
+
+ assertThat(error).hasValue(0);
+ assertThat(success).hasValue(numberOfOperations);
+ }
+
+ @Test(dataProvider = "collectionLinkTypeArgProvider", groups = "simple", timeOut = TIMEOUT)
+ public void readLatency(boolean useNameLink) throws Exception {
+ int numberOfOperations = 123;
+ String cmdFormat = "-serviceEndpoint %s -masterKey %s" +
+ " -databaseId %s -collectionId %s" +
+ " -consistencyLevel SESSION -concurrency 2 -numberOfOperations %s" +
+ " -operation ReadLatency -connectionMode DIRECT";
+
+ String cmd = String.format(cmdFormat,
+ TestConfigurations.HOST,
+ TestConfigurations.MASTER_KEY,
+ database.id(),
+ collection.id(),
+ numberOfOperations)
+ + (useNameLink ? " -useNameLink" : "");
+
+ Configuration cfg = new Configuration();
+ new JCommander(cfg, StringUtils.split(cmd));
+
+ AtomicInteger success = new AtomicInteger();
+ AtomicInteger error = new AtomicInteger();
+
+ AsyncReadBenchmark wf = new AsyncReadBenchmark(cfg) {
+ @Override
+ protected void onError(Throwable throwable) {
+ error.incrementAndGet();
+ }
+
+ @Override
+ protected void onSuccess() {
+ success.incrementAndGet();
+ }
+ };
+
+ wf.run();
+ wf.shutdown();
+
+ assertThat(error).hasValue(0);
+ assertThat(success).hasValue(numberOfOperations);
+ }
+
+ @Test(dataProvider = "collectionLinkTypeArgProvider", groups = "simple", timeOut = TIMEOUT)
+ public void readThroughput(boolean useNameLink) throws Exception {
+ int numberOfOperations = 123;
+ String cmdFormat = "-serviceEndpoint %s -masterKey %s" +
+ " -databaseId %s -collectionId %s" +
+ " -consistencyLevel SESSION -concurrency 2 -numberOfOperations %s" +
+ " -operation ReadThroughput -connectionMode DIRECT";
+
+ String cmd = String.format(cmdFormat,
+ TestConfigurations.HOST,
+ TestConfigurations.MASTER_KEY,
+ database.id(),
+ collection.id(),
+ numberOfOperations)
+ + (useNameLink ? " -useNameLink" : "");
+
+ Configuration cfg = new Configuration();
+ new JCommander(cfg, StringUtils.split(cmd));
+
+ AtomicInteger success = new AtomicInteger();
+ AtomicInteger error = new AtomicInteger();
+
+ AsyncReadBenchmark wf = new AsyncReadBenchmark(cfg) {
+ @Override
+ protected void onError(Throwable throwable) {
+ error.incrementAndGet();
+ }
+
+ @Override
+ protected void onSuccess() {
+ success.incrementAndGet();
+ }
+ };
+
+ wf.run();
+ wf.shutdown();
+
+ assertThat(error).hasValue(0);
+ assertThat(success).hasValue(numberOfOperations);
+ }
+
+ @BeforeClass(groups = "simple", timeOut = TIMEOUT)
+ public void beforeClass() {
+ RequestOptions options = new RequestOptions();
+ options.setOfferThroughput(10000);
+ AsyncDocumentClient housekeepingClient = Utils.housekeepingClient();
+ database = Utils.createDatabaseForTest(housekeepingClient);
+ collection = housekeepingClient.createCollection("dbs/"+ database.id(),
+ getCollectionDefinitionWithRangeRangeIndex(),
+ options)
+ .single().block().getResource();
+ housekeepingClient.close();
+ }
+
+ @DataProvider(name = "collectionLinkTypeArgProvider")
+ public Object[][] collectionLinkTypeArgProvider() {
+ return new Object[][]{
+ // is namebased
+ {true},
+ {false},
+ };
+ }
+
+ @AfterClass(groups = "simple", timeOut = TIMEOUT)
+ public void afterClass() {
+ AsyncDocumentClient housekeepingClient = Utils.housekeepingClient();
+ Utils.safeCleanDatabases(housekeepingClient);
+ Utils.safeClean(housekeepingClient, database);
+ Utils.safeClose(housekeepingClient);
+ }
+
+ DocumentCollection getCollectionDefinitionWithRangeRangeIndex() {
+ PartitionKeyDefinition partitionKeyDef = new PartitionKeyDefinition();
+ ArrayList paths = new ArrayList<>();
+ paths.add("/mypk");
+ partitionKeyDef.paths(paths);
+ IndexingPolicy indexingPolicy = new IndexingPolicy();
+ List includedPaths = new ArrayList<>();
+ IncludedPath includedPath = new IncludedPath();
+ includedPath.path("/*");
+ Collection indexes = new ArrayList<>();
+ Index stringIndex = Index.Range(DataType.STRING);
+ BridgeInternal.setProperty(stringIndex, "precision", -1);
+ indexes.add(stringIndex);
+
+ Index numberIndex = Index.Range(DataType.NUMBER);
+ BridgeInternal.setProperty(numberIndex, "precision", -1);
+ indexes.add(numberIndex);
+ includedPath.indexes(indexes);
+ includedPaths.add(includedPath);
+ indexingPolicy.setIncludedPaths(includedPaths);
+
+ DocumentCollection collectionDefinition = new DocumentCollection();
+ collectionDefinition.setIndexingPolicy(indexingPolicy);
+ collectionDefinition.id(UUID.randomUUID().toString());
+ collectionDefinition.setPartitionKey(partitionKeyDef);
+
+ return collectionDefinition;
+ }
+}
\ No newline at end of file
diff --git a/sdk/cosmos/changelog/README.md b/sdk/cosmos/changelog/README.md
new file mode 100644
index 0000000000000..7f145864521b5
--- /dev/null
+++ b/sdk/cosmos/changelog/README.md
@@ -0,0 +1,126 @@
+## Changelog
+
+### 2.4.3
+
+- Fixed resource leak issue on closing client
+
+### 2.4.2
+
+- Fixed bugs in continuation token support for cross partition queries
+
+### 2.4.1
+
+- Fixed some bugs in Direct mode.
+- Improved logging in Direct mode.
+- Improved connection management.
+
+### 2.4.0
+
+- Direct GA.
+- Added support for QueryMetrics.
+- Changed the APIs accepting java.util.Collection for which order is important to accept java.util.List instead. Now ConnectionPolicy#getPreferredLocations(), JsonSerialization, and PartitionKey(.) accept List.
+
+### 2.4.0-beta1
+
+- Added support for Direct Https.
+- Changed the APIs accepting java.util.Collection for which order is important to accept java.util.List instead.
+ Now ConnectionPolicy#getPreferredLocations(), JsonSerialization, and PartitionKey(.) accept List.
+- Fixed a Session bug for Document query in Gateway mode.
+- Upgraded dependencies (netty 0.4.20 [github #79](https://github.com/Azure/azure-cosmosdb-java/issues/79), RxJava 1.3.8).
+
+### 2.3.1
+
+- Fix handling very large query responses.
+- Fix resource token handling when instantiating client ([github #78](https://github.com/Azure/azure-cosmosdb-java/issues/78)).
+- Upgraded vulnerable dependency jackson-databind ([github #77](https://github.com/Azure/azure-cosmosdb-java/pull/77)).
+
+### 2.3.0
+
+- Fixed a resource leak bug.
+- Added support for MultiPolygon
+- Added support for custom headers in RequestOptions.
+
+### 2.2.2
+
+- Fixed a packaging bug.
+
+### 2.2.1
+
+- Fixed a NPE bug in write retry path.
+- Fixed a NPE bug in endpoint management.
+- Upgraded vulnerable dependencies ([github #68](https://github.com/Azure/azure-cosmosdb-java/issues/68)).
+- Added support for Netty network logging for troubleshooting.
+
+### 2.2.0
+
+- Added support for Multi-region write.
+
+### 2.1.0
+
+- Added support for Proxy.
+- Added support for resource token authorization.
+- Fixed a bug in handling large partition keys ([github #63](https://github.com/Azure/azure-cosmosdb-java/issues/63)).
+- Documentation improved.
+- SDK restructured into more granular modules.
+
+### 2.0.1
+
+- Fixed a bug for non-english locales ([github #51](https://github.com/Azure/azure-cosmosdb-java/issues/51)).
+- Added helper methods for Conflict resource.
+
+### 2.0.0
+
+- Replaced org.json dependency by jackson due to performance reasons and licensing ([github #29](https://github.com/Azure/azure-cosmosdb-java/issues/29)).
+- Removed deprecated OfferV2 class.
+- Added accessor method to Offer class for throughput content.
+- Any method in Document/Resource returning org.json types changed to return a jackson object type.
+- getObject(.) method of classes extending JsonSerializable changed to return a jackson ObjectNode type.
+- getCollection(.) method changed to return Collection of ObjectNode.
+- Removed JsonSerializable subclasses' constructors with org.json.JSONObject arg.
+- JsonSerializable.toJson (SerializationFormattingPolicy.Indented) now uses two spaces for indentation.
+
+### 1.0.2
+
+- Added support for Unique Index Policy.
+- Added support for limiting response continuation token size in feed options.
+- Added support for Partition Split in Cross Partition Query.
+- Fixed a bug in Json timestamp serialization ([github #32](https://github.com/Azure/azure-cosmosdb-java/issues/32)).
+- Fixed a bug in Json enum serialization.
+- Fixed a bug in managing documents of 2MB size ([github #33](https://github.com/Azure/azure-cosmosdb-java/issues/33)).
+- Dependency com.fasterxml.jackson.core:jackson-databind upgraded to 2.9.5 due to a bug ([jackson-databind: github #1599](https://github.com/FasterXML/jackson-databind/issues/1599))
+- Dependency on rxjava-extras upgraded to 0.8.0.17 due to a bug ([rxjava-extras: github #30](https://github.com/davidmoten/rxjava-extras/issues/30)).
+- The metadata description in pom file updated to be inline with the rest of documentation.
+- Syntax improvement ([github #41](https://github.com/Azure/azure-cosmosdb-java/issues/41)), ([github #40](https://github.com/Azure/azure-cosmosdb-java/issues/40)).
+
+### 1.0.1
+
+- Added back-pressure support in query.
+- Added support for partition key range id in query.
+- Changed to allow larger continuation token in request header (bugfix github #24).
+- netty dependency upgraded to 4.1.22.Final to ensure JVM shuts down after main thread finishes.
+- Changed to avoid passing session token when reading master resources.
+- Added more examples.
+- Added more benchmarking scenarios.
+- Fixed java header files for proper javadoc generation.
+
+### 1.0.0
+
+- Release 1.0.0 has fully end to end support for non-blocking IO using netty library in Gateway mode.
+- Dependency on `azure-documentdb` SDK removed.
+- Artifact id changed to `azure-cosmosdb` from `azure-documentdb-rx` in 0.9.0-rc2.
+- Java package name changed to `com.azure.data.cosmos` from `com.microsoft.azure.documentdb` in 0.9.0-rc2.
+
+### 0.9.0-rc2
+
+- `FeedResponsePage` renamed to `FeedReponse`
+- Some minor modifications to `ConnectionPolicy` configuration.
+ All time fields and methods in ConnectionPolicy suffixed with "InMillis" to be more precise of the time unit.
+- `ConnectionPolicy#setProxy()` removed.
+- `FeedOptions#pageSize` renamed to
+ `FeedOptions#maxItemCount`
+- Release 1.0.0 deprecates 0.9.x releases.
+
+### 0.9.0-rc1
+
+- First release of `azure-documentdb-rx` SDK.
+- CRUD Document API fully non-blocking using netty. Query async API implemented as a wrapper using blocking SDK `azure-documentdb`.
diff --git a/sdk/cosmos/examples/pom.xml b/sdk/cosmos/examples/pom.xml
new file mode 100644
index 0000000000000..f7c52f9f530e5
--- /dev/null
+++ b/sdk/cosmos/examples/pom.xml
@@ -0,0 +1,159 @@
+
+
+
+ 4.0.0
+
+ com.microsoft.azure
+ azure-cosmos-parent
+ 3.0.0
+
+
+ azure-cosmos-examples
+ Async SDK for SQL API of Azure Cosmos DB Service - Examples
+ Examples for Async SDK for SQL API of Azure Cosmos DB Service
+
+
+ UTF-8
+ 1.7.6
+ 1.2.17
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.6.0
+
+ 1.8
+ 1.8
+
+
+
+ org.apache.maven.plugins
+ maven-eclipse-plugin
+ 2.8
+
+
+
+ org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8
+
+
+
+
+
+ org.codehaus.mojo
+ exec-maven-plugin
+ 1.2.1
+
+ com.azure.data.cosmos.benchmark.Main
+
+
+
+ maven-assembly-plugin
+ 2.2
+
+
+ jar-with-dependencies
+
+
+
+ com.azure.data.cosmos.rx.examples.multimaster.samples.Main
+
+
+
+
+
+ make-assembly
+ package
+
+ single
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+ 1.8
+ false
+
+
+ none
+ default-cli
+
+
+
+ true
+
+
+
+
+
+
+ com.microsoft.azure
+ azure-cosmos
+
+
+ com.google.guava
+ guava
+ ${guava.version}
+
+
+ log4j
+ log4j
+ ${log4j.version}
+
+
+ org.slf4j
+ slf4j-api
+ ${slf4j.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+ ${slf4j.version}
+
+
+ org.hamcrest
+ hamcrest-all
+ ${hamcrest.version}
+ test
+
+
+ org.mockito
+ mockito-core
+ ${mockito.version}
+ test
+
+
+ org.testng
+ testng
+ ${testng.version}
+ test
+
+
+
diff --git a/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/examples/AccountSettings.java b/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/examples/AccountSettings.java
new file mode 100644
index 0000000000000..11b748b8710c3
--- /dev/null
+++ b/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/examples/AccountSettings.java
@@ -0,0 +1,59 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.azure.data.cosmos.examples;
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Contains the account configurations for Sample.
+ *
+ * For running tests, you can pass a customized endpoint configuration in one of the following
+ * ways:
+ *
+ *
-DACCOUNT_KEY="[your-key]" -ACCOUNT_HOST="[your-endpoint]" as JVM
+ * command-line option.
+ *
You can set ACCOUNT_KEY and ACCOUNT_HOST as environment variables.
+ *
+ *
+ * If none of the above is set, emulator endpoint will be used.
+ * Emulator http cert is self signed. If you are using emulator,
+ * make sure emulator https certificate is imported
+ * to java trusted cert store:
+ * https://docs.microsoft.com/en-us/azure/cosmos-db/local-emulator-export-ssl-certificates
+ */
+public class AccountSettings {
+ // REPLACE MASTER_KEY and HOST with values from your Azure Cosmos DB account.
+ // The default values are credentials of the local emulator, which are not used in any production environment.
+ public static String MASTER_KEY =
+ System.getProperty("ACCOUNT_KEY",
+ StringUtils.defaultString(StringUtils.trimToNull(
+ System.getenv().get("COSMOS_ACCOUNT_KEY")),
+ "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw=="));
+
+ public static String HOST =
+ System.getProperty("ACCOUNT_HOST",
+ StringUtils.defaultString(StringUtils.trimToNull(
+ System.getenv().get("COSMOS_ACCOUNT_HOST")),
+ "https://localhost:8081/"));
+}
diff --git a/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/examples/BasicDemo.java b/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/examples/BasicDemo.java
new file mode 100644
index 0000000000000..5af0ed8f6febd
--- /dev/null
+++ b/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/examples/BasicDemo.java
@@ -0,0 +1,223 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.azure.data.cosmos.examples;
+
+import com.azure.data.cosmos.CosmosClient;
+import com.azure.data.cosmos.CosmosClientException;
+import com.azure.data.cosmos.CosmosContainer;
+import com.azure.data.cosmos.CosmosContainerProperties;
+import com.azure.data.cosmos.CosmosDatabase;
+import com.azure.data.cosmos.CosmosItem;
+import com.azure.data.cosmos.CosmosItemProperties;
+import com.azure.data.cosmos.CosmosItemResponse;
+import com.azure.data.cosmos.FeedOptions;
+import com.azure.data.cosmos.FeedResponse;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Schedulers;
+
+public class BasicDemo {
+
+ private static final String DATABASE_NAME = "test_db";
+ private static final String CONTAINER_NAME = "test_container";
+
+ private CosmosClient client;
+ private CosmosDatabase database;
+ private CosmosContainer container;
+
+ public static void main(String[] args) {
+ BasicDemo demo = new BasicDemo();
+ demo.start();
+ }
+
+ private void start(){
+ // Get client
+ client = CosmosClient.builder()
+ .endpoint(AccountSettings.HOST)
+ .key(AccountSettings.MASTER_KEY)
+ .build();
+
+ //CREATE a database and a container
+ createDbAndContainerBlocking();
+
+ //Get a proxy reference to container
+ container = client.getDatabase(DATABASE_NAME).getContainer(CONTAINER_NAME);
+
+ CosmosContainer container = client.getDatabase(DATABASE_NAME).getContainer(CONTAINER_NAME);
+ TestObject testObject = new TestObject("item_new_id_1", "test", "test description", "US");
+ TestObject testObject2 = new TestObject("item_new_id_2", "test2", "test description2", "CA");
+
+ //CREATE an Item async
+ Mono itemResponseMono = container.createItem(testObject);
+ //CREATE another Item async
+ Mono itemResponseMono1 = container.createItem(testObject2);
+
+ //Wait for completion
+ try {
+ itemResponseMono.doOnError(throwable -> log("CREATE item 1", throwable))
+ .mergeWith(itemResponseMono1)
+ .doOnError(throwable -> log("CREATE item 2 ", throwable))
+ .doOnComplete(() -> log("Items created"))
+ .publishOn(Schedulers.elastic())
+ .blockLast();
+ }catch (RuntimeException e){
+ log("Couldn't create items due to above exceptions");
+ }
+
+ createAndReplaceItem();
+
+ queryItems();
+
+ queryWithContinuationToken();
+
+ //Close client
+ client.close();
+ log("Completed");
+ }
+
+ private void createAndReplaceItem() {
+ TestObject replaceObject = new TestObject("item_new_id_3", "test3", "test description3", "JP");
+ CosmosItem cosmosItem = null;
+ //CREATE item sync
+ try {
+ cosmosItem = container.createItem(replaceObject)
+ .doOnError(throwable -> log("CREATE 3", throwable))
+ .publishOn(Schedulers.elastic())
+ .block()
+ .item();
+ }catch (RuntimeException e){
+ log("Couldn't create items due to above exceptions");
+ }
+ if(cosmosItem != null) {
+ replaceObject.setName("new name test3");
+
+ //REPLACE the item and wait for completion
+ cosmosItem.replace(replaceObject).block();
+ }
+ }
+
+ private void createDbAndContainerBlocking() {
+ client.createDatabaseIfNotExists(DATABASE_NAME)
+ .doOnSuccess(cosmosDatabaseResponse -> log("Database: " + cosmosDatabaseResponse.database().id()))
+ .flatMap(dbResponse -> dbResponse.database().createContainerIfNotExists(new CosmosContainerProperties(CONTAINER_NAME, "/country")))
+ .doOnSuccess(cosmosContainerResponse -> log("Container: " + cosmosContainerResponse.container().id()))
+ .doOnError(throwable -> log(throwable.getMessage()))
+ .publishOn(Schedulers.elastic())
+ .block();
+ }
+
+ int count = 0;
+ private void queryItems(){
+ log("+ Querying the collection ");
+ String query = "SELECT * from root";
+ FeedOptions options = new FeedOptions();
+ options.enableCrossPartitionQuery(true);
+ options.maxDegreeOfParallelism(2);
+ Flux> queryFlux = container.queryItems(query, options);
+
+ queryFlux.publishOn(Schedulers.elastic()).subscribe(cosmosItemFeedResponse -> {},
+ throwable -> {},
+ () -> {});
+
+ queryFlux.publishOn(Schedulers.elastic())
+ .toIterable()
+ .forEach(cosmosItemFeedResponse ->
+ {
+ log(cosmosItemFeedResponse.results());
+ });
+
+ }
+
+ private void queryWithContinuationToken(){
+ log("+ Query with paging using continuation token");
+ String query = "SELECT * from root r ";
+ FeedOptions options = new FeedOptions();
+ options.enableCrossPartitionQuery(true);
+ options.populateQueryMetrics(true);
+ options.maxItemCount(1);
+ String continuation = null;
+ do{
+ options.requestContinuation(continuation);
+ Flux> queryFlux = container.queryItems(query, options);
+ FeedResponse page = queryFlux.blockFirst();
+ assert page != null;
+ log(page.results());
+ continuation = page.continuationToken();
+ }while(continuation!= null);
+
+ }
+
+ private void log(Object object) {
+ System.out.println(object);
+ }
+
+ private void log(String msg, Throwable throwable){
+ log(msg + ": " + ((CosmosClientException)throwable).statusCode());
+ }
+
+ class TestObject {
+ String id;
+ String name;
+ String description;
+ String country;
+
+ public TestObject(String id, String name, String description, String country) {
+ this.id = id;
+ this.name = name;
+ this.description = description;
+ this.country = country;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getCountry() {
+ return country;
+ }
+
+ public void setCountry(String country) {
+ this.country = country;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+ }
+}
\ No newline at end of file
diff --git a/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/examples/ChangeFeed/SampleChangeFeedProcessor.java b/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/examples/ChangeFeed/SampleChangeFeedProcessor.java
new file mode 100644
index 0000000000000..9267879f9e0f2
--- /dev/null
+++ b/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/examples/ChangeFeed/SampleChangeFeedProcessor.java
@@ -0,0 +1,254 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.azure.data.cosmos.examples.ChangeFeed;
+
+import com.azure.data.cosmos.ChangeFeedProcessor;
+import com.azure.data.cosmos.ConnectionPolicy;
+import com.azure.data.cosmos.ConsistencyLevel;
+import com.azure.data.cosmos.CosmosClient;
+import com.azure.data.cosmos.CosmosClientException;
+import com.azure.data.cosmos.CosmosContainer;
+import com.azure.data.cosmos.CosmosContainerProperties;
+import com.azure.data.cosmos.CosmosContainerRequestOptions;
+import com.azure.data.cosmos.CosmosContainerResponse;
+import com.azure.data.cosmos.CosmosDatabase;
+import com.azure.data.cosmos.CosmosItemProperties;
+import com.azure.data.cosmos.SerializationFormattingPolicy;
+import org.apache.commons.lang3.RandomStringUtils;
+
+import java.time.Duration;
+
+/**
+ * Sample for Change Feed Processor.
+ *
+ */
+public class SampleChangeFeedProcessor {
+
+ public static int WAIT_FOR_WORK = 60;
+ public static final String DATABASE_NAME = "db_" + RandomStringUtils.randomAlphabetic(7);
+ public static final String COLLECTION_NAME = "coll_" + RandomStringUtils.randomAlphabetic(7);
+
+ private static ChangeFeedProcessor changeFeedProcessorInstance;
+ private static boolean isWorkCompleted = false;
+
+ public static void main (String[]args) {
+ System.out.println("BEGIN Sample");
+
+ try {
+
+ System.out.println("-->CREATE DocumentClient");
+ CosmosClient client = getCosmosClient();
+
+ System.out.println("-->CREATE sample's database: " + DATABASE_NAME);
+ CosmosDatabase cosmosDatabase = createNewDatabase(client, DATABASE_NAME);
+
+ System.out.println("-->CREATE container for documents: " + COLLECTION_NAME);
+ CosmosContainer feedContainer = createNewCollection(client, DATABASE_NAME, COLLECTION_NAME);
+
+ System.out.println("-->CREATE container for lease: " + COLLECTION_NAME + "-leases");
+ CosmosContainer leaseContainer = createNewLeaseCollection(client, DATABASE_NAME, COLLECTION_NAME + "-leases");
+
+ changeFeedProcessorInstance = getChangeFeedProcessor("SampleHost_1", feedContainer, leaseContainer);
+
+ changeFeedProcessorInstance.start().subscribe(aVoid -> {
+ createNewDocuments(feedContainer, 10, Duration.ofSeconds(3));
+ isWorkCompleted = true;
+ });
+
+ long remainingWork = WAIT_FOR_WORK;
+ while (!isWorkCompleted && remainingWork > 0) {
+ Thread.sleep(100);
+ remainingWork -= 100;
+ }
+
+ if (isWorkCompleted) {
+ if (changeFeedProcessorInstance != null) {
+ changeFeedProcessorInstance.stop().subscribe().wait(10000);
+ }
+ } else {
+ throw new RuntimeException("The change feed processor initialization and automatic create document feeding process did not complete in the expected time");
+ }
+
+ System.out.println("-->DELETE sample's database: " + DATABASE_NAME);
+ deleteDatabase(cosmosDatabase);
+
+ Thread.sleep(500);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ System.out.println("END Sample");
+ System.exit(0);
+ }
+
+ public static ChangeFeedProcessor getChangeFeedProcessor(String hostName, CosmosContainer feedContainer, CosmosContainer leaseContainer) {
+ return ChangeFeedProcessor.Builder()
+ .hostName(hostName)
+ .feedContainer(feedContainer)
+ .leaseContainer(leaseContainer)
+ .handleChanges(docs -> {
+ System.out.println("--->handleChanges() START");
+
+ for (CosmosItemProperties document : docs) {
+ System.out.println("---->DOCUMENT RECEIVED: " + document.toJson(SerializationFormattingPolicy.INDENTED));
+ }
+ System.out.println("--->handleChanges() END");
+
+ })
+ .build();
+ }
+
+ public static CosmosClient getCosmosClient() {
+
+ return CosmosClient.builder()
+ .endpoint(SampleConfigurations.HOST)
+ .key(SampleConfigurations.MASTER_KEY)
+ .connectionPolicy(ConnectionPolicy.defaultPolicy())
+ .consistencyLevel(ConsistencyLevel.EVENTUAL)
+ .build();
+ }
+
+ public static CosmosDatabase createNewDatabase(CosmosClient client, String databaseName) {
+ return client.createDatabaseIfNotExists(databaseName).block().database();
+ }
+
+ public static void deleteDatabase(CosmosDatabase cosmosDatabase) {
+ cosmosDatabase.delete().block();
+ }
+
+ public static CosmosContainer createNewCollection(CosmosClient client, String databaseName, String collectionName) {
+ CosmosDatabase databaseLink = client.getDatabase(databaseName);
+ CosmosContainer collectionLink = databaseLink.getContainer(collectionName);
+ CosmosContainerResponse containerResponse = null;
+
+ try {
+ containerResponse = collectionLink.read().block();
+
+ if (containerResponse != null) {
+ throw new IllegalArgumentException(String.format("Collection %s already exists in database %s.", collectionName, databaseName));
+ }
+ } catch (RuntimeException ex) {
+ if (ex.getCause() instanceof CosmosClientException) {
+ CosmosClientException cosmosClientException = (CosmosClientException) ex.getCause();
+
+ if (cosmosClientException.statusCode() != 404) {
+ throw ex;
+ }
+ } else {
+ throw ex;
+ }
+ }
+
+ CosmosContainerProperties containerSettings = new CosmosContainerProperties(collectionName, "/id");
+
+ CosmosContainerRequestOptions requestOptions = new CosmosContainerRequestOptions();
+
+ containerResponse = databaseLink.createContainer(containerSettings, 10000, requestOptions).block();
+
+ if (containerResponse == null) {
+ throw new RuntimeException(String.format("Failed to create collection %s in database %s.", collectionName, databaseName));
+ }
+
+ return containerResponse.container();
+ }
+
+ public static CosmosContainer createNewLeaseCollection(CosmosClient client, String databaseName, String leaseCollectionName) {
+ CosmosDatabase databaseLink = client.getDatabase(databaseName);
+ CosmosContainer leaseCollectionLink = databaseLink.getContainer(leaseCollectionName);
+ CosmosContainerResponse leaseContainerResponse = null;
+
+ try {
+ leaseContainerResponse = leaseCollectionLink.read().block();
+
+ if (leaseContainerResponse != null) {
+ leaseCollectionLink.delete().block();
+
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException ex) {
+ ex.printStackTrace();
+ }
+ }
+ } catch (RuntimeException ex) {
+ if (ex.getCause() instanceof CosmosClientException) {
+ CosmosClientException cosmosClientException = (CosmosClientException) ex.getCause();
+
+ if (cosmosClientException.statusCode() != 404) {
+ throw ex;
+ }
+ } else {
+ throw ex;
+ }
+ }
+
+ CosmosContainerProperties containerSettings = new CosmosContainerProperties(leaseCollectionName, "/id");
+ CosmosContainerRequestOptions requestOptions = new CosmosContainerRequestOptions();
+
+ leaseContainerResponse = databaseLink.createContainer(containerSettings, 400,requestOptions).block();
+
+ if (leaseContainerResponse == null) {
+ throw new RuntimeException(String.format("Failed to create collection %s in database %s.", leaseCollectionName, databaseName));
+ }
+
+ return leaseContainerResponse.container();
+ }
+
+ public static void createNewDocuments(CosmosContainer containerClient, int count, Duration delay) {
+ String suffix = RandomStringUtils.randomAlphabetic(10);
+ for (int i = 0; i <= count; i++) {
+ CosmosItemProperties document = new CosmosItemProperties();
+ document.id(String.format("0%d-%s", i, suffix));
+
+ containerClient.createItem(document).subscribe(doc -> {
+ System.out.println("---->DOCUMENT WRITE: " + doc.properties().toJson(SerializationFormattingPolicy.INDENTED));
+ });
+
+ long remainingWork = delay.toMillis();
+ try {
+ while (remainingWork > 0) {
+ Thread.sleep(100);
+ remainingWork -= 100;
+ }
+ } catch (InterruptedException iex) {
+ // exception caught
+ break;
+ }
+ }
+ }
+
+ public static boolean ensureWorkIsDone(Duration delay) {
+ long remainingWork = delay.toMillis();
+ try {
+ while (!isWorkCompleted && remainingWork > 0) {
+ Thread.sleep(100);
+ remainingWork -= 100;
+ }
+ } catch (InterruptedException iex) {
+ return false;
+ }
+
+ return remainingWork > 0;
+ }
+
+}
diff --git a/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/examples/ChangeFeed/SampleConfigurations.java b/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/examples/ChangeFeed/SampleConfigurations.java
new file mode 100644
index 0000000000000..9657dc22363ee
--- /dev/null
+++ b/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/examples/ChangeFeed/SampleConfigurations.java
@@ -0,0 +1,56 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.azure.data.cosmos.examples.ChangeFeed;
+
+import com.google.common.base.Strings;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Contains the configurations for tests.
+ *
+ * For running tests, you can pass a customized endpoint configuration in one of the following
+ * ways:
+ *
+ *
-DACCOUNT_KEY="[your-key]" -ACCOUNT_HOST="[your-endpoint]" as JVM
+ * command-line option.
+ *
You can set ACCOUNT_KEY and ACCOUNT_HOST as environment variables.
+ *
+ *
+ * If none of the above is set, emulator endpoint will be used.
+ */
+public final class SampleConfigurations {
+ // REPLACE MASTER_KEY and HOST with values from your Azure Cosmos DB account.
+ // The default values are credentials of the local emulator, which are not used in any production environment.
+ //
+ public static String MASTER_KEY =
+ System.getProperty("ACCOUNT_KEY",
+ StringUtils.defaultString(Strings.emptyToNull(
+ System.getenv().get("ACCOUNT_KEY")),
+ "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw=="));
+
+ public static String HOST =
+ System.getProperty("ACCOUNT_HOST",
+ StringUtils.defaultString(Strings.emptyToNull(
+ System.getenv().get("ACCOUNT_HOST")),
+ "https://localhost:8081/"));
+}
diff --git a/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/ConfigurationManager.java b/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/ConfigurationManager.java
new file mode 100644
index 0000000000000..4651739076c90
--- /dev/null
+++ b/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/ConfigurationManager.java
@@ -0,0 +1,32 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.azure.data.cosmos.rx.examples.multimaster;
+
+import java.util.Properties;
+
+public class ConfigurationManager {
+ public static Properties getAppSettings() {
+ return System.getProperties();
+ }
+}
diff --git a/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/Helpers.java b/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/Helpers.java
new file mode 100644
index 0000000000000..b6a02833768b2
--- /dev/null
+++ b/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/Helpers.java
@@ -0,0 +1,104 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.azure.data.cosmos.rx.examples.multimaster;
+
+import com.azure.data.cosmos.internal.AsyncDocumentClient;
+import com.azure.data.cosmos.CosmosClientException;
+import com.azure.data.cosmos.internal.Database;
+import com.azure.data.cosmos.internal.DocumentCollection;
+import com.azure.data.cosmos.internal.ResourceResponse;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public class Helpers {
+
+ static public String createDocumentCollectionUri(String databaseName, String collectionName) {
+ return String.format("/dbs/%s/colls/%s", databaseName, collectionName);
+ }
+
+ static public String createDatabaseUri(String databaseName) {
+ return String.format("/dbs/%s", databaseName);
+ }
+
+ static public Mono createDatabaseIfNotExists(AsyncDocumentClient client, String databaseName) {
+
+ return client.readDatabase("/dbs/" + databaseName, null)
+ .onErrorResume(
+ e -> {
+ if (e instanceof CosmosClientException) {
+ CosmosClientException dce = (CosmosClientException) e;
+ if (dce.statusCode() == 404) {
+ // if doesn't exist create it
+
+ Database d = new Database();
+ d.id(databaseName);
+
+ return client.createDatabase(d, null);
+ }
+ }
+
+ return Flux.error(e);
+ }
+ ).map(ResourceResponse::getResource).single();
+ }
+
+ static public Mono createCollectionIfNotExists(AsyncDocumentClient client, String databaseName, String collectionName) {
+ return client.readCollection(createDocumentCollectionUri(databaseName, collectionName), null)
+ .onErrorResume(
+ e -> {
+ if (e instanceof CosmosClientException) {
+ CosmosClientException dce = (CosmosClientException) e;
+ if (dce.statusCode() == 404) {
+ // if doesn't exist create it
+
+ DocumentCollection collection = new DocumentCollection();
+ collection.id(collectionName);
+
+ return client.createCollection(createDatabaseUri(databaseName), collection, null);
+ }
+ }
+
+ return Flux.error(e);
+ }
+ ).map(ResourceResponse::getResource).single();
+ }
+
+ static public Mono createCollectionIfNotExists(AsyncDocumentClient client, String databaseName, DocumentCollection collection) {
+ return client.readCollection(createDocumentCollectionUri(databaseName, collection.id()), null)
+ .onErrorResume(
+ e -> {
+ if (e instanceof CosmosClientException) {
+ CosmosClientException dce = (CosmosClientException) e;
+ if (dce.statusCode() == 404) {
+ // if doesn't exist create it
+
+ return client.createCollection(createDatabaseUri(databaseName), collection, null);
+ }
+ }
+
+ return Flux.error(e);
+ }
+ ).map(ResourceResponse::getResource).single();
+ }
+}
diff --git a/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/samples/ConflictWorker.java b/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/samples/ConflictWorker.java
new file mode 100644
index 0000000000000..720bc936b0ecf
--- /dev/null
+++ b/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/samples/ConflictWorker.java
@@ -0,0 +1,877 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.azure.data.cosmos.rx.examples.multimaster.samples;
+
+import com.azure.data.cosmos.AccessCondition;
+import com.azure.data.cosmos.AccessConditionType;
+import com.azure.data.cosmos.internal.AsyncDocumentClient;
+import com.azure.data.cosmos.BridgeInternal;
+import com.azure.data.cosmos.internal.Conflict;
+import com.azure.data.cosmos.ConflictResolutionPolicy;
+import com.azure.data.cosmos.CosmosClientException;
+import com.azure.data.cosmos.internal.Document;
+import com.azure.data.cosmos.internal.DocumentCollection;
+import com.azure.data.cosmos.FeedResponse;
+import com.azure.data.cosmos.Resource;
+import com.azure.data.cosmos.internal.RequestOptions;
+import com.azure.data.cosmos.internal.ResourceResponse;
+import com.azure.data.cosmos.internal.StoredProcedure;
+import com.azure.data.cosmos.rx.examples.multimaster.Helpers;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import reactor.core.publisher.Flux;
+import reactor.core.scheduler.Scheduler;
+import reactor.core.scheduler.Schedulers;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+public class ConflictWorker {
+ private static Logger logger = LoggerFactory.getLogger(ConflictWorker.class);
+
+ private final Scheduler schedulerForBlockingWork;
+ private final List clients;
+ private final String basicCollectionUri;
+ private final String manualCollectionUri;
+ private final String lwwCollectionUri;
+ private final String udpCollectionUri;
+ private final String databaseName;
+ private final String basicCollectionName;
+ private final String manualCollectionName;
+ private final String lwwCollectionName;
+ private final String udpCollectionName;
+ private final ExecutorService executor;
+
+ public ConflictWorker(String databaseName, String basicCollectionName, String manualCollectionName, String lwwCollectionName, String udpCollectionName) {
+ this.clients = new ArrayList<>();
+ this.basicCollectionUri = Helpers.createDocumentCollectionUri(databaseName, basicCollectionName);
+ this.manualCollectionUri = Helpers.createDocumentCollectionUri(databaseName, manualCollectionName);
+ this.lwwCollectionUri = Helpers.createDocumentCollectionUri(databaseName, lwwCollectionName);
+ this.udpCollectionUri = Helpers.createDocumentCollectionUri(databaseName, udpCollectionName);
+
+ this.databaseName = databaseName;
+ this.basicCollectionName = basicCollectionName;
+ this.manualCollectionName = manualCollectionName;
+ this.lwwCollectionName = lwwCollectionName;
+ this.udpCollectionName = udpCollectionName;
+
+ this.executor = Executors.newFixedThreadPool(100);
+ this.schedulerForBlockingWork = Schedulers.fromExecutor(executor);
+ }
+
+ public void addClient(AsyncDocumentClient client) {
+ this.clients.add(client);
+ }
+
+ private DocumentCollection createCollectionIfNotExists(AsyncDocumentClient createClient, String databaseName, DocumentCollection collection) {
+ return Helpers.createCollectionIfNotExists(createClient, this.databaseName, collection)
+ .subscribeOn(schedulerForBlockingWork).block();
+ }
+
+ private DocumentCollection createCollectionIfNotExists(AsyncDocumentClient createClient, String databaseName, String collectionName) {
+
+ return Helpers.createCollectionIfNotExists(createClient, this.databaseName, this.basicCollectionName)
+ .subscribeOn(schedulerForBlockingWork).block();
+ }
+
+ private DocumentCollection getCollectionDefForManual(String id) {
+ DocumentCollection collection = new DocumentCollection();
+ collection.id(id);
+ ConflictResolutionPolicy policy = ConflictResolutionPolicy.createCustomPolicy();
+ collection.setConflictResolutionPolicy(policy);
+ return collection;
+ }
+
+ private DocumentCollection getCollectionDefForLastWinWrites(String id, String conflictResolutionPath) {
+ DocumentCollection collection = new DocumentCollection();
+ collection.id(id);
+ ConflictResolutionPolicy policy = ConflictResolutionPolicy.createLastWriterWinsPolicy(conflictResolutionPath);
+ collection.setConflictResolutionPolicy(policy);
+ return collection;
+ }
+
+ private DocumentCollection getCollectionDefForCustom(String id, String storedProc) {
+ DocumentCollection collection = new DocumentCollection();
+ collection.id(id);
+ ConflictResolutionPolicy policy = ConflictResolutionPolicy.createCustomPolicy(storedProc);
+ collection.setConflictResolutionPolicy(policy);
+ return collection;
+ }
+
+ public void initialize() throws Exception {
+ AsyncDocumentClient createClient = this.clients.get(0);
+
+ Helpers.createDatabaseIfNotExists(createClient, this.databaseName).subscribeOn(schedulerForBlockingWork).block();
+
+ DocumentCollection basic = createCollectionIfNotExists(createClient, this.databaseName, this.basicCollectionName);
+
+ DocumentCollection manualCollection = createCollectionIfNotExists(createClient,
+ Helpers.createDatabaseUri(this.databaseName), getCollectionDefForManual(this.manualCollectionName));
+
+ DocumentCollection lwwCollection = createCollectionIfNotExists(createClient,
+ Helpers.createDatabaseUri(this.databaseName), getCollectionDefForLastWinWrites(this.lwwCollectionName, "/regionId"));
+
+ DocumentCollection udpCollection = createCollectionIfNotExists(createClient,
+ Helpers.createDatabaseUri(this.databaseName), getCollectionDefForCustom(this.udpCollectionName,
+ String.format("dbs/%s/colls/%s/sprocs/%s", this.databaseName, this.udpCollectionName, "resolver")));
+
+ StoredProcedure lwwSproc = new StoredProcedure();
+ lwwSproc.id("resolver");
+ lwwSproc.setBody(IOUtils.toString(
+ getClass().getClassLoader().getResourceAsStream("resolver-storedproc.txt"), "UTF-8"));
+
+ lwwSproc =
+ getResource(createClient.upsertStoredProcedure(
+ Helpers.createDocumentCollectionUri(this.databaseName, this.udpCollectionName), lwwSproc, null));
+
+ }
+
+ private T getResource(Flux> obs) {
+ return obs.subscribeOn(schedulerForBlockingWork).single().block().getResource();
+ }
+
+ public void runManualConflict() throws Exception {
+ logger.info("\r\nInsert Conflict\r\n");
+ this.runInsertConflictOnManual();
+
+ logger.info("\r\nUPDATE Conflict\r\n");
+ this.runUpdateConflictOnManual();
+
+ logger.info("\r\nDELETE Conflict\r\n");
+ this.runDeleteConflictOnManual();
+ }
+
+ public void runLWWConflict() throws Exception {
+ logger.info("\r\nInsert Conflict\r\n");
+ this.runInsertConflictOnLWW();
+
+ logger.info("\r\nUPDATE Conflict\r\n");
+ this.runUpdateConflictOnLWW();
+
+ logger.info("\r\nDELETE Conflict\r\n");
+ this.runDeleteConflictOnLWW();
+ }
+
+ public void runUDPConflict() throws Exception {
+ logger.info("\r\nInsert Conflict\r\n");
+ this.runInsertConflictOnUdp();
+
+ logger.info("\r\nUPDATE Conflict\r\n");
+ this.runUpdateConflictOnUdp();
+
+ logger.info("\r\nDELETE Conflict\r\n");
+ this.runDeleteConflictOnUdp();
+ }
+
+ public void runInsertConflictOnManual() throws Exception {
+ do {
+ logger.info("1) Performing conflicting insert across {} regions on {}", this.clients.size(), this.manualCollectionName);
+
+ ArrayList> insertTask = new ArrayList<>();
+
+ Document conflictDocument = new Document();
+ conflictDocument.id(UUID.randomUUID().toString());
+
+ int index = 0;
+ for (AsyncDocumentClient client : this.clients) {
+ insertTask.add(this.tryInsertDocument(client, this.manualCollectionUri, conflictDocument, index++));
+ }
+
+ List conflictDocuments = Flux.merge(insertTask).collectList().subscribeOn(schedulerForBlockingWork).single().block();
+
+ if (conflictDocuments.size() == this.clients.size()) {
+ logger.info("2) Caused {} insert conflicts, verifying conflict resolution", conflictDocuments.size());
+
+ for (Document conflictingInsert : conflictDocuments) {
+ this.validateManualConflict(this.clients, conflictingInsert);
+ }
+ break;
+ } else {
+ logger.info("Retrying insert to induce conflicts");
+ }
+ } while (true);
+ }
+
+ public void runUpdateConflictOnManual() throws Exception {
+ do {
+ Document conflictDocument = new Document();
+ conflictDocument.id(UUID.randomUUID().toString());
+
+
+ conflictDocument = this.tryInsertDocument(clients.get(0), this.manualCollectionUri, conflictDocument, 0)
+ .singleOrEmpty().block();
+
+ TimeUnit.SECONDS.sleep(1);//1 Second for write to sync.
+
+
+ logger.info("1) Performing conflicting update across 3 regions on {}", this.manualCollectionName);
+
+ ArrayList> updateTask = new ArrayList<>();
+
+ int index = 0;
+ for (AsyncDocumentClient client : this.clients) {
+ updateTask.add(this.tryUpdateDocument(client, this.manualCollectionUri, conflictDocument, index++));
+ }
+
+ List conflictDocuments = Flux.merge(updateTask).collectList().single().block();
+
+ if (conflictDocuments.size() > 1) {
+ logger.info("2) Caused {} updated conflicts, verifying conflict resolution", conflictDocuments.size());
+
+ for (Document conflictingUpdate : conflictDocuments) {
+ this.validateManualConflict(this.clients, conflictingUpdate);
+ }
+ break;
+ } else {
+ logger.info("Retrying update to induce conflicts");
+ }
+ } while (true);
+ }
+
+ public void runDeleteConflictOnManual() throws Exception {
+ do {
+ Document conflictDocument = new Document();
+ conflictDocument.id(UUID.randomUUID().toString());
+
+ conflictDocument = this.tryInsertDocument(clients.get(0), this.manualCollectionUri, conflictDocument, 0)
+ .singleOrEmpty().block();
+
+ TimeUnit.SECONDS.sleep(10);//1 Second for write to sync.
+
+ logger.info("1) Performing conflicting delete across 3 regions on {}", this.manualCollectionName);
+
+ ArrayList> deleteTask = new ArrayList<>();
+
+ int index = 0;
+ for (AsyncDocumentClient client : this.clients) {
+ deleteTask.add(this.tryDeleteDocument(client, this.manualCollectionUri, conflictDocument, index++));
+ }
+
+ List conflictDocuments = Flux.merge(deleteTask).collectList()
+ .subscribeOn(schedulerForBlockingWork)
+ .single().block();
+
+ if (conflictDocuments.size() > 1) {
+ logger.info("2) Caused {} delete conflicts, verifying conflict resolution", conflictDocuments.size());
+
+ for (Document conflictingDelete : conflictDocuments) {
+ this.validateManualConflict(this.clients, conflictingDelete);
+ }
+
+ break;
+ } else {
+ logger.info("Retrying update to induce conflicts");
+ }
+ } while (true);
+ }
+
+ public void runInsertConflictOnLWW() throws Exception {
+ do {
+ logger.info("Performing conflicting insert across 3 regions");
+
+ ArrayList> insertTask = new ArrayList<>();
+
+ Document conflictDocument = new Document();
+ conflictDocument.id(UUID.randomUUID().toString());
+
+ int index = 0;
+ for (AsyncDocumentClient client : this.clients) {
+ insertTask.add(this.tryInsertDocument(client, this.lwwCollectionUri, conflictDocument, index++));
+ }
+
+ List conflictDocuments = Flux.merge(insertTask).collectList().single().block();
+
+
+ if (conflictDocuments.size() > 1) {
+ logger.info("Inserted {} conflicts, verifying conflict resolution", conflictDocuments.size());
+
+ this.validateLWW(this.clients, conflictDocuments);
+
+ break;
+ } else {
+ logger.info("Retrying insert to induce conflicts");
+ }
+ } while (true);
+ }
+
+ public void runUpdateConflictOnLWW() throws Exception {
+ do {
+ Document conflictDocument = new Document();
+ conflictDocument.id(UUID.randomUUID().toString());
+
+ conflictDocument = this.tryInsertDocument(clients.get(0), this.lwwCollectionUri, conflictDocument, 0)
+ .singleOrEmpty().block();
+
+
+ TimeUnit.SECONDS.sleep(1); //1 Second for write to sync.
+
+ logger.info("1) Performing conflicting update across {} regions on {}", this.clients.size(), this.lwwCollectionUri);
+
+ ArrayList> insertTask = new ArrayList<>();
+
+ int index = 0;
+ for (AsyncDocumentClient client : this.clients) {
+ insertTask.add(this.tryUpdateDocument(client, this.lwwCollectionUri, conflictDocument, index++));
+ }
+
+ List conflictDocuments = Flux.merge(insertTask).collectList().single().block();
+
+
+ if (conflictDocuments.size() > 1) {
+ logger.info("2) Caused {} update conflicts, verifying conflict resolution", conflictDocuments.size());
+
+ this.validateLWW(this.clients, conflictDocuments);
+
+ break;
+ } else {
+ logger.info("Retrying insert to induce conflicts");
+ }
+ } while (true);
+ }
+
+ public void runDeleteConflictOnLWW() throws Exception {
+ do {
+ Document conflictDocument = new Document();
+ conflictDocument.id(UUID.randomUUID().toString());
+
+ conflictDocument = this.tryInsertDocument(clients.get(0), this.lwwCollectionUri, conflictDocument, 0)
+ .singleOrEmpty().block();
+
+
+ TimeUnit.SECONDS.sleep(1); //1 Second for write to sync.
+
+ logger.info("1) Performing conflicting delete across {} regions on {}", this.clients.size(), this.lwwCollectionUri);
+
+ ArrayList> insertTask = new ArrayList<>();
+
+ int index = 0;
+ for (AsyncDocumentClient client : this.clients) {
+ if (index % 2 == 1) {
+ //We delete from region 1, even though region 2 always win.
+ insertTask.add(this.tryDeleteDocument(client, this.lwwCollectionUri, conflictDocument, index++));
+ } else {
+ insertTask.add(this.tryUpdateDocument(client, this.lwwCollectionUri, conflictDocument, index++));
+ }
+ }
+
+ List conflictDocuments = Flux.merge(insertTask).collectList().single().block();
+
+ if (conflictDocuments.size() > 1) {
+ logger.info("Inserted {} conflicts, verifying conflict resolution", conflictDocuments.size());
+
+ //DELETE should always win. irrespective of LWW.
+ this.validateLWW(this.clients, conflictDocuments, true);
+ break;
+ } else {
+ logger.info("Retrying update/delete to induce conflicts");
+ }
+ } while (true);
+ }
+
+ public void runInsertConflictOnUdp() throws Exception {
+ do {
+ logger.info("1) Performing conflicting insert across 3 regions on {}", this.udpCollectionName);
+
+ ArrayList> insertTask = new ArrayList<>();
+
+ Document conflictDocument = new Document();
+ conflictDocument.id(UUID.randomUUID().toString());
+
+ int index = 0;
+ for (AsyncDocumentClient client : this.clients) {
+ insertTask.add(this.tryInsertDocument(client, this.udpCollectionUri, conflictDocument, index++));
+ }
+
+ List conflictDocuments = Flux.merge(insertTask).collectList().single().block();
+
+
+ if (conflictDocuments.size() > 1) {
+ logger.info("2) Caused {} insert conflicts, verifying conflict resolution", conflictDocuments.size());
+
+ this.validateUDPAsync(this.clients, conflictDocuments);
+
+ break;
+ } else {
+ logger.info("Retrying insert to induce conflicts");
+ }
+ } while (true);
+ }
+
+ public void runUpdateConflictOnUdp() throws Exception {
+ do {
+ Document conflictDocument = new Document();
+ conflictDocument.id(UUID.randomUUID().toString());
+
+ conflictDocument = this.tryInsertDocument(clients.get(0), this.udpCollectionUri, conflictDocument, 0)
+ .singleOrEmpty().block();
+
+ TimeUnit.SECONDS.sleep(1); //1 Second for write to sync.
+
+ logger.info("1) Performing conflicting update across 3 regions on {}", this.udpCollectionUri);
+
+ ArrayList> updateTask = new ArrayList<>();
+
+ int index = 0;
+ for (AsyncDocumentClient client : this.clients) {
+ updateTask.add(this.tryUpdateDocument(client, this.udpCollectionUri, conflictDocument, index++));
+ }
+
+ List conflictDocuments = Flux.merge(updateTask).collectList().single().block();
+
+
+ if (conflictDocuments.size() > 1) {
+ logger.info("2) Caused {} update conflicts, verifying conflict resolution", conflictDocuments.size());
+
+ this.validateUDPAsync(this.clients, conflictDocuments);
+
+ break;
+ } else {
+ logger.info("Retrying update to induce conflicts");
+ }
+ } while (true);
+ }
+
+ public void runDeleteConflictOnUdp() throws Exception {
+ do {
+ Document conflictDocument = new Document();
+ conflictDocument.id(UUID.randomUUID().toString());
+
+ conflictDocument = this.tryInsertDocument(clients.get(0), this.udpCollectionUri, conflictDocument, 0)
+ .singleOrEmpty().block();
+
+ TimeUnit.SECONDS.sleep(1); //1 Second for write to sync.
+
+ logger.info("1) Performing conflicting update/delete across 3 regions on {}", this.udpCollectionUri);
+
+ ArrayList> deleteTask = new ArrayList<>();
+
+ int index = 0;
+ for (AsyncDocumentClient client : this.clients) {
+ if (index % 2 == 1) {
+ //We delete from region 1, even though region 2 always win.
+ deleteTask.add(this.tryDeleteDocument(client, this.udpCollectionUri, conflictDocument, index++));
+ } else {
+ deleteTask.add(this.tryUpdateDocument(client, this.udpCollectionUri, conflictDocument, index++));
+ }
+ }
+
+ List conflictDocuments = Flux.merge(deleteTask).collectList().single().block();
+
+ if (conflictDocuments.size() > 1) {
+ logger.info("2) Caused {} delete conflicts, verifying conflict resolution", conflictDocuments.size());
+
+ //DELETE should always win. irrespective of LWW.
+ this.validateUDPAsync(this.clients, conflictDocuments, true);
+ break;
+ } else {
+ logger.info("Retrying update/delete to induce conflicts");
+ }
+ } while (true);
+ }
+
+ private Flux tryInsertDocument(AsyncDocumentClient client, String collectionUri, Document document, int index) {
+
+ logger.debug("region: {}", client.getWriteEndpoint());
+ BridgeInternal.setProperty(document, "regionId", index);
+ BridgeInternal.setProperty(document, "regionEndpoint", client.getReadEndpoint());
+ return client.createDocument(collectionUri, document, null, false)
+ .onErrorResume(e -> {
+ if (hasDocumentClientException(e, 409)) {
+ return Flux.empty();
+ } else {
+ return Flux.error(e);
+ }
+ }).map(ResourceResponse::getResource);
+ }
+
+ private boolean hasDocumentClientException(Throwable e, int statusCode) {
+ if (e instanceof CosmosClientException) {
+ CosmosClientException dce = (CosmosClientException) e;
+ return dce.statusCode() == statusCode;
+ }
+
+ return false;
+ }
+
+ private boolean hasDocumentClientExceptionCause(Throwable e) {
+ while (e != null) {
+ if (e instanceof CosmosClientException) {
+ return true;
+ }
+
+ e = e.getCause();
+ }
+ return false;
+ }
+
+ private boolean hasDocumentClientExceptionCause(Throwable e, int statusCode) {
+ while (e != null) {
+ if (e instanceof CosmosClientException) {
+ CosmosClientException dce = (CosmosClientException) e;
+ return dce.statusCode() == statusCode;
+ }
+
+ e = e.getCause();
+ }
+
+ return false;
+ }
+
+ private Flux tryUpdateDocument(AsyncDocumentClient client, String collectionUri, Document document, int index) {
+ BridgeInternal.setProperty(document, "regionId", index);
+ BridgeInternal.setProperty(document, "regionEndpoint", client.getReadEndpoint());
+
+ RequestOptions options = new RequestOptions();
+ options.setAccessCondition(new AccessCondition());
+ options.getAccessCondition().type(AccessConditionType.IF_MATCH);
+ options.getAccessCondition().condition(document.etag());
+
+
+ return client.replaceDocument(document.selfLink(), document, null).onErrorResume(e -> {
+
+ // pre condition failed
+ if (hasDocumentClientException(e, 412)) {
+ //Lost synchronously or not document yet. No conflict is induced.
+ return Flux.empty();
+
+ }
+ return Flux.error(e);
+ }).map(ResourceResponse::getResource);
+ }
+
+ private Flux tryDeleteDocument(AsyncDocumentClient client, String collectionUri, Document document, int index) {
+ BridgeInternal.setProperty(document, "regionId", index);
+ BridgeInternal.setProperty(document, "regionEndpoint", client.getReadEndpoint());
+
+ RequestOptions options = new RequestOptions();
+ options.setAccessCondition(new AccessCondition());
+ options.getAccessCondition().type(AccessConditionType.IF_MATCH);
+ options.getAccessCondition().condition(document.etag());
+
+
+ return client.deleteDocument(document.selfLink(), options).onErrorResume(e -> {
+
+ // pre condition failed
+ if (hasDocumentClientException(e, 412)) {
+ //Lost synchronously. No conflict is induced.
+ return Flux.empty();
+
+ }
+ return Flux.error(e);
+ }).map(rr -> document);
+ }
+
+ private void validateManualConflict(List clients, Document conflictDocument) throws Exception {
+ boolean conflictExists = false;
+ for (AsyncDocumentClient client : clients) {
+ conflictExists = this.validateManualConflict(client, conflictDocument);
+ }
+
+ if (conflictExists) {
+ this.deleteConflict(conflictDocument);
+ }
+ }
+
+ private boolean isDelete(Conflict conflict) {
+ return StringUtils.equalsIgnoreCase(conflict.getOperationKind(), "delete");
+ }
+
+
+ private boolean equals(String a, String b) {
+ return StringUtils.equals(a, b);
+ }
+
+ private boolean validateManualConflict(AsyncDocumentClient client, Document conflictDocument) throws Exception {
+ while (true) {
+ FeedResponse response = client.readConflicts(this.manualCollectionUri, null)
+ .take(1).single().block();
+
+ for (Conflict conflict : response.results()) {
+ if (!isDelete(conflict)) {
+ Document conflictDocumentContent = conflict.getResource(Document.class);
+ if (equals(conflictDocument.id(), conflictDocumentContent.id())) {
+ if (equals(conflictDocument.resourceId(), conflictDocumentContent.resourceId()) &&
+ equals(conflictDocument.etag(), conflictDocumentContent.etag())) {
+ logger.info("Document from Region {} lost conflict @ {}",
+ conflictDocument.id(),
+ conflictDocument.getInt("regionId"),
+ client.getReadEndpoint());
+ return true;
+ } else {
+ try {
+ //Checking whether this is the winner.
+ Document winnerDocument = client.readDocument(conflictDocument.selfLink(), null)
+ .single().block().getResource();
+ logger.info("Document from region {} won the conflict @ {}",
+ conflictDocument.getInt("regionId"),
+ client.getReadEndpoint());
+ return false;
+ }
+ catch (Exception exception) {
+ if (hasDocumentClientException(exception, 404)) {
+ throw exception;
+ } else {
+ logger.info(
+ "Document from region {} not found @ {}",
+ conflictDocument.getInt("regionId"),
+ client.getReadEndpoint());
+ }
+ }
+ }
+ }
+ } else {
+ if (equals(conflict.getSourceResourceId(), conflictDocument.resourceId())) {
+ logger.info("DELETE conflict found @ {}",
+ client.getReadEndpoint());
+ return false;
+ }
+ }
+ }
+
+ logger.error("Document {} is not found in conflict feed @ {}, retrying",
+ conflictDocument.id(),
+ client.getReadEndpoint());
+
+ TimeUnit.MILLISECONDS.sleep(500);
+ }
+ }
+
+ private void deleteConflict(Document conflictDocument) {
+ AsyncDocumentClient delClient = clients.get(0);
+
+ FeedResponse conflicts = delClient.readConflicts(this.manualCollectionUri, null).take(1).single().block();
+
+ for (Conflict conflict : conflicts.results()) {
+ if (!isDelete(conflict)) {
+ Document conflictContent = conflict.getResource(Document.class);
+ if (equals(conflictContent.resourceId(), conflictDocument.resourceId())
+ && equals(conflictContent.etag(), conflictDocument.etag())) {
+ logger.info("Deleting manual conflict {} from region {}",
+ conflict.getSourceResourceId(),
+ conflictContent.getInt("regionId"));
+ delClient.deleteConflict(conflict.selfLink(), null)
+ .single().block();
+
+ }
+ } else if (equals(conflict.getSourceResourceId(), conflictDocument.resourceId())) {
+ logger.info("Deleting manual conflict {} from region {}",
+ conflict.getSourceResourceId(),
+ conflictDocument.getInt("regionId"));
+ delClient.deleteConflict(conflict.selfLink(), null)
+ .single().block();
+ }
+ }
+ }
+
+ private void validateLWW(List clients, List conflictDocument) throws Exception {
+ validateLWW(clients, conflictDocument, false);
+ }
+
+
+ private void validateLWW(List clients, List conflictDocument, boolean hasDeleteConflict) throws Exception {
+ for (AsyncDocumentClient client : clients) {
+ this.validateLWW(client, conflictDocument, hasDeleteConflict);
+ }
+ }
+
+ private void validateLWW(AsyncDocumentClient client, List conflictDocument, boolean hasDeleteConflict) throws Exception {
+ FeedResponse response = client.readConflicts(this.lwwCollectionUri, null)
+ .take(1).single().block();
+
+ if (response.results().size() != 0) {
+ logger.error("Found {} conflicts in the lww collection", response.results().size());
+ return;
+ }
+
+ if (hasDeleteConflict) {
+ do {
+ try {
+ client.readDocument(conflictDocument.get(0).selfLink(), null).single().block();
+
+ logger.error("DELETE conflict for document {} didnt win @ {}",
+ conflictDocument.get(0).id(),
+ client.getReadEndpoint());
+
+ TimeUnit.MILLISECONDS.sleep(500);
+ } catch (Exception exception) {
+ if (!hasDocumentClientExceptionCause(exception)) {
+ throw exception;
+ }
+
+ // NotFound
+ if (hasDocumentClientExceptionCause(exception, 404)) {
+
+ logger.info("DELETE conflict won @ {}", client.getReadEndpoint());
+ return;
+ } else {
+ logger.error("DELETE conflict for document {} didnt win @ {}",
+ conflictDocument.get(0).id(),
+ client.getReadEndpoint());
+
+ TimeUnit.MILLISECONDS.sleep(500);
+ }
+ }
+ } while (true);
+ }
+
+ Document winnerDocument = null;
+
+ for (Document document : conflictDocument) {
+ if (winnerDocument == null ||
+ winnerDocument.getInt("regionId") <= document.getInt("regionId")) {
+ winnerDocument = document;
+ }
+ }
+
+ logger.info("Document from region {} should be the winner",
+ winnerDocument.getInt("regionId"));
+
+ while (true) {
+ try {
+ Document existingDocument = client.readDocument(winnerDocument.selfLink(), null)
+ .single().block().getResource();
+
+ if (existingDocument.getInt("regionId") == winnerDocument.getInt("regionId")) {
+ logger.info("Winner document from region {} found at {}",
+ existingDocument.getInt("regionId"),
+ client.getReadEndpoint());
+ break;
+ } else {
+ logger.error("Winning document version from region {} is not found @ {}, retrying...",
+ winnerDocument.getInt("regionId"),
+ client.getWriteEndpoint());
+ TimeUnit.MILLISECONDS.sleep(500);
+ }
+ } catch (Exception e) {
+ logger.error("Winner document from region {} is not found @ {}, retrying...",
+ winnerDocument.getInt("regionId"),
+ client.getWriteEndpoint());
+ TimeUnit.MILLISECONDS.sleep(500);
+ }
+ }
+ }
+
+ private void validateUDPAsync(List clients, List conflictDocument) throws Exception {
+ validateUDPAsync(clients, conflictDocument, false);
+ }
+
+ private void validateUDPAsync(List clients, List conflictDocument, boolean hasDeleteConflict) throws Exception {
+ for (AsyncDocumentClient client : clients) {
+ this.validateUDPAsync(client, conflictDocument, hasDeleteConflict);
+ }
+ }
+
+ private String documentNameLink(String collectionId, String documentId) {
+ return String.format("dbs/%s/colls/%s/docs/%s", databaseName, collectionId, documentId);
+ }
+
+ private void validateUDPAsync(AsyncDocumentClient client, List conflictDocument, boolean hasDeleteConflict) throws Exception {
+ FeedResponse response = client.readConflicts(this.udpCollectionUri, null).take(1).single().block();
+
+ if (response.results().size() != 0) {
+ logger.error("Found {} conflicts in the udp collection", response.results().size());
+ return;
+ }
+
+ if (hasDeleteConflict) {
+ do {
+ try {
+ client.readDocument(
+ documentNameLink(udpCollectionName, conflictDocument.get(0).id()), null)
+ .single().block();
+
+ logger.error("DELETE conflict for document {} didnt win @ {}",
+ conflictDocument.get(0).id(),
+ client.getReadEndpoint());
+
+ TimeUnit.MILLISECONDS.sleep(500);
+
+ } catch (Exception exception) {
+ if (hasDocumentClientExceptionCause(exception, 404)) {
+ logger.info("DELETE conflict won @ {}", client.getReadEndpoint());
+ return;
+ } else {
+ logger.error("DELETE conflict for document {} didnt win @ {}",
+ conflictDocument.get(0).id(),
+ client.getReadEndpoint());
+
+ TimeUnit.MILLISECONDS.sleep(500);
+ }
+ }
+ } while (true);
+ }
+
+ Document winnerDocument = null;
+
+ for (Document document : conflictDocument) {
+ if (winnerDocument == null ||
+ winnerDocument.getInt("regionId") <= document.getInt("regionId")) {
+ winnerDocument = document;
+ }
+ }
+
+ logger.info("Document from region {} should be the winner",
+ winnerDocument.getInt("regionId"));
+
+ while (true) {
+ try {
+
+ Document existingDocument = client.readDocument(
+ documentNameLink(udpCollectionName, winnerDocument.id()), null)
+ .single().block().getResource();
+
+ if (existingDocument.getInt("regionId") == winnerDocument.getInt(
+ ("regionId"))) {
+ logger.info("Winner document from region {} found at {}",
+ existingDocument.getInt("regionId"),
+ client.getReadEndpoint());
+ break;
+ } else {
+ logger.error("Winning document version from region {} is not found @ {}, retrying...",
+ winnerDocument.getInt("regionId"),
+ client.getWriteEndpoint());
+ TimeUnit.MILLISECONDS.sleep(500);
+ }
+ } catch (Exception e) {
+ logger.error("Winner document from region {} is not found @ {}, retrying...",
+ winnerDocument.getInt("regionId"),
+ client.getWriteEndpoint());
+ TimeUnit.MILLISECONDS.sleep(500);
+ }
+ }
+ }
+
+ public void shutdown() {
+ this.executor.shutdown();
+ for(AsyncDocumentClient client: clients) {
+ client.close();
+ }
+ }
+}
diff --git a/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/samples/Main.java b/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/samples/Main.java
new file mode 100644
index 0000000000000..b05e012dda6b1
--- /dev/null
+++ b/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/samples/Main.java
@@ -0,0 +1,79 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.azure.data.cosmos.rx.examples.multimaster.samples;
+
+import com.azure.data.cosmos.rx.examples.multimaster.ConfigurationManager;
+import org.apache.commons.io.IOUtils;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+
+public class Main {
+ public static void main(String[] args) throws Exception {
+
+ if (args.length != 1) {
+ help();
+ System.exit(1);
+ }
+
+ try (InputStream inputStream = new FileInputStream(args[0])) {
+ ConfigurationManager.getAppSettings().load(inputStream);
+ System.out.println("Using file " + args[0] + " for the setting.");
+ }
+
+ Main.runScenarios();
+ }
+
+ private static void runScenarios() throws Exception {
+ MultiMasterScenario scenario = new MultiMasterScenario();
+ scenario.initialize();
+
+ scenario.runBasic();
+
+ scenario.runManualConflict();
+ scenario.runLWW();
+ scenario.runUDP();
+
+ System.out.println("Finished");
+
+ //shutting down the active the resources
+ scenario.shutdown();
+ }
+
+ private static void help() throws IOException {
+ System.out.println("Provide the path to setting file in the following format: ");
+ try (InputStream inputStream =
+ Main.class.getClassLoader()
+ .getResourceAsStream("multi-master-sample-config.properties")) {
+
+ IOUtils.copy(inputStream, System.out);
+
+ System.out.println();
+ } catch (Exception e) {
+ throw e;
+ }
+ }
+}
diff --git a/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/samples/MultiMasterScenario.java b/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/samples/MultiMasterScenario.java
new file mode 100644
index 0000000000000..42d31123a67bd
--- /dev/null
+++ b/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/samples/MultiMasterScenario.java
@@ -0,0 +1,166 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.azure.data.cosmos.rx.examples.multimaster.samples;
+
+import com.azure.data.cosmos.internal.AsyncDocumentClient;
+import com.azure.data.cosmos.ConnectionPolicy;
+import com.azure.data.cosmos.ConsistencyLevel;
+import com.azure.data.cosmos.rx.examples.multimaster.ConfigurationManager;
+import com.google.common.base.Preconditions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import reactor.core.publisher.Mono;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class MultiMasterScenario {
+
+ private final static Logger logger = LoggerFactory.getLogger(MultiMasterScenario.class);
+
+ final private String accountEndpoint;
+ final private String accountKey;
+ final private List workers;
+ final private ConflictWorker conflictWorker;
+
+ public MultiMasterScenario() {
+ this.accountEndpoint = ConfigurationManager.getAppSettings().getProperty("endpoint");
+ this.accountKey = ConfigurationManager.getAppSettings().getProperty("key");
+
+ String databaseName = ConfigurationManager.getAppSettings().getProperty("databaseName");
+ String manualCollectionName = ConfigurationManager.getAppSettings().getProperty("manualCollectionName");
+ String lwwCollectionName = ConfigurationManager.getAppSettings().getProperty("lwwCollectionName");
+ String udpCollectionName = ConfigurationManager.getAppSettings().getProperty("udpCollectionName");
+ String basicCollectionName = ConfigurationManager.getAppSettings().getProperty("basicCollectionName");
+ String regionsAsString = ConfigurationManager.getAppSettings().getProperty("regions");
+ Preconditions.checkNotNull(regionsAsString, "regions is required");
+ String[] regions = regionsAsString.split(";");
+ Preconditions.checkArgument(regions.length > 0, "at least one region is required");
+ Preconditions.checkNotNull(accountEndpoint, "accountEndpoint is required");
+ Preconditions.checkNotNull(accountKey, "accountKey is required");
+ Preconditions.checkNotNull(databaseName, "databaseName is required");
+ Preconditions.checkNotNull(manualCollectionName, "manualCollectionName is required");
+ Preconditions.checkNotNull(lwwCollectionName, "lwwCollectionName is required");
+ Preconditions.checkNotNull(udpCollectionName, "udpCollectionName is required");
+ Preconditions.checkNotNull(basicCollectionName, "basicCollectionName is required");
+
+ this.workers = new ArrayList<>();
+ this.conflictWorker = new ConflictWorker(databaseName, basicCollectionName, manualCollectionName, lwwCollectionName, udpCollectionName);
+
+ for (String region : regions) {
+ ConnectionPolicy policy = new ConnectionPolicy();
+ policy.usingMultipleWriteLocations(true);
+ policy.preferredLocations(Collections.singletonList(region));
+
+ AsyncDocumentClient client =
+ new AsyncDocumentClient.Builder()
+ .withMasterKeyOrResourceToken(this.accountKey)
+ .withServiceEndpoint(this.accountEndpoint)
+ .withConsistencyLevel(ConsistencyLevel.EVENTUAL)
+ .withConnectionPolicy(policy).build();
+
+
+ workers.add(new Worker(client, databaseName, basicCollectionName));
+
+ conflictWorker.addClient(client);
+ }
+ }
+
+ public void initialize() throws Exception {
+ this.conflictWorker.initialize();
+ logger.info("Initialized collections.");
+ }
+
+ public void runBasic() throws Exception {
+ logger.info("\n####################################################");
+ logger.info("Basic Active-Active");
+ logger.info("####################################################");
+
+ logger.info("1) Starting insert loops across multiple regions ...");
+
+ List> basicTask = new ArrayList<>();
+
+ int documentsToInsertPerWorker = 100;
+
+ for (Worker worker : this.workers) {
+ basicTask.add(worker.runLoopAsync(documentsToInsertPerWorker));
+ }
+
+ Mono.when(basicTask).block();
+
+ basicTask.clear();
+
+ logger.info("2) Reading from every region ...");
+
+ int expectedDocuments = this.workers.size() * documentsToInsertPerWorker;
+ for (Worker worker : this.workers) {
+ basicTask.add(worker.readAllAsync(expectedDocuments));
+ }
+
+ Mono.when(basicTask).block();
+
+ basicTask.clear();
+
+ logger.info("3) Deleting all the documents ...");
+
+ this.workers.get(0).deleteAll();
+
+ logger.info("####################################################");
+ }
+
+ public void runManualConflict() throws Exception {
+ logger.info("\n####################################################");
+ logger.info("Manual Conflict Resolution");
+ logger.info("####################################################");
+
+ this.conflictWorker.runManualConflict();
+ logger.info("####################################################");
+ }
+
+ public void runLWW() throws Exception {
+ logger.info("\n####################################################");
+ logger.info("LWW Conflict Resolution");
+ logger.info("####################################################");
+
+ this.conflictWorker.runLWWConflict();
+ logger.info("####################################################");
+ }
+
+ public void runUDP() throws Exception {
+ logger.info("\n####################################################");
+ logger.info("UDP Conflict Resolution");
+ logger.info("####################################################");
+
+ this.conflictWorker.runUDPConflict();
+ logger.info("####################################################");
+ }
+
+ public void shutdown() {
+ conflictWorker.shutdown();
+ for(Worker worker: this.workers) {
+ worker.shutdown();
+ }
+ }
+}
diff --git a/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/samples/Worker.java b/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/samples/Worker.java
new file mode 100644
index 0000000000000..f5d7657f89762
--- /dev/null
+++ b/sdk/cosmos/examples/src/main/java/com/azure/data/cosmos/rx/examples/multimaster/samples/Worker.java
@@ -0,0 +1,186 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.azure.data.cosmos.rx.examples.multimaster.samples;
+
+
+import com.azure.data.cosmos.internal.AsyncDocumentClient;
+import com.azure.data.cosmos.CosmosClientException;
+import com.azure.data.cosmos.internal.Document;
+import com.azure.data.cosmos.FeedOptions;
+import com.azure.data.cosmos.FeedResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Scheduler;
+import reactor.core.scheduler.Schedulers;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+public class Worker {
+ private final static Logger logger = LoggerFactory.getLogger(Worker.class);
+
+ private final AsyncDocumentClient client;
+ private final String documentCollectionUri;
+
+ // scheduler for blocking work
+ private final Scheduler schedulerForBlockingWork;
+ private final ExecutorService executor;
+
+ public Worker(AsyncDocumentClient client, String databaseName, String collectionName) {
+ this.client = client;
+ this.documentCollectionUri = String.format("/dbs/%s/colls/%s", databaseName, collectionName);
+ this.executor = Executors.newSingleThreadExecutor();
+ this.schedulerForBlockingWork = Schedulers.fromExecutor(executor);
+ }
+
+ public Mono runLoopAsync(int documentsToInsert) {
+ return Mono.defer(() -> {
+
+ int iterationCount = 0;
+
+ List latency = new ArrayList<>();
+ while (iterationCount++ < documentsToInsert) {
+ long startTick = System.currentTimeMillis();
+
+ Document d = new Document();
+ d.id(UUID.randomUUID().toString());
+
+ this.client.createDocument(this.documentCollectionUri, d, null, false)
+ .subscribeOn(schedulerForBlockingWork).single().block();
+
+ long endTick = System.currentTimeMillis();
+
+ latency.add(endTick - startTick);
+ }
+
+ Collections.sort(latency);
+ int p50Index = (latency.size() / 2);
+
+ logger.info("Inserted {} documents at {} with p50 {} ms",
+ documentsToInsert,
+ this.client.getWriteEndpoint(),
+ latency.get(p50Index));
+
+ return Mono.empty();
+
+ });
+
+ }
+
+
+ public Mono readAllAsync(int expectedNumberOfDocuments) {
+
+ return Mono.defer(() -> {
+
+ while (true) {
+ int totalItemRead = 0;
+ FeedResponse response = null;
+ do {
+
+ FeedOptions options = new FeedOptions();
+ options.requestContinuation(response != null ? response.continuationToken() : null);
+
+ response = this.client.readDocuments(this.documentCollectionUri, options).take(1)
+ .subscribeOn(schedulerForBlockingWork).single().block();
+
+ totalItemRead += response.results().size();
+ } while (response.continuationToken() != null);
+
+ if (totalItemRead < expectedNumberOfDocuments) {
+ logger.info("Total item read {} from {} is less than {}, retrying reads",
+ totalItemRead,
+ this.client.getReadEndpoint(),
+ expectedNumberOfDocuments);
+
+ try {
+ TimeUnit.SECONDS.sleep(1);
+ } catch (InterruptedException e) {
+ logger.info("interrupted");
+ break;
+ }
+ continue;
+ } else {
+ logger.info("READ {} items from {}", totalItemRead, this.client.getReadEndpoint());
+ break;
+ }
+ }
+
+ return Mono.empty();
+ });
+ }
+
+ void deleteAll() {
+ List documents = new ArrayList<>();
+ FeedResponse response = null;
+ do {
+
+ FeedOptions options = new FeedOptions();
+ options.requestContinuation(response != null ? response.continuationToken() : null);
+
+ response = this.client.readDocuments(this.documentCollectionUri, options).take(1)
+ .subscribeOn(schedulerForBlockingWork).single().block();
+
+ documents.addAll(response.results());
+ } while (response.continuationToken() != null);
+
+ for (Document document : documents) {
+ try {
+ this.client.deleteDocument(document.selfLink(), null)
+ .subscribeOn(schedulerForBlockingWork).single().block();
+ } catch (RuntimeException exEx) {
+ CosmosClientException dce = getDocumentClientExceptionCause(exEx);
+
+ if (dce.statusCode() != 404) {
+ logger.info("Error occurred while deleting {} from {}", dce, client.getWriteEndpoint());
+ }
+ }
+ }
+
+ logger.info("Deleted all documents from region {}", this.client.getWriteEndpoint());
+ }
+
+ private CosmosClientException getDocumentClientExceptionCause(Throwable e) {
+ while (e != null) {
+
+ if (e instanceof CosmosClientException) {
+ return (CosmosClientException) e;
+ }
+
+ e = e.getCause();
+ }
+
+ return null;
+ }
+
+ public void shutdown() {
+ executor.shutdown();
+ client.close();
+ }
+}
diff --git a/sdk/cosmos/examples/src/main/resources/log4j.properties b/sdk/cosmos/examples/src/main/resources/log4j.properties
new file mode 100644
index 0000000000000..a8f16e5dee315
--- /dev/null
+++ b/sdk/cosmos/examples/src/main/resources/log4j.properties
@@ -0,0 +1,23 @@
+# this is the log4j configuration for tests
+
+# Set root logger level to DEBUG and its only appender to A1.
+log4j.rootLogger=WARN, A1
+
+log4j.category.io.netty=INFO
+log4j.category.io.reactivex=INFO
+log4j.category.com.azure.data.cosmos.rx.examples.multimaster.samples.ConflictWorker=INFO
+log4j.category.com.azure.data.cosmos.rx.examples.multimaster.samples.Main=INFO
+log4j.category.com.azure.data.cosmos.rx.examples.multimaster.samples.Worker=INFO
+log4j.category.com.azure.data.cosmos.rx.examples.multimaster.samples.MultiMasterScenario=INFO
+log4j.category.com.azure.data.cosmos.rx.examples.multimaster.ConfigurationManager=INFO
+log4j.category.com.azure.data.cosmos.rx.examples.multimaster.Helpers=INFO
+
+# A1 is set to be a ConsoleAppender.
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+
+# A1 uses PatternLayout.
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+#log4j.appender.A1.layout.ConversionPattern=%d %5X{pid} [%t] %-5p - %m%n
+
+log4j.appender.A1.layout.ConversionPattern=%m%n
+
diff --git a/sdk/cosmos/examples/src/main/resources/multi-master-sample-config.properties b/sdk/cosmos/examples/src/main/resources/multi-master-sample-config.properties
new file mode 100644
index 0000000000000..42c20302edc12
--- /dev/null
+++ b/sdk/cosmos/examples/src/main/resources/multi-master-sample-config.properties
@@ -0,0 +1,8 @@
+endpoint=
+key=
+regions=North Central US;North Europe;Southeast Asia
+databaseName=multiMasterDemoDB
+manualCollectionName=myManualCollection
+lwwCollectionName=myLwwCollection
+udpCollectionName=myUdpCollection
+basicCollectionName=myBasicCollection
\ No newline at end of file
diff --git a/sdk/cosmos/examples/src/main/resources/resolver-storedproc.txt b/sdk/cosmos/examples/src/main/resources/resolver-storedproc.txt
new file mode 100644
index 0000000000000..e856721a979ac
--- /dev/null
+++ b/sdk/cosmos/examples/src/main/resources/resolver-storedproc.txt
@@ -0,0 +1,45 @@
+function resolver(incomingRecord, existingRecord, isTombstone, conflictingRecords) {
+ var collection = getContext().getCollection();
+ if (!incomingRecord) {
+ if (existingRecord) {
+ collection.deleteDocument(existingRecord._self, {}, function(err, responseOptions) {
+ if (err) throw err;
+ });
+ }
+ } else if (isTombstone) {
+ // delete always wins.
+ } else {
+ var documentToUse = incomingRecord;
+ if (existingRecord) {
+ if (documentToUse.regionId < existingRecord.regionId) {
+ documentToUse = existingRecord;
+ }
+ }
+ var i;
+ for (i = 0; i < conflictingRecords.length; i++) {
+ if (documentToUse.regionId < conflictingRecords[i].regionId) {
+ documentToUse = conflictingRecords[i];
+ }
+ }
+ tryDelete(conflictingRecords, incomingRecord, existingRecord, documentToUse);
+ }
+ function tryDelete(documents, incoming, existing, documentToInsert) {
+ if (documents.length > 0) {
+ collection.deleteDocument(documents[0]._self, {}, function(err, responseOptions) {
+ if (err) throw err;
+ documents.shift();
+ tryDelete(documents, incoming, existing, documentToInsert);
+ });
+ } else if (existing) {
+ collection.replaceDocument(existing._self, documentToInsert,
+ function(err, documentCreated) {
+ if (err) throw err;
+ });
+ } else {
+ collection.createDocument(collection.getSelfLink(), documentToInsert,
+ function(err, documentCreated) {
+ if (err) throw err;
+ });
+ }
+ }
+}
\ No newline at end of file
diff --git a/sdk/cosmos/examples/src/test/java/com/azure/data/cosmos/DocumentClientTest.java b/sdk/cosmos/examples/src/test/java/com/azure/data/cosmos/DocumentClientTest.java
new file mode 100644
index 0000000000000..2a537e8ed9b39
--- /dev/null
+++ b/sdk/cosmos/examples/src/test/java/com/azure/data/cosmos/DocumentClientTest.java
@@ -0,0 +1,74 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.azure.data.cosmos;
+
+import com.azure.data.cosmos.internal.AsyncDocumentClient;
+import com.google.common.base.Strings;
+import org.testng.ITest;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+
+import java.lang.reflect.Method;
+
+public abstract class DocumentClientTest implements ITest {
+
+ private final AsyncDocumentClient.Builder clientBuilder;
+ private String testName;
+
+ public DocumentClientTest() {
+ this(new AsyncDocumentClient.Builder());
+ }
+
+ public DocumentClientTest(AsyncDocumentClient.Builder clientBuilder) {
+ this.clientBuilder = clientBuilder;
+ }
+
+ public final AsyncDocumentClient.Builder clientBuilder() {
+ return this.clientBuilder;
+ }
+
+ @Override
+ public final String getTestName() {
+ return this.testName;
+ }
+
+ @BeforeMethod(alwaysRun = true)
+ public final void setTestName(Method method) {
+
+ String connectionMode = this.clientBuilder.getConnectionPolicy().connectionMode() == ConnectionMode.DIRECT
+ ? "Direct " + this.clientBuilder.getConfigs().getProtocol()
+ : "Gateway";
+
+ this.testName = Strings.lenientFormat("%s::%s[%s with %s consistency]",
+ method.getDeclaringClass().getSimpleName(),
+ method.getName(),
+ connectionMode,
+ clientBuilder.getDesiredConsistencyLevel());
+ }
+
+ @AfterMethod(alwaysRun = true)
+ public final void unsetTestName() {
+ this.testName = null;
+ }
+}
diff --git a/sdk/cosmos/examples/src/test/java/com/azure/data/cosmos/rx/examples/CollectionCRUDAsyncAPITest.java b/sdk/cosmos/examples/src/test/java/com/azure/data/cosmos/rx/examples/CollectionCRUDAsyncAPITest.java
new file mode 100644
index 0000000000000..7a882bc6540db
--- /dev/null
+++ b/sdk/cosmos/examples/src/test/java/com/azure/data/cosmos/rx/examples/CollectionCRUDAsyncAPITest.java
@@ -0,0 +1,415 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.azure.data.cosmos.rx.examples;
+
+import com.azure.data.cosmos.internal.AsyncDocumentClient;
+import com.azure.data.cosmos.BridgeInternal;
+import com.azure.data.cosmos.ConnectionMode;
+import com.azure.data.cosmos.ConnectionPolicy;
+import com.azure.data.cosmos.ConsistencyLevel;
+import com.azure.data.cosmos.CosmosClientException;
+import com.azure.data.cosmos.DataType;
+import com.azure.data.cosmos.internal.Database;
+import com.azure.data.cosmos.DocumentClientTest;
+import com.azure.data.cosmos.internal.DocumentCollection;
+import com.azure.data.cosmos.FeedResponse;
+import com.azure.data.cosmos.IncludedPath;
+import com.azure.data.cosmos.Index;
+import com.azure.data.cosmos.IndexingPolicy;
+import com.azure.data.cosmos.PartitionKeyDefinition;
+import com.azure.data.cosmos.internal.RequestOptions;
+import com.azure.data.cosmos.internal.ResourceResponse;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+import reactor.core.publisher.Flux;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CountDownLatch;
+import java.util.function.Consumer;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThan;
+
+/**
+ * This integration test class demonstrates how to use Async API to create,
+ * delete, replace, and update Document Collections.
+ *
+ * NOTE: you can use rxJava based async api with java8 lambda expression. Use of
+ * rxJava based async APIs with java8 lambda expressions is much prettier.
+ *
+ * You can also use the async API without java8 lambda expression support.
+ *
+ * For example
+ *
+ *
{@link #createCollection_MultiPartition_Async()} demonstrates how to use async api
+ * with java8 lambda expression.
+ *
+ *
{@link #createCollection_Async_withoutLambda()} demonstrates how to
+ * do the same thing without lambda expression.
+ *
+ *
+ * Also if you need to work with Future or CompletableFuture it is possible to
+ * transform a flux to CompletableFuture. Please see
+ * {@link #transformObservableToCompletableFuture()}
+ *
+ * To Modify the Collection's throughput after it has been created, you need to
+ * update the corresponding Offer. Please see
+ * {@see com.azure.data.cosmos.rx.examples.OfferCRUDAsyncAPITest#testUpdateOffer()}
+ */
+public class CollectionCRUDAsyncAPITest extends DocumentClientTest {
+
+ private final static int TIMEOUT = 120000;
+ private Database createdDatabase;
+ private AsyncDocumentClient client;
+ private DocumentCollection collectionDefinition;
+
+ @BeforeClass(groups = "samples", timeOut = TIMEOUT)
+ public void setUp() {
+
+ ConnectionPolicy connectionPolicy = new ConnectionPolicy().connectionMode(ConnectionMode.DIRECT);
+
+ this.clientBuilder()
+ .withServiceEndpoint(TestConfigurations.HOST)
+ .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
+ .withConnectionPolicy(connectionPolicy)
+ .withConsistencyLevel(ConsistencyLevel.SESSION);
+
+ this.client = this.clientBuilder().build();
+
+ createdDatabase = Utils.createDatabaseForTest(client);
+ }
+
+ @BeforeMethod(groups = "samples", timeOut = TIMEOUT)
+ public void before() {
+ collectionDefinition = new DocumentCollection();
+ collectionDefinition.id(UUID.randomUUID().toString());
+ PartitionKeyDefinition partitionKeyDef = new PartitionKeyDefinition();
+ ArrayList paths = new ArrayList();
+ paths.add("/mypk");
+ partitionKeyDef.paths(paths);
+ collectionDefinition.setPartitionKey(partitionKeyDef);
+ }
+
+ @AfterClass(groups = "samples", timeOut = TIMEOUT)
+ public void shutdown() {
+ Utils.safeClean(client, createdDatabase);
+ Utils.safeClose(client);
+ }
+
+ /**
+ * CREATE a document collection using async api.
+ * If you want a single partition collection with 10,000 RU/s throughput,
+ * the only way to do so is to create a single partition collection with lower
+ * throughput (400) and then increase the throughput.
+ */
+ @Test(groups = "samples", timeOut = TIMEOUT)
+ public void createCollection_SinglePartition_Async() throws Exception {
+ RequestOptions singlePartitionRequestOptions = new RequestOptions();
+ singlePartitionRequestOptions.setOfferThroughput(400);
+ Flux> createCollectionObservable = client
+ .createCollection(getDatabaseLink(), collectionDefinition, singlePartitionRequestOptions);
+
+ final CountDownLatch countDownLatch = new CountDownLatch(1);
+
+ createCollectionObservable.single() // We know there is only single result
+ .subscribe(collectionResourceResponse -> {
+ System.out.println(collectionResourceResponse.getActivityId());
+ countDownLatch.countDown();
+ }, error -> {
+ System.err.println(
+ "an error occurred while creating the collection: actual cause: " + error.getMessage());
+ countDownLatch.countDown();
+ });
+
+ // Wait till collection creation completes
+ countDownLatch.await();
+ }
+
+ /**
+ * CREATE a document collection using async api.
+ * This test uses java8 lambda expression.
+ * See testCreateCollection_Async_withoutLambda for usage without lambda
+ * expressions.
+ * Set the throughput to be > 10,000 RU/s
+ * to create a multi partition collection.
+ */
+ @Test(groups = "samples", timeOut = TIMEOUT)
+ public void createCollection_MultiPartition_Async() throws Exception {
+ RequestOptions multiPartitionRequestOptions = new RequestOptions();
+ multiPartitionRequestOptions.setOfferThroughput(20000);
+
+ Flux> createCollectionObservable = client.createCollection(
+ getDatabaseLink(), getMultiPartitionCollectionDefinition(), multiPartitionRequestOptions);
+
+ final CountDownLatch countDownLatch = new CountDownLatch(1);
+
+ createCollectionObservable.single() // We know there is only single result
+ .subscribe(collectionResourceResponse -> {
+ System.out.println(collectionResourceResponse.getActivityId());
+ countDownLatch.countDown();
+ }, error -> {
+ System.err.println(
+ "an error occurred while creating the collection: actual cause: " + error.getMessage());
+ countDownLatch.countDown();
+ });
+
+ // Wait till collection creation completes
+ countDownLatch.await();
+ }
+
+ /**
+ * CREATE a document Collection using async api, without java8 lambda expressions
+ */
+ @Test(groups = "samples", timeOut = TIMEOUT)
+ public void createCollection_Async_withoutLambda() throws Exception {
+ Flux> createCollectionObservable = client
+ .createCollection(getDatabaseLink(), collectionDefinition, null);
+
+ final CountDownLatch countDownLatch = new CountDownLatch(1);
+ Consumer> onCollectionCreationAction = new Consumer>() {
+
+ @Override
+ public void accept(ResourceResponse resourceResponse) {
+ // Collection is created
+ System.out.println(resourceResponse.getActivityId());
+ countDownLatch.countDown();
+ }
+ };
+
+ Consumer onError = new Consumer() {
+ @Override
+ public void accept(Throwable error) {
+ System.err.println(
+ "an error occurred while creating the collection: actual cause: " + error.getMessage());
+ countDownLatch.countDown();
+ }
+ };
+
+ createCollectionObservable.single() // We know there is only a single event
+ .subscribe(onCollectionCreationAction, onError);
+
+ // Wait till collection creation completes
+ countDownLatch.await();
+ }
+
+ /**
+ * CREATE a collection in a blocking manner
+ */
+ @Test(groups = "samples", timeOut = TIMEOUT)
+ public void createCollection_toBlocking() {
+ Flux> createCollectionObservable = client
+ .createCollection(getDatabaseLink(), collectionDefinition, null);
+
+ // single() converts the flux to a mono.
+ // block() gets the only result.
+ createCollectionObservable.single().block();
+ }
+
+ /**
+ * Attempt to create a Collection which already exists
+ * - First create a Collection
+ * - Using the async api generate an async collection creation observable
+ * - Converts the Observable to blocking using Observable.toBlocking() api
+ * - Catch already exist failure (409)
+ */
+ @Test(groups = "samples", timeOut = TIMEOUT)
+ public void createCollection_toBlocking_CollectionAlreadyExists_Fails() {
+ client.createCollection(getDatabaseLink(), collectionDefinition, null).single().block();
+
+ // CREATE the collection for test.
+ Flux> collectionForTestObservable = client
+ .createCollection(getDatabaseLink(), collectionDefinition, null);
+
+ try {
+ collectionForTestObservable.single() // Gets the single result
+ .block(); // Blocks
+ assertThat("Should not reach here", false);
+ } catch (Exception e) {
+ assertThat("Collection already exists.", ((CosmosClientException) e.getCause()).statusCode(),
+ equalTo(409));
+ }
+ }
+
+ /**
+ * You can convert a Flux to a CompletableFuture.
+ */
+ @Test(groups = "samples", timeOut = TIMEOUT)
+ public void transformObservableToCompletableFuture() throws Exception {
+ Flux> createCollectionObservable = client
+ .createCollection(getDatabaseLink(), collectionDefinition, null);
+ CompletableFuture> future = createCollectionObservable.single().toFuture();
+
+ ResourceResponse rrd = future.get();
+
+ assertThat(rrd.getRequestCharge(), greaterThan((double) 0));
+ System.out.println(rrd.getRequestCharge());
+ }
+
+ /**
+ * READ a Collection in an Async manner
+ */
+ @Test(groups = "samples", timeOut = TIMEOUT)
+ public void createAndReadCollection() throws Exception {
+ // CREATE a Collection
+ DocumentCollection documentCollection = client
+ .createCollection(getDatabaseLink(), collectionDefinition, null).single().block()
+ .getResource();
+
+ // READ the created collection using async api
+ Flux> readCollectionObservable = client
+ .readCollection(getCollectionLink(documentCollection), null);
+
+ final CountDownLatch countDownLatch = new CountDownLatch(1);
+
+ readCollectionObservable.single() // We know there is only single result
+ .subscribe(collectionResourceResponse -> {
+ System.out.println(collectionResourceResponse.getActivityId());
+ countDownLatch.countDown();
+ }, error -> {
+ System.err.println(
+ "an error occurred while reading the collection: actual cause: " + error.getMessage());
+ countDownLatch.countDown();
+ });
+
+ // Wait till read collection completes
+ countDownLatch.await();
+ }
+
+ /**
+ * DELETE a Collection in an Async manner
+ */
+ @Test(groups = "samples", timeOut = TIMEOUT)
+ public void createAndDeleteCollection() throws Exception {
+ // CREATE a Collection
+ DocumentCollection documentCollection = client
+ .createCollection(getDatabaseLink(), collectionDefinition, null).single().block()
+ .getResource();
+
+ // DELETE the created collection using async api
+ Flux> deleteCollectionObservable = client
+ .deleteCollection(getCollectionLink(documentCollection), null);
+
+ final CountDownLatch countDownLatch = new CountDownLatch(1);
+
+ deleteCollectionObservable.single() // We know there is only single result
+ .subscribe(collectionResourceResponse -> {
+ System.out.println(collectionResourceResponse.getActivityId());
+ countDownLatch.countDown();
+ }, error -> {
+ System.err.println(
+ "an error occurred while deleting the collection: actual cause: " + error.getMessage());
+ countDownLatch.countDown();
+ });
+
+ // Wait till collection deletion completes
+ countDownLatch.await();
+ }
+
+ /**
+ * Query a Collection in an Async manner
+ */
+ @Test(groups = "samples", timeOut = TIMEOUT)
+ public void collectionCreateAndQuery() throws Exception {
+ // CREATE a Collection
+ DocumentCollection collection = client
+ .createCollection(getDatabaseLink(), collectionDefinition, null).single().block()
+ .getResource();
+
+ // Query the created collection using async api
+ Flux> queryCollectionObservable = client.queryCollections(
+ getDatabaseLink(), String.format("SELECT * FROM r where r.id = '%s'", collection.id()),
+ null);
+
+ final CountDownLatch countDownLatch = new CountDownLatch(1);
+
+ queryCollectionObservable.collectList().subscribe(collectionFeedResponseList -> {
+ // toList() should return a list of size 1
+ assertThat(collectionFeedResponseList.size(), equalTo(1));
+
+ // First element of the list should have only 1 result
+ FeedResponse collectionFeedResponse = collectionFeedResponseList.get(0);
+ assertThat(collectionFeedResponse.results().size(), equalTo(1));
+
+ // This collection should have the same id as the one we created
+ DocumentCollection foundCollection = collectionFeedResponse.results().get(0);
+ assertThat(foundCollection.id(), equalTo(collection.id()));
+
+ System.out.println(collectionFeedResponse.activityId());
+ countDownLatch.countDown();
+ }, error -> {
+ System.err.println("an error occurred while querying the collection: actual cause: " + error.getMessage());
+ countDownLatch.countDown();
+ });
+
+ // Wait till collection query completes
+ countDownLatch.await();
+ }
+
+ private String getDatabaseLink() {
+ return "dbs/" + createdDatabase.id();
+ }
+
+ private String getCollectionLink(DocumentCollection collection) {
+ return "dbs/" + createdDatabase.id() + "/colls/" + collection.id();
+ }
+
+ private DocumentCollection getMultiPartitionCollectionDefinition() {
+ DocumentCollection collectionDefinition = new DocumentCollection();
+ collectionDefinition.id(UUID.randomUUID().toString());
+
+ // Set the partitionKeyDefinition for a partitioned collection.
+ // Here, we are setting the partitionKey of the Collection to be /city
+ PartitionKeyDefinition partitionKeyDefinition = new PartitionKeyDefinition();
+ List paths = new ArrayList<>();
+ paths.add("/city");
+ partitionKeyDefinition.paths(paths);
+ collectionDefinition.setPartitionKey(partitionKeyDefinition);
+
+ // Set indexing policy to be range range for string and number
+ IndexingPolicy indexingPolicy = new IndexingPolicy();
+ List includedPaths = new ArrayList<>();
+ IncludedPath includedPath = new IncludedPath();
+ includedPath.path("/*");
+ Collection indexes = new ArrayList<>();
+ Index stringIndex = Index.Range(DataType.STRING);
+ BridgeInternal.setProperty(stringIndex, "precision", -1);
+ indexes.add(stringIndex);
+
+ Index numberIndex = Index.Range(DataType.NUMBER);
+ BridgeInternal.setProperty(numberIndex, "precision", -1);
+ indexes.add(numberIndex);
+ includedPath.indexes(indexes);
+ includedPaths.add(includedPath);
+ indexingPolicy.setIncludedPaths(includedPaths);
+ collectionDefinition.setIndexingPolicy(indexingPolicy);
+
+ return collectionDefinition;
+ }
+}
diff --git a/sdk/cosmos/examples/src/test/java/com/azure/data/cosmos/rx/examples/ConflictAPITest.java b/sdk/cosmos/examples/src/test/java/com/azure/data/cosmos/rx/examples/ConflictAPITest.java
new file mode 100644
index 0000000000000..b6523b40f163f
--- /dev/null
+++ b/sdk/cosmos/examples/src/test/java/com/azure/data/cosmos/rx/examples/ConflictAPITest.java
@@ -0,0 +1,177 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.azure.data.cosmos.rx.examples;
+
+import com.azure.data.cosmos.internal.AsyncDocumentClient;
+import com.azure.data.cosmos.internal.Conflict;
+import com.azure.data.cosmos.ConnectionMode;
+import com.azure.data.cosmos.ConnectionPolicy;
+import com.azure.data.cosmos.ConsistencyLevel;
+import com.azure.data.cosmos.internal.Database;
+import com.azure.data.cosmos.internal.Document;
+import com.azure.data.cosmos.DocumentClientTest;
+import com.azure.data.cosmos.internal.DocumentCollection;
+import com.azure.data.cosmos.FeedOptions;
+import com.azure.data.cosmos.FeedResponse;
+import com.azure.data.cosmos.PartitionKeyDefinition;
+import com.azure.data.cosmos.internal.HttpConstants;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.notNullValue;
+
+/**
+ * This integration test class demonstrates how to use Async API for
+ * Conflicts.
+ *
+ * Also if you need to work with Future or CompletableFuture it is possible to
+ * transform a flux to CompletableFuture. Please see
+ * {@link #transformObservableToCompletableFuture()}
+ */
+public class ConflictAPITest extends DocumentClientTest {
+ private final static int TIMEOUT = 60000;
+
+ private AsyncDocumentClient client;
+ private DocumentCollection createdCollection;
+ private Database createdDatabase;
+
+ @BeforeClass(groups = "samples", timeOut = TIMEOUT)
+ public void setUp() {
+
+ ConnectionPolicy connectionPolicy = new ConnectionPolicy().connectionMode(ConnectionMode.DIRECT);
+
+ this.clientBuilder()
+ .withServiceEndpoint(TestConfigurations.HOST)
+ .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
+ .withConnectionPolicy(connectionPolicy)
+ .withConsistencyLevel(ConsistencyLevel.SESSION);
+
+ this.client = this.clientBuilder().build();
+
+ DocumentCollection collectionDefinition = new DocumentCollection();
+ collectionDefinition.id(UUID.randomUUID().toString());
+ PartitionKeyDefinition partitionKeyDef = new PartitionKeyDefinition();
+ ArrayList paths = new ArrayList();
+ paths.add("/mypk");
+ partitionKeyDef.paths(paths);
+ collectionDefinition.setPartitionKey(partitionKeyDef);
+
+ // CREATE database
+ createdDatabase = Utils.createDatabaseForTest(client);
+
+ // CREATE collection
+ createdCollection = client
+ .createCollection("/dbs/" + createdDatabase.id(), collectionDefinition, null)
+ .single().block().getResource();
+
+ int numberOfDocuments = 20;
+ // Add documents
+ for (int i = 0; i < numberOfDocuments; i++) {
+ Document doc = new Document(String.format("{ 'id': 'loc%d', 'counter': %d}", i, i));
+ client.createDocument(getCollectionLink(), doc, null, true).single().block();
+ }
+ }
+
+ @AfterClass(groups = "samples", timeOut = TIMEOUT)
+ public void shutdown() {
+ Utils.safeClean(client, createdDatabase);
+ Utils.safeClose(client);
+ }
+
+ /**
+ * READ conflicts
+ * Converts the conflict read feed observable to blocking observable and
+ * uses that to find all conflicts
+ */
+ @Test(groups = "samples", timeOut = TIMEOUT)
+ public void readConflicts_toBlocking_toIterator() {
+ // read all conflicts
+ int requestPageSize = 3;
+ FeedOptions options = new FeedOptions();
+ options.maxItemCount(requestPageSize);
+
+ Flux> conflictReadFeedObservable = client
+ .readConflicts(getCollectionLink(), options);
+
+ // Covert the flux to an iterable, and then to iterator
+ Iterator> it = conflictReadFeedObservable.toIterable().iterator();
+
+ int expectedNumberOfConflicts = 0;
+
+ int numberOfResults = 0;
+ while (it.hasNext()) {
+ FeedResponse page = it.next();
+ System.out.println("items: " + page.results());
+ String pageSizeAsString = page.responseHeaders().get(HttpConstants.HttpHeaders.ITEM_COUNT);
+ assertThat("header item count must be present", pageSizeAsString, notNullValue());
+ int pageSize = Integer.valueOf(pageSizeAsString);
+ assertThat("Result size must match header item count", page.results(), hasSize(pageSize));
+ numberOfResults += pageSize;
+ }
+ assertThat("number of total results", numberOfResults, equalTo(expectedNumberOfConflicts));
+ }
+
+ /**
+ * You can convert a Flux to a CompletableFuture.
+ */
+ @Test(groups = "samples", timeOut = TIMEOUT)
+ public void transformObservableToCompletableFuture() throws Exception {
+ int requestPageSize = 3;
+ FeedOptions options = new FeedOptions();
+ options.maxItemCount(requestPageSize);
+
+ Flux> conflictReadFeedObservable = client
+ .readConflicts(getCollectionLink(), options);
+
+ // Convert to observable of list of pages
+ Mono>> allPagesObservable = conflictReadFeedObservable.collectList();
+
+ // Convert the observable of list of pages to a Future
+ CompletableFuture>> future = allPagesObservable.toFuture();
+
+ List> pageList = future.get();
+
+ int totalNumberOfRetrievedConflicts = 0;
+ for (FeedResponse page : pageList) {
+ totalNumberOfRetrievedConflicts += page.results().size();
+ }
+ assertThat(0, equalTo(totalNumberOfRetrievedConflicts));
+ }
+
+ private String getCollectionLink() {
+ return "dbs/" + createdDatabase.id() + "/colls/" + createdCollection.id();
+ }
+}
+
diff --git a/sdk/cosmos/examples/src/test/java/com/azure/data/cosmos/rx/examples/DatabaseCRUDAsyncAPITest.java b/sdk/cosmos/examples/src/test/java/com/azure/data/cosmos/rx/examples/DatabaseCRUDAsyncAPITest.java
new file mode 100644
index 0000000000000..02805f1ab1e76
--- /dev/null
+++ b/sdk/cosmos/examples/src/test/java/com/azure/data/cosmos/rx/examples/DatabaseCRUDAsyncAPITest.java
@@ -0,0 +1,316 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.azure.data.cosmos.rx.examples;
+
+import com.azure.data.cosmos.internal.AsyncDocumentClient;
+import com.azure.data.cosmos.ConnectionMode;
+import com.azure.data.cosmos.ConnectionPolicy;
+import com.azure.data.cosmos.ConsistencyLevel;
+import com.azure.data.cosmos.CosmosClientException;
+import com.azure.data.cosmos.internal.Database;
+import com.azure.data.cosmos.DocumentClientTest;
+import com.azure.data.cosmos.FeedResponse;
+import com.azure.data.cosmos.internal.ResourceResponse;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+import reactor.core.publisher.Flux;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CountDownLatch;
+import java.util.function.Consumer;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThan;
+
+/**
+ * This integration test class demonstrates how to use Async API to create,
+ * delete, replace, and update Databases.
+ *
+ * NOTE: you can use rxJava based async api with java8 lambda expression. Use of
+ * rxJava based async APIs with java8 lambda expressions is much prettier.
+ *
+ * You can also use the async API without java8 lambda expression support.
+ *
+ * For example
+ *
+ *
{@link #createDatabase_Async()} demonstrates how to use async api
+ * with java8 lambda expression.
+ *
+ *
{@link #createDatabase_Async_withoutLambda()} demonstrates how to
+ * do the same thing without lambda expression.
+ *
+ *
+ * Also if you need to work with Future or CompletableFuture it is possible to
+ * transform a flux to CompletableFuture. Please see
+ * {@link #transformObservableToCompletableFuture()}
+ */
+public class DatabaseCRUDAsyncAPITest extends DocumentClientTest {
+ private final static int TIMEOUT = 60000;
+ private final List databaseIds = new ArrayList<>();
+
+ private AsyncDocumentClient client;
+
+ @BeforeClass(groups = "samples", timeOut = TIMEOUT)
+ public void setUp() {
+
+ ConnectionPolicy connectionPolicy = new ConnectionPolicy().connectionMode(ConnectionMode.DIRECT);
+
+ this.clientBuilder()
+ .withServiceEndpoint(TestConfigurations.HOST)
+ .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
+ .withConnectionPolicy(connectionPolicy)
+ .withConsistencyLevel(ConsistencyLevel.SESSION);
+
+ this.client = this.clientBuilder().build();
+ }
+
+ private Database getDatabaseDefinition() {
+ Database databaseDefinition = new Database();
+ databaseDefinition.id(Utils.generateDatabaseId());
+
+ databaseIds.add(databaseDefinition.id());
+
+ return databaseDefinition;
+ }
+
+ @AfterClass(groups = "samples", timeOut = TIMEOUT)
+ public void shutdown() {
+ for (String id : databaseIds) {
+ Utils.safeClean(client, id);
+ }
+ Utils.safeClose(client);
+ }
+
+ /**
+ * CREATE a database using async api.
+ * This test uses java8 lambda expression.
+ * See testCreateDatabase_Async_withoutLambda for usage without lambda.
+ */
+ @Test(groups = "samples", timeOut = TIMEOUT)
+ public void createDatabase_Async() throws Exception {
+ Flux> createDatabaseObservable = client.createDatabase(getDatabaseDefinition(),
+ null);
+
+ final CountDownLatch completionLatch = new CountDownLatch(1);
+
+ createDatabaseObservable.single() // We know there is only single result
+ .subscribe(databaseResourceResponse -> {
+ System.out.println(databaseResourceResponse.getActivityId());
+ completionLatch.countDown();
+ }, error -> {
+ System.err.println(
+ "an error occurred while creating the database: actual cause: " + error.getMessage());
+ completionLatch.countDown();
+ });
+
+ // Wait till database creation completes
+ completionLatch.await();
+ }
+
+ /**
+ * CREATE a database using async api, without java8 lambda expressions
+ */
+ @Test(groups = "samples", timeOut = TIMEOUT)
+ public void createDatabase_Async_withoutLambda() throws Exception {
+ Flux> createDatabaseObservable = client.createDatabase(getDatabaseDefinition(),
+ null);
+
+ final CountDownLatch completionLatch = new CountDownLatch(1);
+ Consumer> onDatabaseCreationAction = new Consumer>() {
+
+ @Override
+ public void accept(ResourceResponse resourceResponse) {
+ // Database is created
+ System.out.println(resourceResponse.getActivityId());
+ completionLatch.countDown();
+ }
+ };
+
+ Consumer onError = new Consumer() {
+ @Override
+ public void accept(Throwable error) {
+ System.err
+ .println("an error occurred while creating the database: actual cause: " + error.getMessage());
+ completionLatch.countDown();
+ }
+ };
+
+ createDatabaseObservable.single() // We know there is only a single event
+ .subscribe(onDatabaseCreationAction, onError);
+
+ // Wait till database creation completes
+ completionLatch.await();
+ }
+
+ /**
+ * CREATE a database in a blocking manner
+ */
+ @Test(groups = "samples", timeOut = TIMEOUT)
+ public void createDatabase_toBlocking() {
+ Flux> createDatabaseObservable = client.createDatabase(getDatabaseDefinition(),
+ null);
+
+ // toBlocking() converts to a blocking observable.
+ // single() gets the only result.
+ createDatabaseObservable.single().block();
+ }
+
+ /**
+ * Attempt to create a database which already exists
+ * - First create a database
+ * - Using the async api generate an async database creation observable
+ * - Converts the Observable to blocking using Observable.toBlocking() api
+ * - Catch already exist failure (409)
+ */
+ @Test(groups = "samples", timeOut = TIMEOUT)
+ public void createDatabase_toBlocking_DatabaseAlreadyExists_Fails() {
+ Database databaseDefinition = getDatabaseDefinition();
+ client.createDatabase(databaseDefinition, null).single().block();
+
+ // CREATE the database for test.
+ Flux> databaseForTestObservable = client
+ .createDatabase(databaseDefinition, null);
+
+ try {
+ databaseForTestObservable.single() // Single
+ .block(); // Blocks to get the result
+ assertThat("Should not reach here", false);
+ } catch (Exception e) {
+ assertThat("Database already exists.", ((CosmosClientException) e.getCause()).statusCode(),
+ equalTo(409));
+ }
+ }
+
+ /**
+ * You can convert a Flux to a CompletableFuture.
+ */
+ @Test(groups = "samples", timeOut = TIMEOUT)
+ public void transformObservableToCompletableFuture() throws Exception {
+ Flux> createDatabaseObservable = client.createDatabase(getDatabaseDefinition(),
+ null);
+ CompletableFuture> future = createDatabaseObservable.single().toFuture();
+
+ ResourceResponse rrd = future.get();
+
+ assertThat(rrd.getRequestCharge(), greaterThan((double) 0));
+ System.out.print(rrd.getRequestCharge());
+ }
+
+ /**
+ * READ a Database in an Async manner
+ */
+ @Test(groups = "samples", timeOut = TIMEOUT)
+ public void createAndReadDatabase() throws Exception {
+ // CREATE a database
+ Database database = client.createDatabase(getDatabaseDefinition(), null).single().block().getResource();
+
+ // READ the created database using async api
+ Flux> readDatabaseObservable = client.readDatabase("dbs/" + database.id(),
+ null);
+
+ final CountDownLatch completionLatch = new CountDownLatch(1);
+
+ readDatabaseObservable.single() // We know there is only single result
+ .subscribe(databaseResourceResponse -> {
+ System.out.println(databaseResourceResponse.getActivityId());
+ completionLatch.countDown();
+ }, error -> {
+ System.err.println(
+ "an error occurred while reading the database: actual cause: " + error.getMessage());
+ completionLatch.countDown();
+ });
+
+ // Wait till read database completes
+ completionLatch.await();
+ }
+
+ /**
+ * DELETE a Database in an Async manner
+ */
+ @Test(groups = "samples", timeOut = TIMEOUT)
+ public void createAndDeleteDatabase() throws Exception {
+ // CREATE a database
+ Database database = client.createDatabase(getDatabaseDefinition(), null).single().block().getResource();
+
+ // DELETE the created database using async api
+ Flux> deleteDatabaseObservable = client
+ .deleteDatabase("dbs/" + database.id(), null);
+
+ final CountDownLatch completionLatch = new CountDownLatch(1);
+
+ deleteDatabaseObservable.single() // We know there is only single result
+ .subscribe(databaseResourceResponse -> {
+ System.out.println(databaseResourceResponse.getActivityId());
+ completionLatch.countDown();
+ }, error -> {
+ System.err.println(
+ "an error occurred while deleting the database: actual cause: " + error.getMessage());
+ completionLatch.countDown();
+ });
+
+ // Wait till database deletion completes
+ completionLatch.await();
+ }
+
+ /**
+ * Query a Database in an Async manner
+ */
+ @Test(groups = "samples", timeOut = TIMEOUT)
+ public void databaseCreateAndQuery() throws Exception {
+ // CREATE a database
+ Database databaseDefinition = getDatabaseDefinition();
+ client.createDatabase(databaseDefinition, null).single().block().getResource();
+
+ // Query the created database using async api
+ Flux> queryDatabaseObservable = client
+ .queryDatabases(String.format("SELECT * FROM r where r.id = '%s'", databaseDefinition.id()), null);
+
+ final CountDownLatch completionLatch = new CountDownLatch(1);
+
+ queryDatabaseObservable.collectList().subscribe(databaseFeedResponseList -> {
+ // toList() should return a list of size 1
+ assertThat(databaseFeedResponseList.size(), equalTo(1));
+
+ // First element of the list should have only 1 result
+ FeedResponse databaseFeedResponse = databaseFeedResponseList.get(0);
+ assertThat(databaseFeedResponse.results().size(), equalTo(1));
+
+ // This database should have the same id as the one we created
+ Database foundDatabase = databaseFeedResponse.results().get(0);
+ assertThat(foundDatabase.id(), equalTo(databaseDefinition.id()));
+
+ System.out.println(databaseFeedResponse.activityId());
+ completionLatch.countDown();
+ }, error -> {
+ System.err.println("an error occurred while querying the database: actual cause: " + error.getMessage());
+ completionLatch.countDown();
+ });
+
+ // Wait till database query completes
+ completionLatch.await();
+ }
+}
diff --git a/sdk/cosmos/examples/src/test/java/com/azure/data/cosmos/rx/examples/DocumentCRUDAsyncAPITest.java b/sdk/cosmos/examples/src/test/java/com/azure/data/cosmos/rx/examples/DocumentCRUDAsyncAPITest.java
new file mode 100644
index 0000000000000..6232cb561f2fc
--- /dev/null
+++ b/sdk/cosmos/examples/src/test/java/com/azure/data/cosmos/rx/examples/DocumentCRUDAsyncAPITest.java
@@ -0,0 +1,542 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2018 Microsoft Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.azure.data.cosmos.rx.examples;
+
+import com.azure.data.cosmos.internal.AsyncDocumentClient;
+import com.azure.data.cosmos.BridgeInternal;
+import com.azure.data.cosmos.ConnectionMode;
+import com.azure.data.cosmos.ConnectionPolicy;
+import com.azure.data.cosmos.ConsistencyLevel;
+import com.azure.data.cosmos.CosmosClientException;
+import com.azure.data.cosmos.internal.Database;
+import com.azure.data.cosmos.internal.Document;
+import com.azure.data.cosmos.DocumentClientTest;
+import com.azure.data.cosmos.internal.DocumentCollection;
+import com.azure.data.cosmos.FeedOptions;
+import com.azure.data.cosmos.FeedResponse;
+import com.azure.data.cosmos.PartitionKey;
+import com.azure.data.cosmos.PartitionKeyDefinition;
+import com.azure.data.cosmos.internal.RequestOptions;
+import com.azure.data.cosmos.internal.ResourceResponse;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.RandomUtils;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+import reactor.core.publisher.Flux;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CountDownLatch;
+import java.util.function.Consumer;
+
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+
+/**
+ * This integration test class demonstrates how to use Async API to create,
+ * delete, replace, and upsert Documents. If you are interested in examples for
+ * querying for documents please see {@link DocumentQueryAsyncAPITest}
+ *
+ * NOTE: you can use rxJava based async api with java8 lambda expression. Use
+ * of rxJava based async APIs with java8 lambda expressions is much prettier.
+ *
+ * You can also use the async API without java8 lambda expression.
+ *
+ * For example
+ *
+ *
{@link #createDocument_Async()} demonstrates how to use async api
+ * with java8 lambda expression.
+ *
+ *
{@link #createDocument_Async_withoutLambda()} demonstrates how to do
+ * the same thing without lambda expression.
+ *
+ *
+ * Also if you need to work with Future or CompletableFuture it is possible to
+ * transform a flux to CompletableFuture. Please see
+ * {@link #transformObservableToCompletableFuture()}
+ */
+public class DocumentCRUDAsyncAPITest extends DocumentClientTest {
+
+ private final static String PARTITION_KEY_PATH = "/mypk";
+ private final static int TIMEOUT = 60000;
+
+ private AsyncDocumentClient client;
+ private Database createdDatabase;
+ private DocumentCollection createdCollection;
+
+ @BeforeClass(groups = "samples", timeOut = TIMEOUT)
+ public void setUp() {
+
+ ConnectionPolicy connectionPolicy = new ConnectionPolicy().connectionMode(ConnectionMode.DIRECT);
+
+ this.clientBuilder()
+ .withServiceEndpoint(TestConfigurations.HOST)
+ .withMasterKeyOrResourceToken(TestConfigurations.MASTER_KEY)
+ .withConnectionPolicy(connectionPolicy)
+ .withConsistencyLevel(ConsistencyLevel.SESSION);
+
+ this.client = this.clientBuilder().build();
+
+ DocumentCollection collectionDefinition = new DocumentCollection();
+ collectionDefinition.id(UUID.randomUUID().toString());
+
+ PartitionKeyDefinition partitionKeyDefinition = new PartitionKeyDefinition();
+ ArrayList partitionKeyPaths = new ArrayList