diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch.Tests/CustomSearchTests.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch.Tests/CustomSearchTests.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch.Tests/CustomSearchTests.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch.Tests/CustomSearchTests.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch.Tests/Microsoft.Azure.CognitiveServices.Search.CustomSearch.Tests.csproj b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch.Tests/Microsoft.Azure.CognitiveServices.Search.CustomSearch.Tests.csproj
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch.Tests/Microsoft.Azure.CognitiveServices.Search.CustomSearch.Tests.csproj
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch.Tests/Microsoft.Azure.CognitiveServices.Search.CustomSearch.Tests.csproj
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch.Tests/SessionRecords/SearchSDK.Tests.CustomSearchTests/CustomSearch.json b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch.Tests/SessionRecords/SearchSDK.Tests.CustomSearchTests/CustomSearch.json
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch.Tests/SessionRecords/SearchSDK.Tests.CustomSearchTests/CustomSearch.json
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch.Tests/SessionRecords/SearchSDK.Tests.CustomSearchTests/CustomSearch.json
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch.sln b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch.sln
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch.sln
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch.sln
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Customizations/ApiKeyServiceClientCredentials.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Customizations/ApiKeyServiceClientCredentials.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Customizations/ApiKeyServiceClientCredentials.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Customizations/ApiKeyServiceClientCredentials.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/CustomInstance.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/CustomInstance.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/CustomInstance.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/CustomInstance.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/CustomInstanceExtensions.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/CustomInstanceExtensions.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/CustomInstanceExtensions.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/CustomInstanceExtensions.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/CustomSearchAPI.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/CustomSearchAPI.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/CustomSearchAPI.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/CustomSearchAPI.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/ICustomInstance.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/ICustomInstance.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/ICustomInstance.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/ICustomInstance.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/ICustomSearchAPI.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/ICustomSearchAPI.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/ICustomSearchAPI.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/ICustomSearchAPI.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/Answer.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/Answer.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/Answer.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/Answer.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/CreativeWork.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/CreativeWork.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/CreativeWork.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/CreativeWork.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/Error.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/Error.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/Error.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/Error.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/ErrorCode.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/ErrorCode.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/ErrorCode.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/ErrorCode.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/ErrorResponse.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/ErrorResponse.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/ErrorResponse.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/ErrorResponse.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/ErrorResponseException.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/ErrorResponseException.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/ErrorResponseException.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/ErrorResponseException.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/ErrorSubCode.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/ErrorSubCode.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/ErrorSubCode.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/ErrorSubCode.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/Identifiable.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/Identifiable.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/Identifiable.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/Identifiable.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/Query.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/Query.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/Query.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/Query.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/QueryContext.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/QueryContext.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/QueryContext.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/QueryContext.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/Response.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/Response.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/Response.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/Response.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/ResponseBase.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/ResponseBase.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/ResponseBase.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/ResponseBase.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/SafeSearch.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/SafeSearch.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/SafeSearch.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/SafeSearch.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/SearchResponse.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/SearchResponse.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/SearchResponse.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/SearchResponse.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/SearchResultsAnswer.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/SearchResultsAnswer.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/SearchResultsAnswer.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/SearchResultsAnswer.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/TextFormat.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/TextFormat.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/TextFormat.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/TextFormat.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/Thing.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/Thing.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/Thing.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/Thing.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/WebMetaTag.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/WebMetaTag.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/WebMetaTag.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/WebMetaTag.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/WebPage.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/WebPage.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/WebPage.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/WebPage.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/WebWebAnswer.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/WebWebAnswer.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Generated/CustomSearch/Models/WebWebAnswer.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/WebWebAnswer.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Microsoft.Azure.CognitiveServices.Search.CustomSearch.csproj b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Microsoft.Azure.CognitiveServices.Search.CustomSearch.csproj
similarity index 72%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Microsoft.Azure.CognitiveServices.Search.CustomSearch.csproj
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Microsoft.Azure.CognitiveServices.Search.CustomSearch.csproj
index 92e5491e7795..275c299fe4d0 100644
--- a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Microsoft.Azure.CognitiveServices.Search.CustomSearch.csproj
+++ b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Microsoft.Azure.CognitiveServices.Search.CustomSearch.csproj
@@ -1,5 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <!-- Please do not move/edit code below this line -->
   <Import Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.reference.props'))" />
+  <!-- Please do not move/edit code above this line -->
+  
   <PropertyGroup>
     <PackageId>Microsoft.Azure.CognitiveServices.Search.CustomSearch</PackageId>
     <Description>This client library provides access to the Microsoft Cognitive Services Custom Search API.</Description>
@@ -11,8 +14,8 @@
   <PropertyGroup>
     <TargetFrameworks>net452;netstandard1.4</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-    <Folder Include="Properties\" />
-  </ItemGroup>
+  
+  <!-- Please do not move/edit code below this line -->
+  <Import Condition=" Exists('$([MSBuild]::GetPathOfFileAbove(AzSdk.RP.props))') " Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.RP.props'))" />
+  <!-- Please do not move/edit code above this line -->
 </Project>
\ No newline at end of file
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Properties/AssemblyInfo.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/Properties/AssemblyInfo.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Properties/AssemblyInfo.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/generate.cmd b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/generate.cmd
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/generate.cmd
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/generate.cmd
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch.Tests/EntitySearchTests.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch.Tests/EntitySearchTests.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch.Tests/EntitySearchTests.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch.Tests/EntitySearchTests.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch.Tests/Microsoft.Azure.CognitiveServices.Search.EntitySearch.Tests.csproj b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch.Tests/Microsoft.Azure.CognitiveServices.Search.EntitySearch.Tests.csproj
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch.Tests/Microsoft.Azure.CognitiveServices.Search.EntitySearch.Tests.csproj
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch.Tests/Microsoft.Azure.CognitiveServices.Search.EntitySearch.Tests.csproj
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch.Tests/SessionRecords/SearchSDK.Tests.EntitySearchTests/EntitySearch.json b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch.Tests/SessionRecords/SearchSDK.Tests.EntitySearchTests/EntitySearch.json
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch.Tests/SessionRecords/SearchSDK.Tests.EntitySearchTests/EntitySearch.json
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch.Tests/SessionRecords/SearchSDK.Tests.EntitySearchTests/EntitySearch.json
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch.sln b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch.sln
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch.sln
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch.sln
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Customizations/ApiKeyServiceClientCredentials.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Customizations/ApiKeyServiceClientCredentials.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Customizations/ApiKeyServiceClientCredentials.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Customizations/ApiKeyServiceClientCredentials.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/EntitiesOperations.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/EntitiesOperations.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/EntitiesOperations.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/EntitiesOperations.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/EntitiesOperationsExtensions.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/EntitiesOperationsExtensions.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/EntitiesOperationsExtensions.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/EntitiesOperationsExtensions.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/EntitySearchAPI.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/EntitySearchAPI.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/EntitySearchAPI.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/EntitySearchAPI.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/IEntitiesOperations.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/IEntitiesOperations.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/IEntitiesOperations.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/IEntitiesOperations.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/IEntitySearchAPI.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/IEntitySearchAPI.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/IEntitySearchAPI.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/IEntitySearchAPI.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/Airport.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/Airport.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/Airport.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/Airport.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/Answer.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/Answer.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/Answer.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/Answer.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/AnswerType.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/AnswerType.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/AnswerType.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/AnswerType.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/CivicStructure.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/CivicStructure.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/CivicStructure.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/CivicStructure.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/ContractualRulesAttribution.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/ContractualRulesAttribution.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/ContractualRulesAttribution.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/ContractualRulesAttribution.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/ContractualRulesContractualRule.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/ContractualRulesContractualRule.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/ContractualRulesContractualRule.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/ContractualRulesContractualRule.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/ContractualRulesLicenseAttribution.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/ContractualRulesLicenseAttribution.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/ContractualRulesLicenseAttribution.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/ContractualRulesLicenseAttribution.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/ContractualRulesLinkAttribution.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/ContractualRulesLinkAttribution.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/ContractualRulesLinkAttribution.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/ContractualRulesLinkAttribution.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/ContractualRulesMediaAttribution.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/ContractualRulesMediaAttribution.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/ContractualRulesMediaAttribution.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/ContractualRulesMediaAttribution.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/ContractualRulesTextAttribution.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/ContractualRulesTextAttribution.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/ContractualRulesTextAttribution.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/ContractualRulesTextAttribution.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/CreativeWork.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/CreativeWork.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/CreativeWork.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/CreativeWork.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/EntertainmentBusiness.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/EntertainmentBusiness.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/EntertainmentBusiness.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/EntertainmentBusiness.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/Entities.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/Entities.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/Entities.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/Entities.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/EntitiesEntityPresentationInfo.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/EntitiesEntityPresentationInfo.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/EntitiesEntityPresentationInfo.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/EntitiesEntityPresentationInfo.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/EntityQueryScenario.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/EntityQueryScenario.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/EntityQueryScenario.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/EntityQueryScenario.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/EntityScenario.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/EntityScenario.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/EntityScenario.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/EntityScenario.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/EntityType.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/EntityType.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/EntityType.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/EntityType.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/Error.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/Error.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/Error.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/Error.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/ErrorCode.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/ErrorCode.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/ErrorCode.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/ErrorCode.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/ErrorResponse.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/ErrorResponse.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/ErrorResponse.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/ErrorResponse.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/ErrorResponseException.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/ErrorResponseException.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/ErrorResponseException.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/ErrorResponseException.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/ErrorSubCode.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/ErrorSubCode.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/ErrorSubCode.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/ErrorSubCode.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/FoodEstablishment.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/FoodEstablishment.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/FoodEstablishment.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/FoodEstablishment.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/Hotel.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/Hotel.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/Hotel.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/Hotel.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/Identifiable.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/Identifiable.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/Identifiable.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/Identifiable.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/ImageObject.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/ImageObject.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/ImageObject.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/ImageObject.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/Intangible.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/Intangible.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/Intangible.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/Intangible.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/License.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/License.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/License.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/License.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/LocalBusiness.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/LocalBusiness.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/LocalBusiness.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/LocalBusiness.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/LodgingBusiness.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/LodgingBusiness.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/LodgingBusiness.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/LodgingBusiness.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/MediaObject.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/MediaObject.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/MediaObject.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/MediaObject.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/MovieTheater.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/MovieTheater.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/MovieTheater.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/MovieTheater.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/Organization.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/Organization.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/Organization.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/Organization.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/Place.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/Place.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/Place.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/Place.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/Places.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/Places.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/Places.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/Places.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/PostalAddress.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/PostalAddress.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/PostalAddress.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/PostalAddress.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/QueryContext.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/QueryContext.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/QueryContext.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/QueryContext.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/Response.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/Response.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/Response.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/Response.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/ResponseBase.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/ResponseBase.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/ResponseBase.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/ResponseBase.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/ResponseFormat.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/ResponseFormat.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/ResponseFormat.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/ResponseFormat.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/Restaurant.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/Restaurant.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/Restaurant.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/Restaurant.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/SafeSearch.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/SafeSearch.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/SafeSearch.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/SafeSearch.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/SearchResponse.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/SearchResponse.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/SearchResponse.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/SearchResponse.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/SearchResultsAnswer.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/SearchResultsAnswer.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/SearchResultsAnswer.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/SearchResultsAnswer.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/StructuredValue.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/StructuredValue.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/StructuredValue.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/StructuredValue.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/Thing.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/Thing.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/Thing.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/Thing.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/TouristAttraction.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/TouristAttraction.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Generated/EntitySearch/Models/TouristAttraction.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Generated/EntitySearch/Models/TouristAttraction.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Microsoft.Azure.CognitiveServices.Search.EntitySearch.csproj b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Microsoft.Azure.CognitiveServices.Search.EntitySearch.csproj
similarity index 72%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Microsoft.Azure.CognitiveServices.Search.EntitySearch.csproj
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Microsoft.Azure.CognitiveServices.Search.EntitySearch.csproj
index 3e3f91a94cc4..56d6f6a846b5 100644
--- a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Microsoft.Azure.CognitiveServices.Search.EntitySearch.csproj
+++ b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Microsoft.Azure.CognitiveServices.Search.EntitySearch.csproj
@@ -1,5 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <!-- Please do not move/edit code below this line -->
   <Import Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.reference.props'))" />
+  <!-- Please do not move/edit code above this line -->
+  
   <PropertyGroup>
     <PackageId>Microsoft.Azure.CognitiveServices.Search.EntitySearch</PackageId>
     <Description>This client library provides access to the Microsoft Cognitive Services Entity Search API.</Description>
@@ -11,7 +14,8 @@
   <PropertyGroup>
     <TargetFrameworks>net452;netstandard1.4</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
+  
+  <!-- Please do not move/edit code below this line -->
+  <Import Condition=" Exists('$([MSBuild]::GetPathOfFileAbove(AzSdk.RP.props))') " Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.RP.props'))" />
+  <!-- Please do not move/edit code above this line -->
 </Project>
\ No newline at end of file
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Properties/AssemblyInfo.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/Properties/AssemblyInfo.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/Properties/AssemblyInfo.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/generate.cmd b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/generate.cmd
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/generate.cmd
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/generate.cmd
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch.Tests/ImageSearchTests.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch.Tests/ImageSearchTests.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch.Tests/ImageSearchTests.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch.Tests/ImageSearchTests.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch.Tests/Microsoft.Azure.CognitiveServices.Search.ImageSearch.Tests.csproj b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch.Tests/Microsoft.Azure.CognitiveServices.Search.ImageSearch.Tests.csproj
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch.Tests/Microsoft.Azure.CognitiveServices.Search.ImageSearch.Tests.csproj
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch.Tests/Microsoft.Azure.CognitiveServices.Search.ImageSearch.Tests.csproj
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch.Tests/SessionRecords/SearchSDK.Tests.ImageSearchTests/ImageDetail.json b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch.Tests/SessionRecords/SearchSDK.Tests.ImageSearchTests/ImageDetail.json
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch.Tests/SessionRecords/SearchSDK.Tests.ImageSearchTests/ImageDetail.json
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch.Tests/SessionRecords/SearchSDK.Tests.ImageSearchTests/ImageDetail.json
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch.Tests/SessionRecords/SearchSDK.Tests.ImageSearchTests/ImageSearch.json b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch.Tests/SessionRecords/SearchSDK.Tests.ImageSearchTests/ImageSearch.json
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch.Tests/SessionRecords/SearchSDK.Tests.ImageSearchTests/ImageSearch.json
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch.Tests/SessionRecords/SearchSDK.Tests.ImageSearchTests/ImageSearch.json
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch.Tests/SessionRecords/SearchSDK.Tests.ImageSearchTests/ImageTrending.json b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch.Tests/SessionRecords/SearchSDK.Tests.ImageSearchTests/ImageTrending.json
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch.Tests/SessionRecords/SearchSDK.Tests.ImageSearchTests/ImageTrending.json
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch.Tests/SessionRecords/SearchSDK.Tests.ImageSearchTests/ImageTrending.json
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch.sln b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch.sln
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch.sln
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch.sln
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Customizations/ApiKeyServiceClientCredentials.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Customizations/ApiKeyServiceClientCredentials.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Customizations/ApiKeyServiceClientCredentials.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Customizations/ApiKeyServiceClientCredentials.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/IImageSearchAPI.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/IImageSearchAPI.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/IImageSearchAPI.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/IImageSearchAPI.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/IImagesOperations.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/IImagesOperations.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/IImagesOperations.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/IImagesOperations.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/ImageSearchAPI.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/ImageSearchAPI.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/ImageSearchAPI.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/ImageSearchAPI.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/ImagesOperations.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/ImagesOperations.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/ImagesOperations.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/ImagesOperations.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/ImagesOperationsExtensions.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/ImagesOperationsExtensions.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/ImagesOperationsExtensions.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/ImagesOperationsExtensions.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/AggregateOffer.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/AggregateOffer.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/AggregateOffer.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/AggregateOffer.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/AggregateRating.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/AggregateRating.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/AggregateRating.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/AggregateRating.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Answer.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Answer.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Answer.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Answer.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/CollectionPage.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/CollectionPage.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/CollectionPage.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/CollectionPage.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/CreativeWork.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/CreativeWork.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/CreativeWork.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/CreativeWork.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Currency.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Currency.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Currency.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Currency.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Error.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Error.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Error.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Error.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ErrorCode.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ErrorCode.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ErrorCode.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ErrorCode.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ErrorResponse.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ErrorResponse.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ErrorResponse.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ErrorResponse.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ErrorResponseException.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ErrorResponseException.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ErrorResponseException.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ErrorResponseException.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ErrorSubCode.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ErrorSubCode.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ErrorSubCode.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ErrorSubCode.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Freshness.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Freshness.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Freshness.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Freshness.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Identifiable.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Identifiable.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Identifiable.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Identifiable.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImageAspect.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImageAspect.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImageAspect.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImageAspect.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImageColor.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImageColor.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImageColor.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImageColor.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImageContent.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImageContent.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImageContent.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImageContent.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImageCropType.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImageCropType.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImageCropType.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImageCropType.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImageGallery.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImageGallery.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImageGallery.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImageGallery.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImageInsightModule.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImageInsightModule.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImageInsightModule.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImageInsightModule.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImageInsights.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImageInsights.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImageInsights.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImageInsights.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImageInsightsImageCaption.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImageInsightsImageCaption.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImageInsightsImageCaption.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImageInsightsImageCaption.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImageLicense.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImageLicense.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImageLicense.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImageLicense.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImageObject.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImageObject.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImageObject.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImageObject.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImageSize.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImageSize.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImageSize.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImageSize.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImageTagsModule.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImageTagsModule.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImageTagsModule.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImageTagsModule.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImageType.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImageType.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImageType.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImageType.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Images.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Images.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Images.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Images.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImagesImageMetadata.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImagesImageMetadata.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImagesImageMetadata.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImagesImageMetadata.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImagesModule.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImagesModule.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ImagesModule.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ImagesModule.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/InsightsTag.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/InsightsTag.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/InsightsTag.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/InsightsTag.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Intangible.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Intangible.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Intangible.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Intangible.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ItemAvailability.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ItemAvailability.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ItemAvailability.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ItemAvailability.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/MediaObject.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/MediaObject.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/MediaObject.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/MediaObject.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/NormalizedRectangle.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/NormalizedRectangle.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/NormalizedRectangle.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/NormalizedRectangle.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Offer.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Offer.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Offer.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Offer.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Organization.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Organization.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Organization.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Organization.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Person.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Person.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Person.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Person.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/PivotSuggestions.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/PivotSuggestions.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/PivotSuggestions.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/PivotSuggestions.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/PropertiesItem.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/PropertiesItem.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/PropertiesItem.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/PropertiesItem.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Query.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Query.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Query.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Query.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Rating.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Rating.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Rating.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Rating.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Recipe.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Recipe.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Recipe.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Recipe.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/RecipesModule.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/RecipesModule.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/RecipesModule.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/RecipesModule.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/RecognizedEntitiesModule.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/RecognizedEntitiesModule.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/RecognizedEntitiesModule.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/RecognizedEntitiesModule.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/RecognizedEntity.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/RecognizedEntity.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/RecognizedEntity.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/RecognizedEntity.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/RecognizedEntityGroup.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/RecognizedEntityGroup.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/RecognizedEntityGroup.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/RecognizedEntityGroup.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/RecognizedEntityRegion.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/RecognizedEntityRegion.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/RecognizedEntityRegion.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/RecognizedEntityRegion.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/RelatedCollectionsModule.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/RelatedCollectionsModule.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/RelatedCollectionsModule.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/RelatedCollectionsModule.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/RelatedSearchesModule.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/RelatedSearchesModule.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/RelatedSearchesModule.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/RelatedSearchesModule.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Response.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Response.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Response.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Response.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ResponseBase.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ResponseBase.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/ResponseBase.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/ResponseBase.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/SafeSearch.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/SafeSearch.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/SafeSearch.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/SafeSearch.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/SearchResultsAnswer.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/SearchResultsAnswer.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/SearchResultsAnswer.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/SearchResultsAnswer.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/StructuredValue.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/StructuredValue.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/StructuredValue.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/StructuredValue.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Thing.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Thing.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/Thing.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/Thing.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/TrendingImages.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/TrendingImages.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/TrendingImages.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/TrendingImages.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/TrendingImagesCategory.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/TrendingImagesCategory.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/TrendingImagesCategory.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/TrendingImagesCategory.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/TrendingImagesTile.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/TrendingImagesTile.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/TrendingImagesTile.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/TrendingImagesTile.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/WebPage.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/WebPage.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Generated/Models/WebPage.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Generated/Models/WebPage.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Microsoft.Azure.CognitiveServices.Search.ImageSearch.csproj b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Microsoft.Azure.CognitiveServices.Search.ImageSearch.csproj
similarity index 72%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Microsoft.Azure.CognitiveServices.Search.ImageSearch.csproj
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Microsoft.Azure.CognitiveServices.Search.ImageSearch.csproj
index 2cf5f5f896ea..c0d1d1585725 100644
--- a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Microsoft.Azure.CognitiveServices.Search.ImageSearch.csproj
+++ b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Microsoft.Azure.CognitiveServices.Search.ImageSearch.csproj
@@ -1,5 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <!-- Please do not move/edit code below this line -->
   <Import Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.reference.props'))" />
+  <!-- Please do not move/edit code above this line -->
+  
   <PropertyGroup>
     <PackageId>Microsoft.Azure.CognitiveServices.Search.ImageSearch</PackageId>
     <Description>This client library provides access to the Microsoft Cognitive Services Image Search API.</Description>
@@ -11,7 +14,8 @@
   <PropertyGroup>
     <TargetFrameworks>net452;netstandard1.4</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
+  
+  <!-- Please do not move/edit code below this line -->
+  <Import Condition=" Exists('$([MSBuild]::GetPathOfFileAbove(AzSdk.RP.props))') " Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.RP.props'))" />
+  <!-- Please do not move/edit code above this line -->
 </Project>
\ No newline at end of file
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Properties/AssemblyInfo.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/Properties/AssemblyInfo.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/Properties/AssemblyInfo.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/generate.cmd b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/generate.cmd
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/generate.cmd
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/BingImageSearch/generate.cmd
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch.Tests/Microsoft.Azure.CognitiveServices.Search.VideoSearch.Tests.csproj b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch.Tests/Microsoft.Azure.CognitiveServices.Search.VideoSearch.Tests.csproj
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch.Tests/Microsoft.Azure.CognitiveServices.Search.VideoSearch.Tests.csproj
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch.Tests/Microsoft.Azure.CognitiveServices.Search.VideoSearch.Tests.csproj
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch.Tests/SessionRecords/SearchSDK.Tests.VideoSearchTests/VideoDetail.json b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch.Tests/SessionRecords/SearchSDK.Tests.VideoSearchTests/VideoDetail.json
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch.Tests/SessionRecords/SearchSDK.Tests.VideoSearchTests/VideoDetail.json
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch.Tests/SessionRecords/SearchSDK.Tests.VideoSearchTests/VideoDetail.json
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch.Tests/SessionRecords/SearchSDK.Tests.VideoSearchTests/VideoSearch.json b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch.Tests/SessionRecords/SearchSDK.Tests.VideoSearchTests/VideoSearch.json
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch.Tests/SessionRecords/SearchSDK.Tests.VideoSearchTests/VideoSearch.json
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch.Tests/SessionRecords/SearchSDK.Tests.VideoSearchTests/VideoSearch.json
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch.Tests/SessionRecords/SearchSDK.Tests.VideoSearchTests/VideoTrending.json b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch.Tests/SessionRecords/SearchSDK.Tests.VideoSearchTests/VideoTrending.json
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch.Tests/SessionRecords/SearchSDK.Tests.VideoSearchTests/VideoTrending.json
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch.Tests/SessionRecords/SearchSDK.Tests.VideoSearchTests/VideoTrending.json
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch.Tests/VideoSearchTests.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch.Tests/VideoSearchTests.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch.Tests/VideoSearchTests.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch.Tests/VideoSearchTests.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch.sln b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch.sln
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch.sln
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch.sln
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Customizations/ApiKeyServiceClientCredentials.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Customizations/ApiKeyServiceClientCredentials.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Customizations/ApiKeyServiceClientCredentials.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Customizations/ApiKeyServiceClientCredentials.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/IVideoSearchAPI.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/IVideoSearchAPI.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/IVideoSearchAPI.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/IVideoSearchAPI.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/IVideosOperations.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/IVideosOperations.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/IVideosOperations.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/IVideosOperations.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/Answer.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/Answer.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/Answer.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/Answer.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/CreativeWork.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/CreativeWork.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/CreativeWork.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/CreativeWork.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/Error.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/Error.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/Error.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/Error.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/ErrorCode.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/ErrorCode.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/ErrorCode.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/ErrorCode.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/ErrorResponse.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/ErrorResponse.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/ErrorResponse.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/ErrorResponse.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/ErrorResponseException.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/ErrorResponseException.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/ErrorResponseException.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/ErrorResponseException.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/ErrorSubCode.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/ErrorSubCode.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/ErrorSubCode.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/ErrorSubCode.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/Freshness.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/Freshness.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/Freshness.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/Freshness.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/Identifiable.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/Identifiable.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/Identifiable.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/Identifiable.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/ImageObject.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/ImageObject.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/ImageObject.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/ImageObject.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/MediaObject.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/MediaObject.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/MediaObject.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/MediaObject.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/PivotSuggestions.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/PivotSuggestions.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/PivotSuggestions.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/PivotSuggestions.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/Query.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/Query.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/Query.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/Query.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/QueryContext.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/QueryContext.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/QueryContext.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/QueryContext.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/Response.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/Response.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/Response.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/Response.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/ResponseBase.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/ResponseBase.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/ResponseBase.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/ResponseBase.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/SafeSearch.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/SafeSearch.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/SafeSearch.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/SafeSearch.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/SearchResultsAnswer.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/SearchResultsAnswer.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/SearchResultsAnswer.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/SearchResultsAnswer.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/TextFormat.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/TextFormat.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/TextFormat.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/TextFormat.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/Thing.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/Thing.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/Thing.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/Thing.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/TrendingVideos.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/TrendingVideos.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/TrendingVideos.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/TrendingVideos.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/TrendingVideosCategory.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/TrendingVideosCategory.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/TrendingVideosCategory.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/TrendingVideosCategory.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/TrendingVideosSubcategory.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/TrendingVideosSubcategory.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/TrendingVideosSubcategory.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/TrendingVideosSubcategory.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/TrendingVideosTile.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/TrendingVideosTile.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/TrendingVideosTile.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/TrendingVideosTile.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/VideoDetails.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/VideoDetails.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/VideoDetails.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/VideoDetails.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/VideoInsightModule.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/VideoInsightModule.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/VideoInsightModule.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/VideoInsightModule.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/VideoLength.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/VideoLength.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/VideoLength.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/VideoLength.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/VideoObject.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/VideoObject.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/VideoObject.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/VideoObject.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/VideoPricing.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/VideoPricing.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/VideoPricing.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/VideoPricing.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/VideoQueryScenario.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/VideoQueryScenario.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/VideoQueryScenario.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/VideoQueryScenario.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/VideoResolution.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/VideoResolution.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/VideoResolution.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/VideoResolution.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/Videos.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/Videos.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/Videos.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/Videos.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/VideosModule.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/VideosModule.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/Models/VideosModule.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/Models/VideosModule.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/VideoSearchAPI.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/VideoSearchAPI.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/VideoSearchAPI.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/VideoSearchAPI.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/VideosOperations.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/VideosOperations.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/VideosOperations.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/VideosOperations.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/VideosOperationsExtensions.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/VideosOperationsExtensions.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Generated/VideosOperationsExtensions.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Generated/VideosOperationsExtensions.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Microsoft.Azure.CognitiveServices.Search.VideoSearch.csproj b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Microsoft.Azure.CognitiveServices.Search.VideoSearch.csproj
similarity index 72%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Microsoft.Azure.CognitiveServices.Search.VideoSearch.csproj
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Microsoft.Azure.CognitiveServices.Search.VideoSearch.csproj
index 7ba31dc7ad80..44ff79cf0ab8 100644
--- a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Microsoft.Azure.CognitiveServices.Search.VideoSearch.csproj
+++ b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Microsoft.Azure.CognitiveServices.Search.VideoSearch.csproj
@@ -1,5 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <!-- Please do not move/edit code below this line -->
   <Import Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.reference.props'))" />
+  <!-- Please do not move/edit code above this line -->
+  
   <PropertyGroup>
     <PackageId>Microsoft.Azure.CognitiveServices.Search.VideoSearch</PackageId>
     <Description>This client library provides access to the Microsoft Cognitive Services Video Search API.</Description>
@@ -11,7 +14,8 @@
   <PropertyGroup>
     <TargetFrameworks>net452;netstandard1.4</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
+  
+  <!-- Please do not move/edit code below this line -->
+  <Import Condition=" Exists('$([MSBuild]::GetPathOfFileAbove(AzSdk.RP.props))') " Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.RP.props'))" />
+  <!-- Please do not move/edit code above this line -->
 </Project>
\ No newline at end of file
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Properties/AssemblyInfo.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/Properties/AssemblyInfo.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/Properties/AssemblyInfo.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/generate.cmd b/src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/generate.cmd
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/generate.cmd
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingVideoSearch/BingVideoSearch/generate.cmd
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch.Tests/Microsoft.Azure.CognitiveServices.Search.WebSearch.Tests.csproj b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch.Tests/Microsoft.Azure.CognitiveServices.Search.WebSearch.Tests.csproj
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch.Tests/Microsoft.Azure.CognitiveServices.Search.WebSearch.Tests.csproj
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch.Tests/Microsoft.Azure.CognitiveServices.Search.WebSearch.Tests.csproj
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch.Tests/SessionRecords/SearchSDK.Tests.WebSearchTests/WebSearch.json b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch.Tests/SessionRecords/SearchSDK.Tests.WebSearchTests/WebSearch.json
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch.Tests/SessionRecords/SearchSDK.Tests.WebSearchTests/WebSearch.json
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch.Tests/SessionRecords/SearchSDK.Tests.WebSearchTests/WebSearch.json
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch.Tests/WebSearchTests.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch.Tests/WebSearchTests.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch.Tests/WebSearchTests.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch.Tests/WebSearchTests.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch.sln b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch.sln
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch.sln
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch.sln
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Customizations/ApiKeyServiceClientCredentials.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Customizations/ApiKeyServiceClientCredentials.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Customizations/ApiKeyServiceClientCredentials.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Customizations/ApiKeyServiceClientCredentials.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/IWeb.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/IWeb.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/IWeb.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/IWeb.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/IWebSearchAPI.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/IWebSearchAPI.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/IWebSearchAPI.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/IWebSearchAPI.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/Answer.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/Answer.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/Answer.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/Answer.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/AnswerType.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/AnswerType.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/AnswerType.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/AnswerType.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/Article.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/Article.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/Article.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/Article.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/Computation.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/Computation.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/Computation.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/Computation.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/CreativeWork.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/CreativeWork.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/CreativeWork.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/CreativeWork.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/Error.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/Error.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/Error.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/Error.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/ErrorCode.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/ErrorCode.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/ErrorCode.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/ErrorCode.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/ErrorResponse.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/ErrorResponse.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/ErrorResponse.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/ErrorResponse.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/ErrorResponseException.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/ErrorResponseException.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/ErrorResponseException.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/ErrorResponseException.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/ErrorSubCode.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/ErrorSubCode.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/ErrorSubCode.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/ErrorSubCode.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/Freshness.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/Freshness.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/Freshness.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/Freshness.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/Identifiable.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/Identifiable.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/Identifiable.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/Identifiable.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/ImageObject.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/ImageObject.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/ImageObject.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/ImageObject.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/Images.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/Images.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/Images.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/Images.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/Intangible.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/Intangible.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/Intangible.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/Intangible.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/MediaObject.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/MediaObject.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/MediaObject.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/MediaObject.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/News.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/News.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/News.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/News.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/NewsArticle.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/NewsArticle.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/NewsArticle.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/NewsArticle.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/Places.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/Places.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/Places.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/Places.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/Query.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/Query.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/Query.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/Query.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/QueryContext.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/QueryContext.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/QueryContext.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/QueryContext.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/RankingRankingGroup.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/RankingRankingGroup.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/RankingRankingGroup.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/RankingRankingGroup.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/RankingRankingItem.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/RankingRankingItem.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/RankingRankingItem.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/RankingRankingItem.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/RankingRankingResponse.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/RankingRankingResponse.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/RankingRankingResponse.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/RankingRankingResponse.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/RelatedSearchesRelatedSearchAnswer.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/RelatedSearchesRelatedSearchAnswer.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/RelatedSearchesRelatedSearchAnswer.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/RelatedSearchesRelatedSearchAnswer.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/Response.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/Response.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/Response.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/Response.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/ResponseBase.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/ResponseBase.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/ResponseBase.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/ResponseBase.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/SafeSearch.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/SafeSearch.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/SafeSearch.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/SafeSearch.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/SearchResponse.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/SearchResponse.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/SearchResponse.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/SearchResponse.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/SearchResultsAnswer.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/SearchResultsAnswer.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/SearchResultsAnswer.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/SearchResultsAnswer.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/SpellSuggestions.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/SpellSuggestions.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/SpellSuggestions.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/SpellSuggestions.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/StructuredValue.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/StructuredValue.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/StructuredValue.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/StructuredValue.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/TextFormat.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/TextFormat.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/TextFormat.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/TextFormat.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/Thing.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/Thing.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/Thing.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/Thing.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/TimeZone.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/TimeZone.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/TimeZone.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/TimeZone.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/TimeZoneTimeZoneInformation.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/TimeZoneTimeZoneInformation.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/TimeZoneTimeZoneInformation.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/TimeZoneTimeZoneInformation.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/VideoObject.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/VideoObject.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/VideoObject.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/VideoObject.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/Videos.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/Videos.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/Videos.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/Videos.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/WebMetaTag.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/WebMetaTag.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/WebMetaTag.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/WebMetaTag.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/WebPage.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/WebPage.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/WebPage.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/WebPage.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/WebWebAnswer.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/WebWebAnswer.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/WebWebAnswer.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/WebWebAnswer.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/WebWebGrouping.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/WebWebGrouping.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Models/WebWebGrouping.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Models/WebWebGrouping.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Web.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Web.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/Web.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/Web.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/WebExtensions.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/WebExtensions.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/WebExtensions.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/WebExtensions.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/WebSearchAPI.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/WebSearchAPI.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Generated/WebSearch/WebSearchAPI.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Generated/WebSearch/WebSearchAPI.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Microsoft.Azure.CognitiveServices.Search.WebSearch.csproj b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Microsoft.Azure.CognitiveServices.Search.WebSearch.csproj
similarity index 71%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Microsoft.Azure.CognitiveServices.Search.WebSearch.csproj
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Microsoft.Azure.CognitiveServices.Search.WebSearch.csproj
index a3f81be78b7b..129551924507 100644
--- a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Microsoft.Azure.CognitiveServices.Search.WebSearch.csproj
+++ b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Microsoft.Azure.CognitiveServices.Search.WebSearch.csproj
@@ -1,5 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <!-- Please do not move/edit code below this line -->
   <Import Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.reference.props'))" />
+  <!-- Please do not move/edit code above this line -->
+  
   <PropertyGroup>
     <PackageId>Microsoft.Azure.CognitiveServices.Search.WebSearch</PackageId>
     <Description>This client library provides access to the Microsoft Cognitive Services Web Search API.</Description>
@@ -11,7 +14,8 @@
   <PropertyGroup>
     <TargetFrameworks>net452;netstandard1.4</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
+  
+  <!-- Please do not move/edit code below this line -->
+  <Import Condition=" Exists('$([MSBuild]::GetPathOfFileAbove(AzSdk.RP.props))') " Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.RP.props'))" />
+  <!-- Please do not move/edit code above this line -->
 </Project>
\ No newline at end of file
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Properties/AssemblyInfo.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/Properties/AssemblyInfo.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/Properties/AssemblyInfo.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/generate.cmd b/src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/generate.cmd
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/generate.cmd
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingWebSearch/BingWebSearch/generate.cmd