diff --git a/eng/.docsettings.yml b/eng/.docsettings.yml
index d1b091127da59..fde81ca0d4b8f 100644
--- a/eng/.docsettings.yml
+++ b/eng/.docsettings.yml
@@ -17,30 +17,31 @@ required_readme_sections:
   - ^Next steps$
   - ^Contributing$
 known_presence_issues:
-  - ['cognitiveservices/data-plane/language/bingspellcheck', '#2847']
-  - ['cognitiveservices/data-plane/language/luis/authoring', '#2847']
-  - ['cognitiveservices/data-plane/language/luis/runtime', '#2847']
-  - ['cognitiveservices/data-plane/language/textanalytics', '#2847']
-  - ['cognitiveservices/data-plane/search/bingautosuggest', '#2847']
-  - ['cognitiveservices/data-plane/search/bingcustomimagesearch', '#2847']
-  - ['cognitiveservices/data-plane/search/bingcustomsearch', '#2847']
-  - ['cognitiveservices/data-plane/search/bingentitysearch', '#2847']
-  - ['cognitiveservices/data-plane/search/bingimagesearch', '#2847']
-  - ['cognitiveservices/data-plane/search/bingnewssearch', '#2847']
-  - ['cognitiveservices/data-plane/search/bingvideosearch', '#2847']
-  - ['cognitiveservices/data-plane/search/bingvisualsearch', '#2847']
-  - ['cognitiveservices/data-plane/search/bingwebsearch', '#2847']
-  - ['cognitiveservices/data-plane/vision/computervision', '#2847']
-  - ['cognitiveservices/data-plane/vision/contentmoderator', '#2847']
-  - ['cognitiveservices/data-plane/vision/customvision/prediction', '#2847']
-  - ['cognitiveservices/data-plane/vision/customvision/training', '#2847']
-  - ['cognitiveservices/data-plane/vision/faceapi', '#2847']
+  - ['sdk/cognitiveservices/ms-azure-cs-spellcheck', '#2847']
+  - ['sdk/cognitiveservices/ms-azure-cs-luis-authoring', '#2847']
+  - ['sdk/cognitiveservices/ms-azure-cs-luis-runtime', '#2847']
+  - ['sdk/cognitiveservices/ms-azure-cs-textanalytics', '#2847']
+  - ['sdk/cognitiveservices/ms-azure-cs-autosuggest', '#2847']
+  - ['sdk/cognitiveservices/ms-azure-cs-customimagesearch', '#2847']
+  - ['sdk/cognitiveservices/ms-azure-cs-customsearch', '#2847']
+  - ['sdk/cognitiveservices/ms-azure-cs-entitysearch', '#2847']
+  - ['sdk/cognitiveservices/ms-azure-cs-imagesearch', '#2847']
+  - ['sdk/cognitiveservices/ms-azure-cs-newssearch', '#2847']
+  - ['sdk/cognitiveservices/ms-azure-cs-videosearch', '#2847']
+  - ['sdk/cognitiveservices/ms-azure-cs-visualsearch', '#2847']
+  - ['sdk/cognitiveservices/ms-azure-cs-websearch', '#2847']
+  - ['sdk/cognitiveservices/ms-azure-cs-computervision', '#2847']
+  - ['sdk/cognitiveservices/ms-azure-cs-contentmoderator', '#2847']
+  - ['sdk/cognitiveservices/ms-azure-cs-customvision-prediction', '#2847']
+  - ['sdk/cognitiveservices/ms-azure-cs-customvision-training', '#2847']
+  - ['sdk/cognitiveservices/ms-azure-cs-faceapi', '#2847']
   - ['sdk/keyvault/microsoft-azure-keyvault', '#2847']
   - ['sdk/keyvault/microsoft-azure-keyvault-core', '#2847']
   - ['sdk/keyvault/microsoft-azure-keyvault-cryptography', '#2847']
   - ['sdk/keyvault/microsoft-azure-keyvault-extensions', '#2847']
   - ['sdk/keyvault/microsoft-azure-keyvault-webkey', '#2847']
   - ['sdk/mediaservices/microsoft-azure-media', '#2847']
+  - ['mediaservices/data-plane', '#2847']
   - ['core/build-tools', '#2847']
   - ['core/azure-core', '#2847']
   - ['core/azure-core-auth', '#2847']
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 @@
       <groupId>com.microsoft.azure.cognitiveservices</groupId>
       <artifactId>azure-cognitiveservices-parent</artifactId>
       <version>1.0.2</version>
-      <relativePath>../../pom.xml</relativePath>
+      <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-autosuggest</artifactId>
     <version>1.0.2-beta</version>
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 @@
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
     <artifactId>azure-cognitiveservices-parent</artifactId>
     <version>1.0.2</version>
-    <relativePath>../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
     <artifactId>azure-cognitiveservices-computervision</artifactId>
     <version>1.0.2-beta</version>
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 @@
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
     <artifactId>azure-cognitiveservices-parent</artifactId>
     <version>1.0.2</version>
-    <relativePath>../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
     <artifactId>azure-cognitiveservices-contentmoderator</artifactId>
     <version>1.0.2-beta</version>
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 @@
       <groupId>com.microsoft.azure.cognitiveservices</groupId>
       <artifactId>azure-cognitiveservices-parent</artifactId>
       <version>1.0.2</version>
-      <relativePath>../../pom.xml</relativePath>
+      <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-customimagesearch</artifactId>
     <version>1.0.2-beta</version>
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 @@
       <groupId>com.microsoft.azure.cognitiveservices</groupId>
       <artifactId>azure-cognitiveservices-parent</artifactId>
       <version>1.0.2</version>
-      <relativePath>../../pom.xml</relativePath>
+      <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-customsearch</artifactId>
     <version>1.0.2</version>
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 @@
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
     <artifactId>azure-cognitiveservices-parent</artifactId>
     <version>1.0.2</version>
-    <relativePath>../../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
     <artifactId>azure-cognitiveservices-customvision-prediction</artifactId>
     <version>1.0.2-beta</version>
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 @@
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
     <artifactId>azure-cognitiveservices-parent</artifactId>
     <version>1.0.2</version>
-    <relativePath>../../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
     <artifactId>azure-cognitiveservices-customvision-training</artifactId>
     <version>1.0.2-beta</version>
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 @@
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
     <artifactId>azure-cognitiveservices-parent</artifactId>
     <version>1.0.2</version>
-    <relativePath>../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
     <artifactId>azure-cognitiveservices-entitysearch</artifactId>
     <version>1.0.2</version>
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 @@
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
     <artifactId>azure-cognitiveservices-parent</artifactId>
     <version>1.0.2</version>
-    <relativePath>../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
     <artifactId>azure-cognitiveservices-faceapi</artifactId>
     <version>1.0.2-beta</version>
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 @@
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
     <artifactId>azure-cognitiveservices-parent</artifactId>
     <version>1.0.2</version>
-    <relativePath>../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
     <artifactId>azure-cognitiveservices-imagesearch</artifactId>
     <version>1.0.2</version>
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 @@
       <groupId>com.microsoft.azure.cognitiveservices</groupId>
       <artifactId>azure-cognitiveservices-parent</artifactId>
       <version>1.0.2</version>
-      <relativePath>../../../pom.xml</relativePath>
+      <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-luis-authoring</artifactId>
     <version>1.0.2-beta</version>
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 @@
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
     <artifactId>azure-cognitiveservices-parent</artifactId>
     <version>1.0.2</version>
-    <relativePath>../../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>azure-cognitiveservices-luis-runtime</artifactId>
   <version>1.0.2-beta</version>
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 @@
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
     <artifactId>azure-cognitiveservices-parent</artifactId>
     <version>1.0.2</version>
-    <relativePath>../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
     <artifactId>azure-cognitiveservices-newssearch</artifactId>
   <version>1.0.2</version>
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 @@
       <groupId>com.microsoft.azure.cognitiveservices</groupId>
       <artifactId>azure-cognitiveservices-parent</artifactId>
       <version>1.0.2</version>
-      <relativePath>../../pom.xml</relativePath>
+      <relativePath>../pom.xml</relativePath>
     </parent>
     <version>1.0.2</version>
     <artifactId>azure-cognitiveservices-spellcheck</artifactId>
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 @@
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
     <artifactId>azure-cognitiveservices-parent</artifactId>
     <version>1.0.2</version>
-    <relativePath>../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
     <artifactId>azure-cognitiveservices-textanalytics</artifactId>
     <version>1.0.2-beta</version>
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 @@
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
     <artifactId>azure-cognitiveservices-parent</artifactId>
     <version>1.0.2</version>
-    <relativePath>../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
     <artifactId>azure-cognitiveservices-videosearch</artifactId>
     <version>1.0.2</version>
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 @@
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
     <artifactId>azure-cognitiveservices-parent</artifactId>
     <version>1.0.2</version>
-    <relativePath>../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
     <artifactId>azure-cognitiveservices-visualsearch</artifactId>
     <version>1.0.2-beta</version>
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 @@
     <groupId>com.microsoft.azure.cognitiveservices</groupId>
     <artifactId>azure-cognitiveservices-parent</artifactId>
     <version>1.0.2</version>
-    <relativePath>../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
     <artifactId>azure-cognitiveservices-websearch</artifactId>
     <version>1.0.2</version>
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 @@
   <packaging>pom</packaging>
   <version>1.0.0</version><!-- Need not change for every release-->
   <modules>
-    <!-- <module>microsoft-azure-batch</module> -->
+    <module>ms-azure-cs-spellcheck</module>
+    <module>ms-azure-cs-textanalytics</module>
+    <module>ms-azure-cs-luis-runtime</module>
+    <module>ms-azure-cs-luis-authoring</module>
+    <module>ms-azure-cs-autosuggest</module>
+    <module>ms-azure-cs-customimagesearch</module>
+    <module>ms-azure-cs-customsearch</module>
+    <module>ms-azure-cs-entitysearch</module>
+    <module>ms-azure-cs-imagesearch</module>
+    <module>ms-azure-cs-newssearch</module>
+    <module>ms-azure-cs-videosearch</module>
+    <module>ms-azure-cs-visualsearch</module>
+    <module>ms-azure-cs-websearch</module>
+    <module>ms-azure-cs-computervision</module>
+    <module>ms-azure-cs-contentmoderator</module>
+    <module>ms-azure-cs-customvision-prediction</module>
+    <module>ms-azure-cs-customvision-training</module>
+    <module>ms-azure-cs-faceapi</module>
   </modules>
 </project>
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 @@
     </pluginManagement>
   </build>
   <modules>
-    <module>./language/bingspellcheck</module>
-    <module>./language/luis/authoring</module>
-    <module>./language/luis/runtime</module>
-    <module>./language/textanalytics</module>
-    <module>./search/bingautosuggest</module>
-    <module>./search/bingcustomimagesearch</module>
-    <module>./search/bingcustomsearch</module>
-    <module>./search/bingentitysearch</module>
-    <module>./search/bingimagesearch</module>
-    <module>./search/bingnewssearch</module>
-    <module>./search/bingvideosearch</module>
-    <module>./search/bingvisualsearch</module>
-    <module>./search/bingwebsearch</module>
-    <module>./vision/computervision</module>
-    <module>./vision/contentmoderator</module>
-    <module>./vision/customvision/prediction</module>
-    <module>./vision/customvision/training</module>
-    <module>./vision/faceapi</module>
+    <module>ms-azure-cs-spellcheck</module>
+    <module>ms-azure-cs-luis-authoring</module>
+    <module>ms-azure-cs-luis-runtime</module>
+    <module>ms-azure-cs-textanalytics</module>
+    <module>ms-azure-cs-autosuggest</module>
+    <module>ms-azure-cs-customimagesearch</module>
+    <module>ms-azure-cs-customsearch</module>
+    <module>ms-azure-cs-entitysearch</module>
+    <module>ms-azure-cs-imagesearch</module>
+    <module>ms-azure-cs-newssearch</module>
+    <module>ms-azure-cs-videosearch</module>
+    <module>ms-azure-cs-visualsearch</module>
+    <module>ms-azure-cs-websearch</module>
+    <module>ms-azure-cs-computervision</module>
+    <module>ms-azure-cs-contentmoderator</module>
+    <module>ms-azure-cs-customvision-prediction</module>
+    <module>ms-azure-cs-customvision-training</module>
+    <module>ms-azure-cs-faceapi</module>
   </modules>
 </project>
\ No newline at end of file