diff --git a/src/AzureStack/AzureBridgeAdmin/AzSdk.RP.props b/src/AzureStack/Admin/AzureBridgeAdmin/AzSdk.RP.props
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzSdk.RP.props
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzSdk.RP.props
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/AzureBridge.Tests.csproj b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/AzureBridge.Tests.csproj
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/AzureBridge.Tests.csproj
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/AzureBridge.Tests.csproj
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/Properties/AssemblyInfo.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/Properties/AssemblyInfo.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/Properties/AssemblyInfo.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestDownloadAzsAzureBridgeProduct.json b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestDownloadAzsAzureBridgeProduct.json
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestDownloadAzsAzureBridgeProduct.json
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestDownloadAzsAzureBridgeProduct.json
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeActivationByName.json b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeActivationByName.json
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeActivationByName.json
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeActivationByName.json
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeDownloadedProduct.json b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeDownloadedProduct.json
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeDownloadedProduct.json
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeDownloadedProduct.json
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeDownloadedProductByProductName.json b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeDownloadedProductByProductName.json
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeDownloadedProductByProductName.json
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeDownloadedProductByProductName.json
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeProductByName.json b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeProductByName.json
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeProductByName.json
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeProductByName.json
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetNonExistantActication.json b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetNonExistantActication.json
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetNonExistantActication.json
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetNonExistantActication.json
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetNonExistantDownloadedProduct.json b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetNonExistantDownloadedProduct.json
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetNonExistantDownloadedProduct.json
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetNonExistantDownloadedProduct.json
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetNonExistantProduct.json b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetNonExistantProduct.json
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetNonExistantProduct.json
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestGetNonExistantProduct.json
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestListActivations.json b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestListActivations.json
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestListActivations.json
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestListActivations.json
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestListAzsAzureBridgeActivation.json b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestListAzsAzureBridgeActivation.json
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestListAzsAzureBridgeActivation.json
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestListAzsAzureBridgeActivation.json
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestListAzsAzureBridgeProduct.json b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestListAzsAzureBridgeProduct.json
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestListAzsAzureBridgeProduct.json
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestListAzsAzureBridgeProduct.json
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestListDownloadedProducts.json b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestListDownloadedProducts.json
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestListDownloadedProducts.json
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestListDownloadedProducts.json
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestListProducts.json b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestListProducts.json
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestListProducts.json
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestListProducts.json
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestRemoveAzsAzureBridgeDownloadedProduct.json b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestRemoveAzsAzureBridgeDownloadedProduct.json
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestRemoveAzsAzureBridgeDownloadedProduct.json
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/SessionRecords/AzureBridgeAdminClient/TestRemoveAzsAzureBridgeDownloadedProduct.json
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/setEnvironment.cmd b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/setEnvironment.cmd
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/setEnvironment.cmd
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/setEnvironment.cmd
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/ActivationTests.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/ActivationTests.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/ActivationTests.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/ActivationTests.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/DownloadedProductTests.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/DownloadedProductTests.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/DownloadedProductTests.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/DownloadedProductTests.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/Helpers/AzureBridgeTestBase.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/Helpers/AzureBridgeTestBase.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/Helpers/AzureBridgeTestBase.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/Helpers/AzureBridgeTestBase.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/Helpers/AzureStackTestBase.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/Helpers/AzureStackTestBase.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/Helpers/AzureStackTestBase.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/Helpers/AzureStackTestBase.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/Helpers/Common.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/Helpers/Common.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/Helpers/Common.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/Helpers/Common.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/ProductTests.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/ProductTests.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/ProductTests.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/ProductTests.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestDownloadAzsAzureBridgeProduct.json b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestDownloadAzsAzureBridgeProduct.json
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestDownloadAzsAzureBridgeProduct.json
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestDownloadAzsAzureBridgeProduct.json
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeActivationByName.json b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeActivationByName.json
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeActivationByName.json
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeActivationByName.json
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeDownloadedProduct.json b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeDownloadedProduct.json
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeDownloadedProduct.json
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeDownloadedProduct.json
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeDownloadedProductByProductName.json b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeDownloadedProductByProductName.json
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeDownloadedProductByProductName.json
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeDownloadedProductByProductName.json
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeProductByName.json b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeProductByName.json
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeProductByName.json
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestGetAzsAzureBridgeProductByName.json
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestListAzsAzureBridgeActivation.json b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestListAzsAzureBridgeActivation.json
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestListAzsAzureBridgeActivation.json
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestListAzsAzureBridgeActivation.json
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestListAzsAzureBridgeProduct.json b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestListAzsAzureBridgeProduct.json
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestListAzsAzureBridgeProduct.json
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestListAzsAzureBridgeProduct.json
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestRemoveAzsAzureBridgeDownloadedProduct.json b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestRemoveAzsAzureBridgeDownloadedProduct.json
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestRemoveAzsAzureBridgeDownloadedProduct.json
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/src/SessionRecords/AzureBridgeAdminClient/TestRemoveAzsAzureBridgeDownloadedProduct.json
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/ActivationsOperations.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/ActivationsOperations.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/ActivationsOperations.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/ActivationsOperations.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/ActivationsOperationsExtensions.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/ActivationsOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/ActivationsOperationsExtensions.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/ActivationsOperationsExtensions.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/AzureBridgeAdminClient.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/AzureBridgeAdminClient.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/AzureBridgeAdminClient.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/AzureBridgeAdminClient.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/DownloadedProductsOperations.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/DownloadedProductsOperations.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/DownloadedProductsOperations.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/DownloadedProductsOperations.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/DownloadedProductsOperationsExtensions.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/DownloadedProductsOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/DownloadedProductsOperationsExtensions.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/DownloadedProductsOperationsExtensions.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/IActivationsOperations.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/IActivationsOperations.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/IActivationsOperations.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/IActivationsOperations.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/IAzureBridgeAdminClient.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/IAzureBridgeAdminClient.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/IAzureBridgeAdminClient.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/IAzureBridgeAdminClient.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/IDownloadedProductsOperations.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/IDownloadedProductsOperations.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/IDownloadedProductsOperations.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/IDownloadedProductsOperations.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/IProductsOperations.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/IProductsOperations.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/IProductsOperations.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/IProductsOperations.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/Activation.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/Activation.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/Activation.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/Activation.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/ActivationResource.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/ActivationResource.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/ActivationResource.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/ActivationResource.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/DownloadedProductResource.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/DownloadedProductResource.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/DownloadedProductResource.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/DownloadedProductResource.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/GalleryIcons.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/GalleryIcons.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/GalleryIcons.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/GalleryIcons.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/Page.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/Page.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/Page.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/Page.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/ProductBase.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/ProductBase.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/ProductBase.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/ProductBase.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/ProductLink.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/ProductLink.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/ProductLink.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/ProductLink.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/ProductProperties.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/ProductProperties.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/ProductProperties.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/ProductProperties.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/ProductResource.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/ProductResource.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/ProductResource.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/ProductResource.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/ProvisioningState.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/ProvisioningState.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/ProvisioningState.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/ProvisioningState.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/Resource.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/Resource.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/Resource.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/Models/Resource.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/ProductsOperations.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/ProductsOperations.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/ProductsOperations.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/ProductsOperations.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/ProductsOperationsExtensions.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/ProductsOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/ProductsOperationsExtensions.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/ProductsOperationsExtensions.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/SdkInfo_AzureBridgeAdminClient.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/SdkInfo_AzureBridgeAdminClient.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Generated/SdkInfo_AzureBridgeAdminClient.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Generated/SdkInfo_AzureBridgeAdminClient.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Microsoft.AzureStack.Management.AzureBridge.Admin.csproj b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Microsoft.AzureStack.Management.AzureBridge.Admin.csproj
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Microsoft.AzureStack.Management.AzureBridge.Admin.csproj
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Microsoft.AzureStack.Management.AzureBridge.Admin.csproj
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Properties/AssemblyInfo.cs b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/Properties/AssemblyInfo.cs
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/Properties/AssemblyInfo.cs
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/generate.cmd b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/generate.cmd
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/generate.cmd
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/generate.cmd
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/generate.ps1 b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/generate.ps1
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.Admin/generate.ps1
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin/generate.ps1
diff --git a/src/AzureStack/AzureBridgeAdmin/AzureBridge.sln b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.sln
similarity index 100%
rename from src/AzureStack/AzureBridgeAdmin/AzureBridge.sln
rename to src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.sln
diff --git a/src/AzureStack/CommerceAdmin/AzSdk.RP.props b/src/AzureStack/Admin/CommerceAdmin/AzSdk.RP.props
similarity index 100%
rename from src/AzureStack/CommerceAdmin/AzSdk.RP.props
rename to src/AzureStack/Admin/CommerceAdmin/AzSdk.RP.props
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin.Tests/Commerce.Tests.csproj b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin.Tests/Commerce.Tests.csproj
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin.Tests/Commerce.Tests.csproj
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin.Tests/Commerce.Tests.csproj
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin.Tests/Properties/AssemblyInfo.cs b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin.Tests/Properties/AssemblyInfo.cs
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin.Tests/Properties/AssemblyInfo.cs
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin.Tests/SessionRecords/CommerceAdminClient/TestListSubscriberUsageAggregatesFromLastTwoDays.json b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin.Tests/SessionRecords/CommerceAdminClient/TestListSubscriberUsageAggregatesFromLastTwoDays.json
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin.Tests/SessionRecords/CommerceAdminClient/TestListSubscriberUsageAggregatesFromLastTwoDays.json
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin.Tests/SessionRecords/CommerceAdminClient/TestListSubscriberUsageAggregatesFromLastTwoDays.json
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin.Tests/SessionRecords/CommerceAdminClient/TestListSupportedOperations.json b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin.Tests/SessionRecords/CommerceAdminClient/TestListSupportedOperations.json
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin.Tests/SessionRecords/CommerceAdminClient/TestListSupportedOperations.json
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin.Tests/SessionRecords/CommerceAdminClient/TestListSupportedOperations.json
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin.Tests/SessionRecords/CommerceAdminClient/TestUpdateEncruption.json b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin.Tests/SessionRecords/CommerceAdminClient/TestUpdateEncruption.json
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin.Tests/SessionRecords/CommerceAdminClient/TestUpdateEncruption.json
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin.Tests/SessionRecords/CommerceAdminClient/TestUpdateEncruption.json
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin.Tests/src/Helpers/AzureStackTestBase.cs b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin.Tests/src/Helpers/AzureStackTestBase.cs
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin.Tests/src/Helpers/AzureStackTestBase.cs
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin.Tests/src/Helpers/AzureStackTestBase.cs
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin.Tests/src/Helpers/CommerceTestBase.cs b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin.Tests/src/Helpers/CommerceTestBase.cs
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin.Tests/src/Helpers/CommerceTestBase.cs
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin.Tests/src/Helpers/CommerceTestBase.cs
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin.Tests/src/Helpers/Common.cs b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin.Tests/src/Helpers/Common.cs
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin.Tests/src/Helpers/Common.cs
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin.Tests/src/Helpers/Common.cs
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin.Tests/src/SubscriberUsageAggregateTests.cs b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin.Tests/src/SubscriberUsageAggregateTests.cs
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin.Tests/src/SubscriberUsageAggregateTests.cs
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin.Tests/src/SubscriberUsageAggregateTests.cs
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin.Tests/src/SupportedOperationsTest.cs b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin.Tests/src/SupportedOperationsTest.cs
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin.Tests/src/SupportedOperationsTest.cs
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin.Tests/src/SupportedOperationsTest.cs
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin.Tests/src/UpdateEncryptionTests.cs b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin.Tests/src/UpdateEncryptionTests.cs
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin.Tests/src/UpdateEncryptionTests.cs
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin.Tests/src/UpdateEncryptionTests.cs
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/CommerceAdminClient.cs b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/CommerceAdminClient.cs
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/CommerceAdminClient.cs
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/CommerceAdminClient.cs
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/CommerceAdminClientExtensions.cs b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/CommerceAdminClientExtensions.cs
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/CommerceAdminClientExtensions.cs
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/CommerceAdminClientExtensions.cs
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/ICommerceAdminClient.cs b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/ICommerceAdminClient.cs
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/ICommerceAdminClient.cs
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/ICommerceAdminClient.cs
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/IOperations.cs b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/IOperations.cs
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/IOperations.cs
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/IOperations.cs
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/ISubscriberUsageAggregatesOperations.cs b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/ISubscriberUsageAggregatesOperations.cs
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/ISubscriberUsageAggregatesOperations.cs
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/ISubscriberUsageAggregatesOperations.cs
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/Models/Display.cs b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/Models/Display.cs
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/Models/Display.cs
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/Models/Display.cs
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/Models/Operation.cs b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/Models/Operation.cs
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/Models/Operation.cs
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/Models/Operation.cs
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/Models/Page.cs b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/Models/Page.cs
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/Models/Page.cs
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/Models/Page.cs
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/Models/Resource.cs b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/Models/Resource.cs
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/Models/Resource.cs
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/Models/Resource.cs
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/Models/UsageAggregate.cs b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/Models/UsageAggregate.cs
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/Models/UsageAggregate.cs
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/Models/UsageAggregate.cs
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/Operations.cs b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/Operations.cs
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/Operations.cs
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/Operations.cs
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/OperationsExtensions.cs b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/OperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/OperationsExtensions.cs
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/OperationsExtensions.cs
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/SdkInfo_CommerceAdminClient.cs b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/SdkInfo_CommerceAdminClient.cs
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/SdkInfo_CommerceAdminClient.cs
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/SdkInfo_CommerceAdminClient.cs
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/SubscriberUsageAggregatesOperations.cs b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/SubscriberUsageAggregatesOperations.cs
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/SubscriberUsageAggregatesOperations.cs
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/SubscriberUsageAggregatesOperations.cs
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/SubscriberUsageAggregatesOperationsExtensions.cs b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/SubscriberUsageAggregatesOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin/Generated/SubscriberUsageAggregatesOperationsExtensions.cs
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Generated/SubscriberUsageAggregatesOperationsExtensions.cs
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin/Microsoft.AzureStack.Management.Commerce.Admin.csproj b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Microsoft.AzureStack.Management.Commerce.Admin.csproj
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin/Microsoft.AzureStack.Management.Commerce.Admin.csproj
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Microsoft.AzureStack.Management.Commerce.Admin.csproj
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin/Properties/AssemblyInfo.cs b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin/Properties/AssemblyInfo.cs
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/Properties/AssemblyInfo.cs
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin/generate.cmd b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/generate.cmd
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin/generate.cmd
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/generate.cmd
diff --git a/src/AzureStack/CommerceAdmin/Commerce.Admin/generate.ps1 b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/generate.ps1
similarity index 100%
rename from src/AzureStack/CommerceAdmin/Commerce.Admin/generate.ps1
rename to src/AzureStack/Admin/CommerceAdmin/Commerce.Admin/generate.ps1
diff --git a/src/AzureStack/CommerceAdmin/CommerceAdmin.sln b/src/AzureStack/Admin/CommerceAdmin/CommerceAdmin.sln
similarity index 100%
rename from src/AzureStack/CommerceAdmin/CommerceAdmin.sln
rename to src/AzureStack/Admin/CommerceAdmin/CommerceAdmin.sln
diff --git a/src/AzureStack/ComputeAdmin/AzSdk.RP.props b/src/AzureStack/Admin/ComputeAdmin/AzSdk.RP.props
similarity index 100%
rename from src/AzureStack/ComputeAdmin/AzSdk.RP.props
rename to src/AzureStack/Admin/ComputeAdmin/AzSdk.RP.props
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/Compute.Tests.csproj b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/Compute.Tests.csproj
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/Compute.Tests.csproj
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/Compute.Tests.csproj
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/Properties/AssemblyInfo.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/Properties/AssemblyInfo.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/Properties/AssemblyInfo.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/CreateUpdateDeleteQuota.json b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/CreateUpdateDeleteQuota.json
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/CreateUpdateDeleteQuota.json
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/CreateUpdateDeleteQuota.json
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateAndDeletePlatformImage.json b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateAndDeletePlatformImage.json
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateAndDeletePlatformImage.json
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateAndDeletePlatformImage.json
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateAndDeleteVMExtension.json b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateAndDeleteVMExtension.json
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateAndDeleteVMExtension.json
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateAndDeleteVMExtension.json
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateInvalidQuota.json b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateInvalidQuota.json
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateInvalidQuota.json
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateInvalidQuota.json
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreatePlatformImage.json b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreatePlatformImage.json
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreatePlatformImage.json
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreatePlatformImage.json
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateQuota.json b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateQuota.json
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateQuota.json
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateQuota.json
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateQuotaOnInvalidLocation.json b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateQuotaOnInvalidLocation.json
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateQuotaOnInvalidLocation.json
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateQuotaOnInvalidLocation.json
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateUpdatePlatformImage.json b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateUpdatePlatformImage.json
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateUpdatePlatformImage.json
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateUpdatePlatformImage.json
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateUpdateVMExtension.json b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateUpdateVMExtension.json
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateUpdateVMExtension.json
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateUpdateVMExtension.json
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateVMExtension.json b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateVMExtension.json
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateVMExtension.json
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestCreateVMExtension.json
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestDeleteNonExistingQuota.json b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestDeleteNonExistingQuota.json
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestDeleteNonExistingQuota.json
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestDeleteNonExistingQuota.json
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestDeleteVMExtension.json b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestDeleteVMExtension.json
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestDeleteVMExtension.json
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestDeleteVMExtension.json
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestForceDeleteVMExtension.json b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestForceDeleteVMExtension.json
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestForceDeleteVMExtension.json
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestForceDeleteVMExtension.json
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestGetAllPlatformImages.json b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestGetAllPlatformImages.json
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestGetAllPlatformImages.json
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestGetAllPlatformImages.json
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestGetAllQuotas.json b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestGetAllQuotas.json
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestGetAllQuotas.json
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestGetAllQuotas.json
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestGetAllVMExtensions.json b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestGetAllVMExtensions.json
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestGetAllVMExtensions.json
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestGetAllVMExtensions.json
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestGetPlatformImage.json b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestGetPlatformImage.json
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestGetPlatformImage.json
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestGetPlatformImage.json
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestGetQuota.json b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestGetQuota.json
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestGetQuota.json
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestGetQuota.json
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestGetVMExtension.json b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestGetVMExtension.json
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestGetVMExtension.json
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestGetVMExtension.json
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestListInvalidLocation.json b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestListInvalidLocation.json
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestListInvalidLocation.json
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestListInvalidLocation.json
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestListPlatformImages.json b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestListPlatformImages.json
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestListPlatformImages.json
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestListPlatformImages.json
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestListQuotas.json b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestListQuotas.json
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestListQuotas.json
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestListQuotas.json
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestListVMExtensions.json b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestListVMExtensions.json
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestListVMExtensions.json
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/SessionRecords/ComputeAdminClient/TestListVMExtensions.json
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/src/Helpers/AzureStackTestBase.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/src/Helpers/AzureStackTestBase.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/src/Helpers/AzureStackTestBase.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/src/Helpers/AzureStackTestBase.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/src/Helpers/Common.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/src/Helpers/Common.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/src/Helpers/Common.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/src/Helpers/Common.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/src/Helpers/ComputeTestBase.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/src/Helpers/ComputeTestBase.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/src/Helpers/ComputeTestBase.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/src/Helpers/ComputeTestBase.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/src/PlatformImageTests.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/src/PlatformImageTests.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/src/PlatformImageTests.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/src/PlatformImageTests.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/src/QuotaTests.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/src/QuotaTests.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/src/QuotaTests.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/src/QuotaTests.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/src/SupportedOperationsTest.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/src/SupportedOperationsTest.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/src/SupportedOperationsTest.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/src/SupportedOperationsTest.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin.Tests/src/VMExtensionTests.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/src/VMExtensionTests.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin.Tests/src/VMExtensionTests.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/src/VMExtensionTests.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/ComputeAdminClient.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/ComputeAdminClient.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/ComputeAdminClient.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/ComputeAdminClient.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/IComputeAdminClient.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/IComputeAdminClient.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/IComputeAdminClient.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/IComputeAdminClient.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/IOperations.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/IOperations.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/IOperations.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/IOperations.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/IPlatformImagesOperations.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/IPlatformImagesOperations.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/IPlatformImagesOperations.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/IPlatformImagesOperations.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/IQuotasOperations.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/IQuotasOperations.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/IQuotasOperations.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/IQuotasOperations.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/IVMExtensionsOperations.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/IVMExtensionsOperations.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/IVMExtensionsOperations.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/IVMExtensionsOperations.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/AzureBlob.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/AzureBlob.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/AzureBlob.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/AzureBlob.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/DataDisk.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/DataDisk.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/DataDisk.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/DataDisk.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/Display.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/Display.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/Display.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/Display.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/ImageDetails.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/ImageDetails.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/ImageDetails.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/ImageDetails.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/Operation.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/Operation.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/Operation.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/Operation.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/OsDisk.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/OsDisk.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/OsDisk.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/OsDisk.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/OsType.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/OsType.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/OsType.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/OsType.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/Page.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/Page.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/Page.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/Page.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/Page1.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/Page1.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/Page1.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/Page1.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/PlatformImage.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/PlatformImage.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/PlatformImage.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/PlatformImage.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/PlatformImageParameters.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/PlatformImageParameters.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/PlatformImageParameters.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/PlatformImageParameters.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/ProvisioningState.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/ProvisioningState.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/ProvisioningState.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/ProvisioningState.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/Quota.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/Quota.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/Quota.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/Quota.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/Resource.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/Resource.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/Resource.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/Resource.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/VMExtension.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/VMExtension.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/VMExtension.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/VMExtension.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/VMExtensionParameters.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/VMExtensionParameters.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Models/VMExtensionParameters.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Models/VMExtensionParameters.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Operations.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Operations.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/Operations.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/Operations.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/OperationsExtensions.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/OperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/OperationsExtensions.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/OperationsExtensions.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/PlatformImagesOperations.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/PlatformImagesOperations.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/PlatformImagesOperations.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/PlatformImagesOperations.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/PlatformImagesOperationsExtensions.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/PlatformImagesOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/PlatformImagesOperationsExtensions.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/PlatformImagesOperationsExtensions.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/QuotasOperations.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/QuotasOperations.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/QuotasOperations.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/QuotasOperations.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/QuotasOperationsExtensions.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/QuotasOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/QuotasOperationsExtensions.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/QuotasOperationsExtensions.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/SdkInfo_ComputeAdminClient.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/SdkInfo_ComputeAdminClient.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/SdkInfo_ComputeAdminClient.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/SdkInfo_ComputeAdminClient.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/VMExtensionsOperations.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/VMExtensionsOperations.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/VMExtensionsOperations.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/VMExtensionsOperations.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Generated/VMExtensionsOperationsExtensions.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/VMExtensionsOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Generated/VMExtensionsOperationsExtensions.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Generated/VMExtensionsOperationsExtensions.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Microsoft.AzureStack.Management.Compute.Admin.csproj b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Microsoft.AzureStack.Management.Compute.Admin.csproj
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Microsoft.AzureStack.Management.Compute.Admin.csproj
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Microsoft.AzureStack.Management.Compute.Admin.csproj
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/Properties/AssemblyInfo.cs b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/Properties/AssemblyInfo.cs
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/Properties/AssemblyInfo.cs
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/generate.cmd b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/generate.cmd
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/generate.cmd
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/generate.cmd
diff --git a/src/AzureStack/ComputeAdmin/Compute.Admin/generate.ps1 b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin/generate.ps1
similarity index 100%
rename from src/AzureStack/ComputeAdmin/Compute.Admin/generate.ps1
rename to src/AzureStack/Admin/ComputeAdmin/Compute.Admin/generate.ps1
diff --git a/src/AzureStack/ComputeAdmin/ComputeAdmin.sln b/src/AzureStack/Admin/ComputeAdmin/ComputeAdmin.sln
similarity index 100%
rename from src/AzureStack/ComputeAdmin/ComputeAdmin.sln
rename to src/AzureStack/Admin/ComputeAdmin/ComputeAdmin.sln
diff --git a/src/AzureStack/FabricAdmin/AzSdk.RP.props b/src/AzureStack/Admin/FabricAdmin/AzSdk.RP.props
similarity index 100%
rename from src/AzureStack/FabricAdmin/AzSdk.RP.props
rename to src/AzureStack/Admin/FabricAdmin/AzSdk.RP.props
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/Fabric.Tests.csproj b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/Fabric.Tests.csproj
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/Fabric.Tests.csproj
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/Fabric.Tests.csproj
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/Properties/AssemblyInfo.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/Properties/AssemblyInfo.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/Properties/AssemblyInfo.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestCreateIpPool.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestCreateIpPool.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestCreateIpPool.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestCreateIpPool.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllEdgeGatewayPools.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllEdgeGatewayPools.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllEdgeGatewayPools.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllEdgeGatewayPools.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllEdgeGateways.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllEdgeGateways.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllEdgeGateways.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllEdgeGateways.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllFabricLocations.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllFabricLocations.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllFabricLocations.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllFabricLocations.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllFileShares.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllFileShares.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllFileShares.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllFileShares.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllInfraRoleInstances.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllInfraRoleInstances.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllInfraRoleInstances.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllInfraRoleInstances.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllInfraRoles.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllInfraRoles.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllInfraRoles.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllInfraRoles.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllIpPools.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllIpPools.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllIpPools.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllIpPools.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllLogicalNetworks.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllLogicalNetworks.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllLogicalNetworks.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllLogicalNetworks.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllLogicalSubnets.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllLogicalSubnets.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllLogicalSubnets.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllLogicalSubnets.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllMacAddressPools.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllMacAddressPools.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllMacAddressPools.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllMacAddressPools.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllScaleUnitNodes.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllScaleUnitNodes.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllScaleUnitNodes.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllScaleUnitNodes.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllScaleUnits.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllScaleUnits.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllScaleUnits.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllScaleUnits.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllSlbMuxInstances.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllSlbMuxInstances.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllSlbMuxInstances.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllSlbMuxInstances.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllStoragePools.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllStoragePools.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllStoragePools.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllStoragePools.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllStorageSystems.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllStorageSystems.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllStorageSystems.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllStorageSystems.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllVolumes.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllVolumes.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllVolumes.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetAllVolumes.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetEdgeGateway.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetEdgeGateway.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetEdgeGateway.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetEdgeGateway.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetEdgeGatewayPool.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetEdgeGatewayPool.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetEdgeGatewayPool.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetEdgeGatewayPool.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetFabricLocation.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetFabricLocation.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetFabricLocation.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetFabricLocation.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetFileShare.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetFileShare.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetFileShare.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetFileShare.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetInfraRole.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetInfraRole.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetInfraRole.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetInfraRole.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetInfraRoleInstance.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetInfraRoleInstance.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetInfraRoleInstance.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetInfraRoleInstance.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetInfraRoleInstanceOnTenantVM.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetInfraRoleInstanceOnTenantVM.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetInfraRoleInstanceOnTenantVM.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetInfraRoleInstanceOnTenantVM.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetIpPool.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetIpPool.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetIpPool.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetIpPool.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetLogicalNetwork.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetLogicalNetwork.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetLogicalNetwork.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetLogicalNetwork.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetLogicalSubnet.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetLogicalSubnet.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetLogicalSubnet.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetLogicalSubnet.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetMacAddressPool.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetMacAddressPool.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetMacAddressPool.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetMacAddressPool.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetScaleUnit.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetScaleUnit.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetScaleUnit.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetScaleUnit.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetScaleUnitNode.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetScaleUnitNode.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetScaleUnitNode.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetScaleUnitNode.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetScaleUnitNodeOnTenantVM.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetScaleUnitNodeOnTenantVM.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetScaleUnitNodeOnTenantVM.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetScaleUnitNodeOnTenantVM.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetSlbMuxInstance.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetSlbMuxInstance.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetSlbMuxInstance.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetSlbMuxInstance.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetStoragePool.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetStoragePool.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetStoragePool.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetStoragePool.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetStorageSystem.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetStorageSystem.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetStorageSystem.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetStorageSystem.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetVolume.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetVolume.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetVolume.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestGetVolume.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestInfraRoleInstancePowerOffOnTenantVM.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestInfraRoleInstancePowerOffOnTenantVM.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestInfraRoleInstancePowerOffOnTenantVM.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestInfraRoleInstancePowerOffOnTenantVM.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestInfraRoleInstancePowerOn.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestInfraRoleInstancePowerOn.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestInfraRoleInstancePowerOn.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestInfraRoleInstancePowerOn.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestInfraRoleInstancePowerOnAll.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestInfraRoleInstancePowerOnAll.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestInfraRoleInstancePowerOnAll.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestInfraRoleInstancePowerOnAll.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestInfraRoleInstanceRebootOnTenantVM.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestInfraRoleInstanceRebootOnTenantVM.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestInfraRoleInstanceRebootOnTenantVM.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestInfraRoleInstanceRebootOnTenantVM.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestInfraRoleInstanceShutdownOnTenantVM.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestInfraRoleInstanceShutdownOnTenantVM.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestInfraRoleInstanceShutdownOnTenantVM.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestInfraRoleInstanceShutdownOnTenantVM.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListEdgeGatewayPools.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListEdgeGatewayPools.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListEdgeGatewayPools.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListEdgeGatewayPools.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListEdgeGateways.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListEdgeGateways.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListEdgeGateways.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListEdgeGateways.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListFabricLocations.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListFabricLocations.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListFabricLocations.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListFabricLocations.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListFileShares.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListFileShares.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListFileShares.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListFileShares.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListInfraRoleInstances.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListInfraRoleInstances.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListInfraRoleInstances.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListInfraRoleInstances.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListInfraRoles.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListInfraRoles.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListInfraRoles.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListInfraRoles.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListIpPools.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListIpPools.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListIpPools.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListIpPools.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListLogicalNetworks.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListLogicalNetworks.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListLogicalNetworks.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListLogicalNetworks.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListLogicalSubnets.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListLogicalSubnets.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListLogicalSubnets.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListLogicalSubnets.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListMacAddressPools.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListMacAddressPools.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListMacAddressPools.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListMacAddressPools.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListOperations.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListOperations.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListOperations.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListOperations.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListScaleUnitNodes.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListScaleUnitNodes.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListScaleUnitNodes.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListScaleUnitNodes.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListScaleUnits.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListScaleUnits.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListScaleUnits.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListScaleUnits.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListSlbMuxInstances.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListSlbMuxInstances.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListSlbMuxInstances.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListSlbMuxInstances.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListStoragePools.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListStoragePools.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListStoragePools.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListStoragePools.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListStorageSystems.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListStorageSystems.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListStorageSystems.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListStorageSystems.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListVolumes.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListVolumes.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListVolumes.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestListVolumes.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestPowerOffOnTenantVM.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestPowerOffOnTenantVM.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestPowerOffOnTenantVM.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestPowerOffOnTenantVM.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestPowerOnOnTenantVM.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestPowerOnOnTenantVM.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestPowerOnOnTenantVM.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestPowerOnOnTenantVM.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestPowerOnScaleUnitNode.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestPowerOnScaleUnitNode.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestPowerOnScaleUnitNode.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestPowerOnScaleUnitNode.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestStartMaintenanceModeOnTenantVM.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestStartMaintenanceModeOnTenantVM.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestStartMaintenanceModeOnTenantVM.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestStartMaintenanceModeOnTenantVM.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestStartStopMaintenanceModeUnitNode.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestStartStopMaintenanceModeUnitNode.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestStartStopMaintenanceModeUnitNode.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestStartStopMaintenanceModeUnitNode.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestUpdateIpPool.json b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestUpdateIpPool.json
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestUpdateIpPool.json
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/SessionRecords/FabricAdminClient/TestUpdateIpPool.json
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/EdgeGatewayPoolTests.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/EdgeGatewayPoolTests.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/EdgeGatewayPoolTests.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/EdgeGatewayPoolTests.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/EdgeGatewayTests.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/EdgeGatewayTests.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/EdgeGatewayTests.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/EdgeGatewayTests.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/FabricLocationTests.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/FabricLocationTests.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/FabricLocationTests.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/FabricLocationTests.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/FileShareTests.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/FileShareTests.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/FileShareTests.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/FileShareTests.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/Helpers/AzureStackTestBase.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/Helpers/AzureStackTestBase.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/Helpers/AzureStackTestBase.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/Helpers/AzureStackTestBase.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/Helpers/Common.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/Helpers/Common.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/Helpers/Common.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/Helpers/Common.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/Helpers/FabricCommon.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/Helpers/FabricCommon.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/Helpers/FabricCommon.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/Helpers/FabricCommon.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/Helpers/FabricTestBase.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/Helpers/FabricTestBase.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/Helpers/FabricTestBase.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/Helpers/FabricTestBase.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/InfraRoleInstanceTests.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/InfraRoleInstanceTests.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/InfraRoleInstanceTests.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/InfraRoleInstanceTests.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/InfraRoleTests.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/InfraRoleTests.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/InfraRoleTests.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/InfraRoleTests.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/IpPoolTests.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/IpPoolTests.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/IpPoolTests.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/IpPoolTests.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/ListOperationsTest.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/ListOperationsTest.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/ListOperationsTest.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/ListOperationsTest.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/LogicalNetworkTest.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/LogicalNetworkTest.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/LogicalNetworkTest.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/LogicalNetworkTest.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/LogicalSubnetTests.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/LogicalSubnetTests.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/LogicalSubnetTests.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/LogicalSubnetTests.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/MacAddressPoolTests.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/MacAddressPoolTests.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/MacAddressPoolTests.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/MacAddressPoolTests.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/OperationTests.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/OperationTests.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/OperationTests.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/OperationTests.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/ScaleUnitNodeTests.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/ScaleUnitNodeTests.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/ScaleUnitNodeTests.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/ScaleUnitNodeTests.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/ScaleUnitTests.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/ScaleUnitTests.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/ScaleUnitTests.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/ScaleUnitTests.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/SlbMuxInstanceTests.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/SlbMuxInstanceTests.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/SlbMuxInstanceTests.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/SlbMuxInstanceTests.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/StoragePoolTests.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/StoragePoolTests.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/StoragePoolTests.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/StoragePoolTests.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/StorageSystemTests.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/StorageSystemTests.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/StorageSystemTests.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/StorageSystemTests.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/VolumeTests.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/VolumeTests.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin.Tests/src/VolumeTests.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/src/VolumeTests.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/EdgeGatewayPoolsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/EdgeGatewayPoolsOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/EdgeGatewayPoolsOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/EdgeGatewayPoolsOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/EdgeGatewayPoolsOperationsExtensions.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/EdgeGatewayPoolsOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/EdgeGatewayPoolsOperationsExtensions.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/EdgeGatewayPoolsOperationsExtensions.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/EdgeGatewaysOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/EdgeGatewaysOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/EdgeGatewaysOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/EdgeGatewaysOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/EdgeGatewaysOperationsExtensions.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/EdgeGatewaysOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/EdgeGatewaysOperationsExtensions.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/EdgeGatewaysOperationsExtensions.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/FabricAdminClient.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FabricAdminClient.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/FabricAdminClient.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FabricAdminClient.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/FabricLocationsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FabricLocationsOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/FabricLocationsOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FabricLocationsOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/FabricLocationsOperationsExtensions.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FabricLocationsOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/FabricLocationsOperationsExtensions.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FabricLocationsOperationsExtensions.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/FabricOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FabricOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/FabricOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FabricOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/FabricOperationsExtensions.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FabricOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/FabricOperationsExtensions.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FabricOperationsExtensions.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/FileSharesOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FileSharesOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/FileSharesOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FileSharesOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/FileSharesOperationsExtensions.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FileSharesOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/FileSharesOperationsExtensions.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FileSharesOperationsExtensions.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IEdgeGatewayPoolsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IEdgeGatewayPoolsOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IEdgeGatewayPoolsOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IEdgeGatewayPoolsOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IEdgeGatewaysOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IEdgeGatewaysOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IEdgeGatewaysOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IEdgeGatewaysOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IFabricAdminClient.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IFabricAdminClient.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IFabricAdminClient.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IFabricAdminClient.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IFabricLocationsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IFabricLocationsOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IFabricLocationsOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IFabricLocationsOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IFabricOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IFabricOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IFabricOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IFabricOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IFileSharesOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IFileSharesOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IFileSharesOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IFileSharesOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IInfraRoleInstancesOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IInfraRoleInstancesOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IInfraRoleInstancesOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IInfraRoleInstancesOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IInfraRolesOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IInfraRolesOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IInfraRolesOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IInfraRolesOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IIpPoolsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IIpPoolsOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IIpPoolsOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IIpPoolsOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/ILogicalNetworksOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ILogicalNetworksOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/ILogicalNetworksOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ILogicalNetworksOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/ILogicalSubnetsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ILogicalSubnetsOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/ILogicalSubnetsOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ILogicalSubnetsOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IMacAddressPoolsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IMacAddressPoolsOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IMacAddressPoolsOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IMacAddressPoolsOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IScaleUnitNodesOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IScaleUnitNodesOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IScaleUnitNodesOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IScaleUnitNodesOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IScaleUnitsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IScaleUnitsOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IScaleUnitsOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IScaleUnitsOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/ISlbMuxInstancesOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ISlbMuxInstancesOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/ISlbMuxInstancesOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ISlbMuxInstancesOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IStoragePoolsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IStoragePoolsOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IStoragePoolsOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IStoragePoolsOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IStorageSystemsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IStorageSystemsOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IStorageSystemsOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IStorageSystemsOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IVolumesOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IVolumesOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IVolumesOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IVolumesOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/InfraRoleInstancesOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/InfraRoleInstancesOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/InfraRoleInstancesOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/InfraRoleInstancesOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/InfraRoleInstancesOperationsExtensions.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/InfraRoleInstancesOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/InfraRoleInstancesOperationsExtensions.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/InfraRoleInstancesOperationsExtensions.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/InfraRolesOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/InfraRolesOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/InfraRolesOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/InfraRolesOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/InfraRolesOperationsExtensions.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/InfraRolesOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/InfraRolesOperationsExtensions.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/InfraRolesOperationsExtensions.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IpPoolsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IpPoolsOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IpPoolsOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IpPoolsOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IpPoolsOperationsExtensions.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IpPoolsOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/IpPoolsOperationsExtensions.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IpPoolsOperationsExtensions.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/LogicalNetworksOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/LogicalNetworksOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/LogicalNetworksOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/LogicalNetworksOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/LogicalNetworksOperationsExtensions.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/LogicalNetworksOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/LogicalNetworksOperationsExtensions.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/LogicalNetworksOperationsExtensions.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/LogicalSubnetsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/LogicalSubnetsOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/LogicalSubnetsOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/LogicalSubnetsOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/LogicalSubnetsOperationsExtensions.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/LogicalSubnetsOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/LogicalSubnetsOperationsExtensions.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/LogicalSubnetsOperationsExtensions.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/MacAddressPoolsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/MacAddressPoolsOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/MacAddressPoolsOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/MacAddressPoolsOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/MacAddressPoolsOperationsExtensions.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/MacAddressPoolsOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/MacAddressPoolsOperationsExtensions.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/MacAddressPoolsOperationsExtensions.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/BareMetalNodeDescription.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/BareMetalNodeDescription.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/BareMetalNodeDescription.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/BareMetalNodeDescription.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/Display.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/Display.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/Display.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/Display.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/EdgeGateway.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/EdgeGateway.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/EdgeGateway.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/EdgeGateway.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/EdgeGatewayPool.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/EdgeGatewayPool.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/EdgeGatewayPool.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/EdgeGatewayPool.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/FabricLocation.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/FabricLocation.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/FabricLocation.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/FabricLocation.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/FileShare.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/FileShare.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/FileShare.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/FileShare.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/InfraRole.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/InfraRole.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/InfraRole.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/InfraRole.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/InfraRoleInstance.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/InfraRoleInstance.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/InfraRoleInstance.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/InfraRoleInstance.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/InfraRoleInstanceSize.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/InfraRoleInstanceSize.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/InfraRoleInstanceSize.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/InfraRoleInstanceSize.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/InfraRoleInstanceState.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/InfraRoleInstanceState.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/InfraRoleInstanceState.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/InfraRoleInstanceState.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/IpPool.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/IpPool.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/IpPool.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/IpPool.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/LogicalNetwork.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/LogicalNetwork.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/LogicalNetwork.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/LogicalNetwork.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/LogicalSubnet.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/LogicalSubnet.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/LogicalSubnet.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/LogicalSubnet.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/MacAddressPool.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/MacAddressPool.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/MacAddressPool.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/MacAddressPool.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/Operation.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/Operation.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/Operation.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/Operation.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/Page.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/Page.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/Page.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/Page.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/Page1.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/Page1.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/Page1.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/Page1.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/PowerState.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/PowerState.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/PowerState.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/PowerState.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/ProvisioningState.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/ProvisioningState.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/ProvisioningState.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/ProvisioningState.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/Resource.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/Resource.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/Resource.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/Resource.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/ScaleOutScaleUnitParameters.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/ScaleOutScaleUnitParameters.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/ScaleOutScaleUnitParameters.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/ScaleOutScaleUnitParameters.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/ScaleOutScaleUnitParametersList.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/ScaleOutScaleUnitParametersList.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/ScaleOutScaleUnitParametersList.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/ScaleOutScaleUnitParametersList.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/ScaleUnit.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/ScaleUnit.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/ScaleUnit.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/ScaleUnit.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/ScaleUnitCapacity.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/ScaleUnitCapacity.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/ScaleUnitCapacity.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/ScaleUnitCapacity.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/ScaleUnitNode.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/ScaleUnitNode.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/ScaleUnitNode.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/ScaleUnitNode.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/ScaleUnitNodeStatus.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/ScaleUnitNodeStatus.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/ScaleUnitNodeStatus.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/ScaleUnitNodeStatus.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/ScaleUnitState.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/ScaleUnitState.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/ScaleUnitState.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/ScaleUnitState.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/ScaleUnitType.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/ScaleUnitType.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/ScaleUnitType.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/ScaleUnitType.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/SlbMuxInstance.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/SlbMuxInstance.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/SlbMuxInstance.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/SlbMuxInstance.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/StoragePool.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/StoragePool.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/StoragePool.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/StoragePool.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/StorageSystem.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/StorageSystem.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/StorageSystem.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/StorageSystem.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/Volume.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/Volume.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/Models/Volume.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/Volume.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/ScaleUnitNodesOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ScaleUnitNodesOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/ScaleUnitNodesOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ScaleUnitNodesOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/ScaleUnitNodesOperationsExtensions.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ScaleUnitNodesOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/ScaleUnitNodesOperationsExtensions.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ScaleUnitNodesOperationsExtensions.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/ScaleUnitsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ScaleUnitsOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/ScaleUnitsOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ScaleUnitsOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/ScaleUnitsOperationsExtensions.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ScaleUnitsOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/ScaleUnitsOperationsExtensions.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ScaleUnitsOperationsExtensions.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/SdkInfo_FabricAdminClient.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/SdkInfo_FabricAdminClient.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/SdkInfo_FabricAdminClient.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/SdkInfo_FabricAdminClient.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/SlbMuxInstancesOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/SlbMuxInstancesOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/SlbMuxInstancesOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/SlbMuxInstancesOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/SlbMuxInstancesOperationsExtensions.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/SlbMuxInstancesOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/SlbMuxInstancesOperationsExtensions.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/SlbMuxInstancesOperationsExtensions.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/StoragePoolsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StoragePoolsOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/StoragePoolsOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StoragePoolsOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/StoragePoolsOperationsExtensions.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StoragePoolsOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/StoragePoolsOperationsExtensions.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StoragePoolsOperationsExtensions.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/StorageSystemsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StorageSystemsOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/StorageSystemsOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StorageSystemsOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/StorageSystemsOperationsExtensions.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StorageSystemsOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/StorageSystemsOperationsExtensions.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StorageSystemsOperationsExtensions.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/VolumesOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/VolumesOperations.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/VolumesOperations.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/VolumesOperations.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Generated/VolumesOperationsExtensions.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/VolumesOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Generated/VolumesOperationsExtensions.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/VolumesOperationsExtensions.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Microsoft.AzureStack.Management.Fabric.Admin.csproj b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Microsoft.AzureStack.Management.Fabric.Admin.csproj
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Microsoft.AzureStack.Management.Fabric.Admin.csproj
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Microsoft.AzureStack.Management.Fabric.Admin.csproj
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/Properties/AssemblyInfo.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/Properties/AssemblyInfo.cs
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Properties/AssemblyInfo.cs
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/generate.cmd b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/generate.cmd
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/generate.cmd
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/generate.cmd
diff --git a/src/AzureStack/FabricAdmin/Fabric.Admin/generate.ps1 b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/generate.ps1
similarity index 100%
rename from src/AzureStack/FabricAdmin/Fabric.Admin/generate.ps1
rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/generate.ps1
diff --git a/src/AzureStack/FabricAdmin/FabricAdmin.sln b/src/AzureStack/Admin/FabricAdmin/FabricAdmin.sln
similarity index 100%
rename from src/AzureStack/FabricAdmin/FabricAdmin.sln
rename to src/AzureStack/Admin/FabricAdmin/FabricAdmin.sln
diff --git a/src/AzureStack/GalleryAdmin/AzSdk.RP.props b/src/AzureStack/Admin/GalleryAdmin/AzSdk.RP.props
similarity index 100%
rename from src/AzureStack/GalleryAdmin/AzSdk.RP.props
rename to src/AzureStack/Admin/GalleryAdmin/AzSdk.RP.props
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin.Tests/Gallery.Tests.csproj b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin.Tests/Gallery.Tests.csproj
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin.Tests/Gallery.Tests.csproj
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin.Tests/Gallery.Tests.csproj
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin.Tests/Properties/AssemblyInfo.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin.Tests/Properties/AssemblyInfo.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin.Tests/Properties/AssemblyInfo.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin.Tests/SessionRecords/GalleryAdminClient/TestCreateAndDeleteGalleryItem.json b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin.Tests/SessionRecords/GalleryAdminClient/TestCreateAndDeleteGalleryItem.json
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin.Tests/SessionRecords/GalleryAdminClient/TestCreateAndDeleteGalleryItem.json
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin.Tests/SessionRecords/GalleryAdminClient/TestCreateAndDeleteGalleryItem.json
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin.Tests/SessionRecords/GalleryAdminClient/TestGetGalleryItem.json b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin.Tests/SessionRecords/GalleryAdminClient/TestGetGalleryItem.json
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin.Tests/SessionRecords/GalleryAdminClient/TestGetGalleryItem.json
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin.Tests/SessionRecords/GalleryAdminClient/TestGetGalleryItem.json
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin.Tests/SessionRecords/GalleryAdminClient/TestListAllGalleryItems.json b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin.Tests/SessionRecords/GalleryAdminClient/TestListAllGalleryItems.json
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin.Tests/SessionRecords/GalleryAdminClient/TestListAllGalleryItems.json
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin.Tests/SessionRecords/GalleryAdminClient/TestListAllGalleryItems.json
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin.Tests/SessionRecords/GalleryAdminClient/TestListGalleryItems.json b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin.Tests/SessionRecords/GalleryAdminClient/TestListGalleryItems.json
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin.Tests/SessionRecords/GalleryAdminClient/TestListGalleryItems.json
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin.Tests/SessionRecords/GalleryAdminClient/TestListGalleryItems.json
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin.Tests/src/GalleryItem.Tests.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin.Tests/src/GalleryItem.Tests.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin.Tests/src/GalleryItem.Tests.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin.Tests/src/GalleryItem.Tests.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin.Tests/src/Helpers/AzureStackTestBase.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin.Tests/src/Helpers/AzureStackTestBase.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin.Tests/src/Helpers/AzureStackTestBase.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin.Tests/src/Helpers/AzureStackTestBase.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin.Tests/src/Helpers/Common.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin.Tests/src/Helpers/Common.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin.Tests/src/Helpers/Common.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin.Tests/src/Helpers/Common.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin.Tests/src/Helpers/GalleryTestBase.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin.Tests/src/Helpers/GalleryTestBase.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin.Tests/src/Helpers/GalleryTestBase.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin.Tests/src/Helpers/GalleryTestBase.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/GalleryAdminClient.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/GalleryAdminClient.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/GalleryAdminClient.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/GalleryAdminClient.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/GalleryItemsOperations.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/GalleryItemsOperations.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/GalleryItemsOperations.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/GalleryItemsOperations.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/GalleryItemsOperationsExtensions.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/GalleryItemsOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/GalleryItemsOperationsExtensions.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/GalleryItemsOperationsExtensions.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/IGalleryAdminClient.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/IGalleryAdminClient.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/IGalleryAdminClient.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/IGalleryAdminClient.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/IGalleryItemsOperations.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/IGalleryItemsOperations.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/IGalleryItemsOperations.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/IGalleryItemsOperations.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/IOperations.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/IOperations.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/IOperations.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/IOperations.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/Artifact.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/Artifact.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/Artifact.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/Artifact.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/ArtifactType.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/ArtifactType.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/ArtifactType.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/ArtifactType.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/DefinitionTemplates.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/DefinitionTemplates.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/DefinitionTemplates.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/DefinitionTemplates.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/Filter.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/Filter.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/Filter.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/Filter.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/GalleryItem.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/GalleryItem.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/GalleryItem.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/GalleryItem.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/GalleryItemMenuReferenceType.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/GalleryItemMenuReferenceType.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/GalleryItemMenuReferenceType.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/GalleryItemMenuReferenceType.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/GalleryItemPropertiesIconFileUris.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/GalleryItemPropertiesIconFileUris.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/GalleryItemPropertiesIconFileUris.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/GalleryItemPropertiesIconFileUris.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/GalleryItemUriPayload.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/GalleryItemUriPayload.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/GalleryItemUriPayload.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/GalleryItemUriPayload.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/Image.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/Image.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/Image.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/Image.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/ImageGroup.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/ImageGroup.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/ImageGroup.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/ImageGroup.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/LinkProperties.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/LinkProperties.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/LinkProperties.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/LinkProperties.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/MarketingMaterial.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/MarketingMaterial.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/MarketingMaterial.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/MarketingMaterial.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/OfferDetails.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/OfferDetails.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/OfferDetails.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/OfferDetails.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/OpenProperty.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/OpenProperty.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/OpenProperty.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/OpenProperty.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/Operation.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/Operation.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/Operation.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/Operation.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/OperationDisplayDefinition.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/OperationDisplayDefinition.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/OperationDisplayDefinition.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/OperationDisplayDefinition.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/Page.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/Page.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/Page.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/Page.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/Plan.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/Plan.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/Plan.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/Plan.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/Product.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/Product.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/Product.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/Product.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/Resource.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/Resource.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Models/Resource.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Models/Resource.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Operations.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Operations.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/Operations.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/Operations.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/OperationsExtensions.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/OperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/OperationsExtensions.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/OperationsExtensions.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/SdkInfo_GalleryAdminClient.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/SdkInfo_GalleryAdminClient.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Generated/SdkInfo_GalleryAdminClient.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Generated/SdkInfo_GalleryAdminClient.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Microsoft.AzureStack.Management.Gallery.Admin.csproj b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Microsoft.AzureStack.Management.Gallery.Admin.csproj
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Microsoft.AzureStack.Management.Gallery.Admin.csproj
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Microsoft.AzureStack.Management.Gallery.Admin.csproj
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/Properties/AssemblyInfo.cs b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/Properties/AssemblyInfo.cs
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/Properties/AssemblyInfo.cs
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/generate.cmd b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/generate.cmd
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/generate.cmd
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/generate.cmd
diff --git a/src/AzureStack/GalleryAdmin/Gallery.Admin/generate.ps1 b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/generate.ps1
similarity index 100%
rename from src/AzureStack/GalleryAdmin/Gallery.Admin/generate.ps1
rename to src/AzureStack/Admin/GalleryAdmin/Gallery.Admin/generate.ps1
diff --git a/src/AzureStack/GalleryAdmin/GalleryAdmin.sln b/src/AzureStack/Admin/GalleryAdmin/GalleryAdmin.sln
similarity index 100%
rename from src/AzureStack/GalleryAdmin/GalleryAdmin.sln
rename to src/AzureStack/Admin/GalleryAdmin/GalleryAdmin.sln
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/AzSdk.RP.props b/src/AzureStack/Admin/InfrastructureInsightsAdmin/AzSdk.RP.props
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/AzSdk.RP.props
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/AzSdk.RP.props
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/InfrastructureInsights.Tests.csproj b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/InfrastructureInsights.Tests.csproj
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/InfrastructureInsights.Tests.csproj
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/InfrastructureInsights.Tests.csproj
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/InfrastructureInsightsCommon.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/InfrastructureInsightsCommon.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/InfrastructureInsightsCommon.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/InfrastructureInsightsCommon.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/InfrastructureInsightsTestBase.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/InfrastructureInsightsTestBase.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/InfrastructureInsightsTestBase.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/InfrastructureInsightsTestBase.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/Properties/AssemblyInfo.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/Properties/AssemblyInfo.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/Properties/AssemblyInfo.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestCloseAlert.json b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestCloseAlert.json
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestCloseAlert.json
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestCloseAlert.json
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetAlert.json b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetAlert.json
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetAlert.json
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetAlert.json
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetAllAlerts.json b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetAllAlerts.json
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetAllAlerts.json
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetAllAlerts.json
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetAllRegionHealths.json b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetAllRegionHealths.json
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetAllRegionHealths.json
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetAllRegionHealths.json
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetAllResourceHealths.json b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetAllResourceHealths.json
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetAllResourceHealths.json
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetAllResourceHealths.json
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetAllServiceHealths.json b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetAllServiceHealths.json
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetAllServiceHealths.json
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetAllServiceHealths.json
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetRegionHealth.json b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetRegionHealth.json
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetRegionHealth.json
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetRegionHealth.json
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetResourceHealth.json b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetResourceHealth.json
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetResourceHealth.json
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetResourceHealth.json
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetServiceHealth.json b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetServiceHealth.json
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetServiceHealth.json
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestGetServiceHealth.json
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestListAlerts.json b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestListAlerts.json
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestListAlerts.json
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestListAlerts.json
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestListRegionHealths.json b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestListRegionHealths.json
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestListRegionHealths.json
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestListRegionHealths.json
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestListResourceHealths.json b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestListResourceHealths.json
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestListResourceHealths.json
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestListResourceHealths.json
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestListServiceHealths.json b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestListServiceHealths.json
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestListServiceHealths.json
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/SessionRecords/InfrastructureInsightsAdminClient/TestListServiceHealths.json
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/AlertTests.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/AlertTests.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/AlertTests.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/AlertTests.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/Helpers/AzureStackTestBase.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/Helpers/AzureStackTestBase.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/Helpers/AzureStackTestBase.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/Helpers/AzureStackTestBase.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/Helpers/Common.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/Helpers/Common.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/Helpers/Common.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/Helpers/Common.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/RegionHealthTests.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/RegionHealthTests.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/RegionHealthTests.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/RegionHealthTests.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/ResourceHealthTests.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/ResourceHealthTests.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/ResourceHealthTests.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/ResourceHealthTests.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/ServiceHealthTests.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/ServiceHealthTests.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/ServiceHealthTests.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/ServiceHealthTests.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/SupportedOperationTests.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/SupportedOperationTests.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/SupportedOperationTests.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin.Tests/src/SupportedOperationTests.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/AlertsOperations.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/AlertsOperations.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/AlertsOperations.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/AlertsOperations.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/AlertsOperationsExtensions.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/AlertsOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/AlertsOperationsExtensions.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/AlertsOperationsExtensions.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/IAlertsOperations.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/IAlertsOperations.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/IAlertsOperations.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/IAlertsOperations.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/IInfrastructureInsightsAdminClient.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/IInfrastructureInsightsAdminClient.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/IInfrastructureInsightsAdminClient.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/IInfrastructureInsightsAdminClient.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/IOperations.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/IOperations.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/IOperations.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/IOperations.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/IRegionHealthsOperations.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/IRegionHealthsOperations.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/IRegionHealthsOperations.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/IRegionHealthsOperations.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/IResourceHealthsOperations.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/IResourceHealthsOperations.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/IResourceHealthsOperations.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/IResourceHealthsOperations.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/IServiceHealthsOperations.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/IServiceHealthsOperations.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/IServiceHealthsOperations.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/IServiceHealthsOperations.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/InfrastructureInsightsAdminClient.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/InfrastructureInsightsAdminClient.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/InfrastructureInsightsAdminClient.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/InfrastructureInsightsAdminClient.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/Alert.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/Alert.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/Alert.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/Alert.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/AlertSummary.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/AlertSummary.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/AlertSummary.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/AlertSummary.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/BaseHealth.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/BaseHealth.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/BaseHealth.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/BaseHealth.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/Display.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/Display.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/Display.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/Display.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/Metrics.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/Metrics.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/Metrics.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/Metrics.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/MetricsSourceType.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/MetricsSourceType.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/MetricsSourceType.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/MetricsSourceType.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/MetricsUnit.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/MetricsUnit.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/MetricsUnit.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/MetricsUnit.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/Operation.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/Operation.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/Operation.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/Operation.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/Page.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/Page.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/Page.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/Page.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/RegionHealth.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/RegionHealth.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/RegionHealth.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/RegionHealth.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/Resource.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/Resource.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/Resource.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/Resource.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/ResourceHealth.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/ResourceHealth.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/ResourceHealth.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/ResourceHealth.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/ServiceHealth.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/ServiceHealth.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/ServiceHealth.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/ServiceHealth.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/TrackedResource.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/TrackedResource.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/TrackedResource.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/TrackedResource.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/UsageMetrics.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/UsageMetrics.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/UsageMetrics.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Models/UsageMetrics.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Operations.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Operations.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Operations.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/Operations.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/OperationsExtensions.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/OperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/OperationsExtensions.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/OperationsExtensions.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/RegionHealthsOperations.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/RegionHealthsOperations.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/RegionHealthsOperations.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/RegionHealthsOperations.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/RegionHealthsOperationsExtensions.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/RegionHealthsOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/RegionHealthsOperationsExtensions.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/RegionHealthsOperationsExtensions.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/ResourceHealthsOperations.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/ResourceHealthsOperations.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/ResourceHealthsOperations.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/ResourceHealthsOperations.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/ResourceHealthsOperationsExtensions.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/ResourceHealthsOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/ResourceHealthsOperationsExtensions.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/ResourceHealthsOperationsExtensions.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/SdkInfo_InfrastructureInsightsAdminClient.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/SdkInfo_InfrastructureInsightsAdminClient.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/SdkInfo_InfrastructureInsightsAdminClient.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/SdkInfo_InfrastructureInsightsAdminClient.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/ServiceHealthsOperations.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/ServiceHealthsOperations.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/ServiceHealthsOperations.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/ServiceHealthsOperations.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/ServiceHealthsOperationsExtensions.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/ServiceHealthsOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/ServiceHealthsOperationsExtensions.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Generated/ServiceHealthsOperationsExtensions.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Microsoft.AzureStack.Management.InfrastructureInsights.Admin.csproj b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Microsoft.AzureStack.Management.InfrastructureInsights.Admin.csproj
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Microsoft.AzureStack.Management.InfrastructureInsights.Admin.csproj
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Microsoft.AzureStack.Management.InfrastructureInsights.Admin.csproj
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Properties/AssemblyInfo.cs b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Properties/AssemblyInfo.cs
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/Properties/AssemblyInfo.cs
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/generate.cmd b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/generate.cmd
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/generate.cmd
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/generate.cmd
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/generate.ps1 b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/generate.ps1
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/generate.ps1
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsights.Admin/generate.ps1
diff --git a/src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsightsAdmin.sln b/src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsightsAdmin.sln
similarity index 100%
rename from src/AzureStack/InfrastructureInsightsAdmin/InfrastructureInsightsAdmin.sln
rename to src/AzureStack/Admin/InfrastructureInsightsAdmin/InfrastructureInsightsAdmin.sln
diff --git a/src/AzureStack/KeyVaultAdmin/AzSdk.RP.props b/src/AzureStack/Admin/KeyVaultAdmin/AzSdk.RP.props
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/AzSdk.RP.props
rename to src/AzureStack/Admin/KeyVaultAdmin/AzSdk.RP.props
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin.Tests/KeyVault.Tests.csproj b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin.Tests/KeyVault.Tests.csproj
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin.Tests/KeyVault.Tests.csproj
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin.Tests/KeyVault.Tests.csproj
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin.Tests/Properties/AssemblyInfo.cs b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin.Tests/Properties/AssemblyInfo.cs
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin.Tests/Properties/AssemblyInfo.cs
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin.Tests/SessionRecords/KeyVaultAdminClient/TestListQuotas.json b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin.Tests/SessionRecords/KeyVaultAdminClient/TestListQuotas.json
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin.Tests/SessionRecords/KeyVaultAdminClient/TestListQuotas.json
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin.Tests/SessionRecords/KeyVaultAdminClient/TestListQuotas.json
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin.Tests/src/Helpers/AzureStackTestBase.cs b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin.Tests/src/Helpers/AzureStackTestBase.cs
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin.Tests/src/Helpers/AzureStackTestBase.cs
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin.Tests/src/Helpers/AzureStackTestBase.cs
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin.Tests/src/Helpers/Common.cs b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin.Tests/src/Helpers/Common.cs
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin.Tests/src/Helpers/Common.cs
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin.Tests/src/Helpers/Common.cs
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin.Tests/src/Helpers/KeyVaultTestBase.cs b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin.Tests/src/Helpers/KeyVaultTestBase.cs
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin.Tests/src/Helpers/KeyVaultTestBase.cs
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin.Tests/src/Helpers/KeyVaultTestBase.cs
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin.Tests/src/OperationTest.cs b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin.Tests/src/OperationTest.cs
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin.Tests/src/OperationTest.cs
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin.Tests/src/OperationTest.cs
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin.Tests/src/QuotaTests.cs b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin.Tests/src/QuotaTests.cs
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin.Tests/src/QuotaTests.cs
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin.Tests/src/QuotaTests.cs
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/IKeyVaultAdminClient.cs b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/IKeyVaultAdminClient.cs
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/IKeyVaultAdminClient.cs
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/IKeyVaultAdminClient.cs
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/IOperations.cs b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/IOperations.cs
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/IOperations.cs
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/IOperations.cs
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/IQuotasOperations.cs b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/IQuotasOperations.cs
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/IQuotasOperations.cs
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/IQuotasOperations.cs
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/KeyVaultAdminClient.cs b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/KeyVaultAdminClient.cs
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/KeyVaultAdminClient.cs
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/KeyVaultAdminClient.cs
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/Models/Display.cs b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/Models/Display.cs
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/Models/Display.cs
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/Models/Display.cs
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/Models/Operation.cs b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/Models/Operation.cs
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/Models/Operation.cs
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/Models/Operation.cs
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/Models/Page.cs b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/Models/Page.cs
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/Models/Page.cs
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/Models/Page.cs
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/Models/Page1.cs b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/Models/Page1.cs
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/Models/Page1.cs
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/Models/Page1.cs
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/Models/Quota.cs b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/Models/Quota.cs
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/Models/Quota.cs
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/Models/Quota.cs
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/Models/Resource.cs b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/Models/Resource.cs
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/Models/Resource.cs
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/Models/Resource.cs
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/Operations.cs b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/Operations.cs
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/Operations.cs
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/Operations.cs
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/OperationsExtensions.cs b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/OperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/OperationsExtensions.cs
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/OperationsExtensions.cs
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/QuotasOperations.cs b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/QuotasOperations.cs
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/QuotasOperations.cs
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/QuotasOperations.cs
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/QuotasOperationsExtensions.cs b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/QuotasOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/QuotasOperationsExtensions.cs
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/QuotasOperationsExtensions.cs
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/SdkInfo_KeyVaultAdminClient.cs b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/SdkInfo_KeyVaultAdminClient.cs
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Generated/SdkInfo_KeyVaultAdminClient.cs
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Generated/SdkInfo_KeyVaultAdminClient.cs
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Microsoft.AzureStack.Management.KeyVault.Admin.csproj b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Microsoft.AzureStack.Management.KeyVault.Admin.csproj
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Microsoft.AzureStack.Management.KeyVault.Admin.csproj
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Microsoft.AzureStack.Management.KeyVault.Admin.csproj
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Properties/AssemblyInfo.cs b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin/Properties/AssemblyInfo.cs
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/Properties/AssemblyInfo.cs
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin/generate.cmd b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/generate.cmd
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin/generate.cmd
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/generate.cmd
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVault.Admin/generate.ps1 b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/generate.ps1
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVault.Admin/generate.ps1
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin/generate.ps1
diff --git a/src/AzureStack/KeyVaultAdmin/KeyVaultAdmin.sln b/src/AzureStack/Admin/KeyVaultAdmin/KeyVaultAdmin.sln
similarity index 100%
rename from src/AzureStack/KeyVaultAdmin/KeyVaultAdmin.sln
rename to src/AzureStack/Admin/KeyVaultAdmin/KeyVaultAdmin.sln
diff --git a/src/AzureStack/NetworkAdmin/AzSdk.RP.props b/src/AzureStack/Admin/NetworkAdmin/AzSdk.RP.props
similarity index 100%
rename from src/AzureStack/NetworkAdmin/AzSdk.RP.props
rename to src/AzureStack/Admin/NetworkAdmin/AzSdk.RP.props
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin.Tests/Network.Tests.csproj b/src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/Network.Tests.csproj
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin.Tests/Network.Tests.csproj
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/Network.Tests.csproj
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin.Tests/Properties/AssemblyInfo.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin.Tests/Properties/AssemblyInfo.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/Properties/AssemblyInfo.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestDeleteInvalid.json b/src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestDeleteInvalid.json
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestDeleteInvalid.json
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestDeleteInvalid.json
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetAdminOverview.json b/src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetAdminOverview.json
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetAdminOverview.json
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetAdminOverview.json
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetAllLoadBalancers.json b/src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetAllLoadBalancers.json
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetAllLoadBalancers.json
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetAllLoadBalancers.json
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetAllPublicIpAddresses.json b/src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetAllPublicIpAddresses.json
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetAllPublicIpAddresses.json
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetAllPublicIpAddresses.json
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetAllPublicIpAddressesOData.json b/src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetAllPublicIpAddressesOData.json
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetAllPublicIpAddressesOData.json
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetAllPublicIpAddressesOData.json
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetAllVirtualNetworks.json b/src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetAllVirtualNetworks.json
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetAllVirtualNetworks.json
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetAllVirtualNetworks.json
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetAllVirtualNetworksOData.json b/src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetAllVirtualNetworksOData.json
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetAllVirtualNetworksOData.json
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetAllVirtualNetworksOData.json
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetQuotaInvalid.json b/src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetQuotaInvalid.json
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetQuotaInvalid.json
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestGetQuotaInvalid.json
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestPutAndDeleteQuota.json b/src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestPutAndDeleteQuota.json
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestPutAndDeleteQuota.json
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestPutAndDeleteQuota.json
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestPutAndUpdateQuota.json b/src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestPutAndUpdateQuota.json
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestPutAndUpdateQuota.json
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/SessionRecords/NetworkAdminClient/TestPutAndUpdateQuota.json
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin.Tests/setEnvironment.cmd b/src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/setEnvironment.cmd
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin.Tests/setEnvironment.cmd
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/setEnvironment.cmd
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin.Tests/src/Helpers/AzureStackTestBase.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/src/Helpers/AzureStackTestBase.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin.Tests/src/Helpers/AzureStackTestBase.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/src/Helpers/AzureStackTestBase.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin.Tests/src/Helpers/Common.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/src/Helpers/Common.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin.Tests/src/Helpers/Common.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/src/Helpers/Common.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin.Tests/src/Helpers/NetworkCommon.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/src/Helpers/NetworkCommon.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin.Tests/src/Helpers/NetworkCommon.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/src/Helpers/NetworkCommon.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin.Tests/src/Helpers/NetworkTestBase.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/src/Helpers/NetworkTestBase.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin.Tests/src/Helpers/NetworkTestBase.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/src/Helpers/NetworkTestBase.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin.Tests/src/LoadBalancersTests.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/src/LoadBalancersTests.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin.Tests/src/LoadBalancersTests.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/src/LoadBalancersTests.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin.Tests/src/NetworkTests.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/src/NetworkTests.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin.Tests/src/NetworkTests.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/src/NetworkTests.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin.Tests/src/PublicIpAddressesTests.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/src/PublicIpAddressesTests.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin.Tests/src/PublicIpAddressesTests.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/src/PublicIpAddressesTests.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin.Tests/src/QuotasTest.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/src/QuotasTest.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin.Tests/src/QuotasTest.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/src/QuotasTest.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin.Tests/src/VirtualNetworksTests.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/src/VirtualNetworksTests.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin.Tests/src/VirtualNetworksTests.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/src/VirtualNetworksTests.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/ILoadBalancersOperations.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/ILoadBalancersOperations.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/ILoadBalancersOperations.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/ILoadBalancersOperations.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/INetworkAdminClient.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/INetworkAdminClient.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/INetworkAdminClient.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/INetworkAdminClient.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/IPublicIPAddressesOperations.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/IPublicIPAddressesOperations.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/IPublicIPAddressesOperations.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/IPublicIPAddressesOperations.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/IQuotasOperations.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/IQuotasOperations.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/IQuotasOperations.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/IQuotasOperations.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/IResourceProviderStateOperations.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/IResourceProviderStateOperations.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/IResourceProviderStateOperations.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/IResourceProviderStateOperations.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/IVirtualNetworksOperations.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/IVirtualNetworksOperations.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/IVirtualNetworksOperations.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/IVirtualNetworksOperations.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/LoadBalancersOperations.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/LoadBalancersOperations.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/LoadBalancersOperations.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/LoadBalancersOperations.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/LoadBalancersOperationsExtensions.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/LoadBalancersOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/LoadBalancersOperationsExtensions.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/LoadBalancersOperationsExtensions.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/AdminOverview.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/AdminOverview.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/AdminOverview.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/AdminOverview.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/AdminOverviewResourceHealth.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/AdminOverviewResourceHealth.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/AdminOverviewResourceHealth.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/AdminOverviewResourceHealth.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/AdminOverviewResourceUsage.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/AdminOverviewResourceUsage.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/AdminOverviewResourceUsage.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/AdminOverviewResourceUsage.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/AllocationMethodType.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/AllocationMethodType.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/AllocationMethodType.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/AllocationMethodType.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/LoadBalancer.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/LoadBalancer.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/LoadBalancer.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/LoadBalancer.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/MigrationPhaseType.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/MigrationPhaseType.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/MigrationPhaseType.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/MigrationPhaseType.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/Page.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/Page.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/Page.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/Page.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/Page1.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/Page1.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/Page1.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/Page1.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/ProvisionedResource.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/ProvisionedResource.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/ProvisionedResource.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/ProvisionedResource.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/PublicIpAddress.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/PublicIpAddress.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/PublicIpAddress.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/PublicIpAddress.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/Quota.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/Quota.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/Quota.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/Quota.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/Resource.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/Resource.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/Resource.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/Resource.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/TenantResource.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/TenantResource.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/TenantResource.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/TenantResource.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/VirtualNetwork.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/VirtualNetwork.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/VirtualNetwork.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/VirtualNetwork.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/VirtualNetworkConfigurationState.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/VirtualNetworkConfigurationState.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/VirtualNetworkConfigurationState.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/VirtualNetworkConfigurationState.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/VirtualNetworkConfigurationStateStatusType.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/VirtualNetworkConfigurationStateStatusType.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/VirtualNetworkConfigurationStateStatusType.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/VirtualNetworkConfigurationStateStatusType.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/VirtualNetworkConfigurationStatus.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/VirtualNetworkConfigurationStatus.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/VirtualNetworkConfigurationStatus.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/VirtualNetworkConfigurationStatus.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/VirtualNetworkConfigurationStatusType.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/VirtualNetworkConfigurationStatusType.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/Models/VirtualNetworkConfigurationStatusType.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/Models/VirtualNetworkConfigurationStatusType.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/NetworkAdminClient.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/NetworkAdminClient.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/NetworkAdminClient.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/NetworkAdminClient.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/PublicIPAddressesOperations.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/PublicIPAddressesOperations.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/PublicIPAddressesOperations.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/PublicIPAddressesOperations.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/PublicIPAddressesOperationsExtensions.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/PublicIPAddressesOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/PublicIPAddressesOperationsExtensions.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/PublicIPAddressesOperationsExtensions.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/QuotasOperations.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/QuotasOperations.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/QuotasOperations.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/QuotasOperations.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/QuotasOperationsExtensions.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/QuotasOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/QuotasOperationsExtensions.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/QuotasOperationsExtensions.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/ResourceProviderStateOperations.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/ResourceProviderStateOperations.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/ResourceProviderStateOperations.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/ResourceProviderStateOperations.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/ResourceProviderStateOperationsExtensions.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/ResourceProviderStateOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/ResourceProviderStateOperationsExtensions.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/ResourceProviderStateOperationsExtensions.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/SdkInfo_NetworkAdminClient.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/SdkInfo_NetworkAdminClient.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/SdkInfo_NetworkAdminClient.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/SdkInfo_NetworkAdminClient.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/VirtualNetworksOperations.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/VirtualNetworksOperations.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/VirtualNetworksOperations.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/VirtualNetworksOperations.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Generated/VirtualNetworksOperationsExtensions.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/VirtualNetworksOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Generated/VirtualNetworksOperationsExtensions.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Generated/VirtualNetworksOperationsExtensions.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Microsoft.AzureStack.Management.Network.Admin.csproj b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Microsoft.AzureStack.Management.Network.Admin.csproj
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Microsoft.AzureStack.Management.Network.Admin.csproj
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Microsoft.AzureStack.Management.Network.Admin.csproj
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/Properties/AssemblyInfo.cs b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/Properties/AssemblyInfo.cs
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/Properties/AssemblyInfo.cs
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/generate.cmd b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/generate.cmd
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/generate.cmd
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/generate.cmd
diff --git a/src/AzureStack/NetworkAdmin/Network.Admin/generate.ps1 b/src/AzureStack/Admin/NetworkAdmin/Network.Admin/generate.ps1
similarity index 100%
rename from src/AzureStack/NetworkAdmin/Network.Admin/generate.ps1
rename to src/AzureStack/Admin/NetworkAdmin/Network.Admin/generate.ps1
diff --git a/src/AzureStack/NetworkAdmin/NetworkAdmin.sln b/src/AzureStack/Admin/NetworkAdmin/NetworkAdmin.sln
similarity index 100%
rename from src/AzureStack/NetworkAdmin/NetworkAdmin.sln
rename to src/AzureStack/Admin/NetworkAdmin/NetworkAdmin.sln
diff --git a/src/AzureStack/StorageAdmin/AzSdk.RP.props b/src/AzureStack/Admin/StorageAdmin/AzSdk.RP.props
similarity index 100%
rename from src/AzureStack/StorageAdmin/AzSdk.RP.props
rename to src/AzureStack/Admin/StorageAdmin/AzSdk.RP.props
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/Properties/AssemblyInfo.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/Properties/AssemblyInfo.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/Properties/AssemblyInfo.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/CreateQuota.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/CreateQuota.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/CreateQuota.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/CreateQuota.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/DeleteQuota.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/DeleteQuota.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/DeleteQuota.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/DeleteQuota.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ForAllFarmsStartGarbageCollection.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ForAllFarmsStartGarbageCollection.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ForAllFarmsStartGarbageCollection.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ForAllFarmsStartGarbageCollection.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetAcquisition.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetAcquisition.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetAcquisition.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetAcquisition.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetAllAcquisitions.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetAllAcquisitions.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetAllAcquisitions.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetAllAcquisitions.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetAllFarms.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetAllFarms.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetAllFarms.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetAllFarms.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetAllShares.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetAllShares.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetAllShares.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetAllShares.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetAllStorageAccounts.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetAllStorageAccounts.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetAllStorageAccounts.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetAllStorageAccounts.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetAllStorageQuotas.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetAllStorageQuotas.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetAllStorageQuotas.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetAllStorageQuotas.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetBlobService.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetBlobService.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetBlobService.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetBlobService.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetFarm.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetFarm.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetFarm.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetFarm.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetQueueService.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetQueueService.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetQueueService.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetQueueService.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetShare.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetShare.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetShare.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetShare.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetStorageAccount.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetStorageAccount.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetStorageAccount.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetStorageAccount.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetStorageQuota.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetStorageQuota.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetStorageQuota.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetStorageQuota.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetTableService.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetTableService.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetTableService.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/GetTableService.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllAcquisitions.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllAcquisitions.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllAcquisitions.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllAcquisitions.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllFarmMetricDefinitions.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllFarmMetricDefinitions.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllFarmMetricDefinitions.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllFarmMetricDefinitions.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllFarmMetrics.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllFarmMetrics.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllFarmMetrics.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllFarmMetrics.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllQueueServiceMetricDefinitions.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllQueueServiceMetricDefinitions.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllQueueServiceMetricDefinitions.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllQueueServiceMetricDefinitions.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllQueueServiceMetrics.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllQueueServiceMetrics.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllQueueServiceMetrics.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllQueueServiceMetrics.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllShareMetricDefinitions.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllShareMetricDefinitions.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllShareMetricDefinitions.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllShareMetricDefinitions.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllShareMetrics.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllShareMetrics.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllShareMetrics.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllShareMetrics.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllStorageAccounts.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllStorageAccounts.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllStorageAccounts.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllStorageAccounts.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllStorageQuotas.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllStorageQuotas.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllStorageQuotas.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllStorageQuotas.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllTableServiceMetricDefinitions.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllTableServiceMetricDefinitions.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllTableServiceMetricDefinitions.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllTableServiceMetricDefinitions.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllTableServiceMetrics.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllTableServiceMetrics.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllTableServiceMetrics.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListAllTableServiceMetrics.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListBlobServiceMetricDefinitions.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListBlobServiceMetricDefinitions.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListBlobServiceMetricDefinitions.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListBlobServiceMetricDefinitions.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListBlobServiceMetrics.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListBlobServiceMetrics.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListBlobServiceMetrics.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListBlobServiceMetrics.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListContainers.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListContainers.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListContainers.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListContainers.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListDestinationShares.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListDestinationShares.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListDestinationShares.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListDestinationShares.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListFarms.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListFarms.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListFarms.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListFarms.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListShares.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListShares.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListShares.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/ListShares.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/UpdateQuota.json b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/UpdateQuota.json
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/UpdateQuota.json
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/SessionRecords/StorageAdminClient/UpdateQuota.json
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/Storage.Admin.Tests.csproj b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/Storage.Admin.Tests.csproj
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/Storage.Admin.Tests.csproj
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/Storage.Admin.Tests.csproj
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/src/AcquisitionsTests.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/src/AcquisitionsTests.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/src/AcquisitionsTests.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/src/AcquisitionsTests.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/src/BlobServicesTests.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/src/BlobServicesTests.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/src/BlobServicesTests.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/src/BlobServicesTests.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/src/Containers.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/src/Containers.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/src/Containers.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/src/Containers.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/src/FarmTests.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/src/FarmTests.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/src/FarmTests.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/src/FarmTests.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/src/Helpers/AzureStackTestBase.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/src/Helpers/AzureStackTestBase.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/src/Helpers/AzureStackTestBase.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/src/Helpers/AzureStackTestBase.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/src/Helpers/Common.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/src/Helpers/Common.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/src/Helpers/Common.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/src/Helpers/Common.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/src/Helpers/StorageTestBase.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/src/Helpers/StorageTestBase.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/src/Helpers/StorageTestBase.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/src/Helpers/StorageTestBase.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/src/QueueServiceTests.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/src/QueueServiceTests.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/src/QueueServiceTests.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/src/QueueServiceTests.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/src/SharesTests.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/src/SharesTests.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/src/SharesTests.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/src/SharesTests.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/src/StorageAccountsTests.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/src/StorageAccountsTests.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/src/StorageAccountsTests.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/src/StorageAccountsTests.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/src/StorageQuotasTests.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/src/StorageQuotasTests.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/src/StorageQuotasTests.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/src/StorageQuotasTests.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin.Tests/src/TableServicesTests.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/src/TableServicesTests.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin.Tests/src/TableServicesTests.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/src/TableServicesTests.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/AcquisitionsOperations.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/AcquisitionsOperations.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/AcquisitionsOperations.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/AcquisitionsOperations.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/AcquisitionsOperationsExtensions.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/AcquisitionsOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/AcquisitionsOperationsExtensions.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/AcquisitionsOperationsExtensions.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/BlobServicesOperations.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/BlobServicesOperations.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/BlobServicesOperations.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/BlobServicesOperations.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/BlobServicesOperationsExtensions.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/BlobServicesOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/BlobServicesOperationsExtensions.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/BlobServicesOperationsExtensions.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/ContainersOperations.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/ContainersOperations.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/ContainersOperations.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/ContainersOperations.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/ContainersOperationsExtensions.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/ContainersOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/ContainersOperationsExtensions.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/ContainersOperationsExtensions.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/FarmsOperations.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/FarmsOperations.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/FarmsOperations.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/FarmsOperations.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/FarmsOperationsExtensions.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/FarmsOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/FarmsOperationsExtensions.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/FarmsOperationsExtensions.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/IAcquisitionsOperations.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/IAcquisitionsOperations.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/IAcquisitionsOperations.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/IAcquisitionsOperations.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/IBlobServicesOperations.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/IBlobServicesOperations.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/IBlobServicesOperations.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/IBlobServicesOperations.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/IContainersOperations.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/IContainersOperations.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/IContainersOperations.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/IContainersOperations.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/IFarmsOperations.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/IFarmsOperations.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/IFarmsOperations.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/IFarmsOperations.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/IOperations.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/IOperations.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/IOperations.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/IOperations.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/IQueueServicesOperations.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/IQueueServicesOperations.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/IQueueServicesOperations.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/IQueueServicesOperations.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/ISharesOperations.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/ISharesOperations.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/ISharesOperations.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/ISharesOperations.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/IStorageAccountsOperations.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/IStorageAccountsOperations.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/IStorageAccountsOperations.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/IStorageAccountsOperations.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/IStorageAdminClient.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/IStorageAdminClient.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/IStorageAdminClient.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/IStorageAdminClient.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/IStorageQuotasOperations.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/IStorageQuotasOperations.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/IStorageQuotasOperations.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/IStorageQuotasOperations.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/ITableServicesOperations.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/ITableServicesOperations.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/ITableServicesOperations.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/ITableServicesOperations.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/Acquisition.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/Acquisition.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/Acquisition.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/Acquisition.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/AcquisitionStatus.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/AcquisitionStatus.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/AcquisitionStatus.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/AcquisitionStatus.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/AggregateType.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/AggregateType.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/AggregateType.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/AggregateType.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/BlobService.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/BlobService.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/BlobService.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/BlobService.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/BlobServiceWritableSettings.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/BlobServiceWritableSettings.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/BlobServiceWritableSettings.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/BlobServiceWritableSettings.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/Container.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/Container.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/Container.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/Container.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/Display.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/Display.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/Display.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/Display.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/Farm.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/Farm.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/Farm.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/Farm.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/FarmCreationProperties.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/FarmCreationProperties.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/FarmCreationProperties.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/FarmCreationProperties.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/HealthStatus.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/HealthStatus.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/HealthStatus.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/HealthStatus.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/LocalizableString.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/LocalizableString.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/LocalizableString.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/LocalizableString.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/LocationStatus.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/LocationStatus.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/LocationStatus.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/LocationStatus.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/Metric.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/Metric.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/Metric.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/Metric.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/MetricAvailability.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/MetricAvailability.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/MetricAvailability.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/MetricAvailability.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/MetricDefinition.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/MetricDefinition.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/MetricDefinition.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/MetricDefinition.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/MetricUnit.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/MetricUnit.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/MetricUnit.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/MetricUnit.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/MetricValue.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/MetricValue.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/MetricValue.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/MetricValue.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/MigrationParameters.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/MigrationParameters.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/MigrationParameters.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/MigrationParameters.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/MigrationResult.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/MigrationResult.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/MigrationResult.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/MigrationResult.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/MigrationState.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/MigrationState.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/MigrationState.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/MigrationState.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/Operation.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/Operation.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/Operation.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/Operation.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/Page.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/Page.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/Page.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/Page.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/Page1.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/Page1.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/Page1.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/Page1.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/QueueService.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/QueueService.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/QueueService.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/QueueService.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/Resource.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/Resource.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/Resource.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/Resource.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/Service.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/Service.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/Service.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/Service.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/Share.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/Share.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/Share.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/Share.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/StorageAccount.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/StorageAccount.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/StorageAccount.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/StorageAccount.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/StorageAccountOperation.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/StorageAccountOperation.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/StorageAccountOperation.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/StorageAccountOperation.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/StorageAccountState.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/StorageAccountState.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/StorageAccountState.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/StorageAccountState.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/StorageAccountStatus.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/StorageAccountStatus.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/StorageAccountStatus.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/StorageAccountStatus.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/StorageAccountType.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/StorageAccountType.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/StorageAccountType.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/StorageAccountType.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/StorageQuota.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/StorageQuota.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/StorageQuota.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/StorageQuota.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/TableService.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/TableService.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/TableService.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/TableService.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/WacAccountPermissions.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/WacAccountPermissions.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/WacAccountPermissions.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/WacAccountPermissions.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/WacAccountStates.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/WacAccountStates.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/WacAccountStates.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/WacAccountStates.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/WritableServiceSettings.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/WritableServiceSettings.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/WritableServiceSettings.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/WritableServiceSettings.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/WritableSettings.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/WritableSettings.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Models/WritableSettings.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Models/WritableSettings.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/Operations.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Operations.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/Operations.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/Operations.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/OperationsExtensions.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/OperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/OperationsExtensions.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/OperationsExtensions.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/QueueServicesOperations.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/QueueServicesOperations.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/QueueServicesOperations.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/QueueServicesOperations.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/QueueServicesOperationsExtensions.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/QueueServicesOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/QueueServicesOperationsExtensions.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/QueueServicesOperationsExtensions.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/SdkInfo_StorageAdminClient.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/SdkInfo_StorageAdminClient.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/SdkInfo_StorageAdminClient.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/SdkInfo_StorageAdminClient.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/SharesOperations.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/SharesOperations.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/SharesOperations.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/SharesOperations.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/SharesOperationsExtensions.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/SharesOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/SharesOperationsExtensions.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/SharesOperationsExtensions.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/StorageAccountsOperations.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/StorageAccountsOperations.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/StorageAccountsOperations.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/StorageAccountsOperations.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/StorageAccountsOperationsExtensions.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/StorageAccountsOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/StorageAccountsOperationsExtensions.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/StorageAccountsOperationsExtensions.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/StorageAdminClient.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/StorageAdminClient.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/StorageAdminClient.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/StorageAdminClient.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/StorageQuotasOperations.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/StorageQuotasOperations.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/StorageQuotasOperations.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/StorageQuotasOperations.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/StorageQuotasOperationsExtensions.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/StorageQuotasOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/StorageQuotasOperationsExtensions.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/StorageQuotasOperationsExtensions.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/TableServicesOperations.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/TableServicesOperations.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/TableServicesOperations.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/TableServicesOperations.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Generated/TableServicesOperationsExtensions.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/TableServicesOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Generated/TableServicesOperationsExtensions.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Generated/TableServicesOperationsExtensions.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Microsoft.AzureStack.Management.Storage.Admin.csproj b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Microsoft.AzureStack.Management.Storage.Admin.csproj
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Microsoft.AzureStack.Management.Storage.Admin.csproj
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Microsoft.AzureStack.Management.Storage.Admin.csproj
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/Properties/AssemblyInfo.cs b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/Properties/AssemblyInfo.cs
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/Properties/AssemblyInfo.cs
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/generate.cmd b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/generate.cmd
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/generate.cmd
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/generate.cmd
diff --git a/src/AzureStack/StorageAdmin/Storage.Admin/generate.ps1 b/src/AzureStack/Admin/StorageAdmin/Storage.Admin/generate.ps1
similarity index 100%
rename from src/AzureStack/StorageAdmin/Storage.Admin/generate.ps1
rename to src/AzureStack/Admin/StorageAdmin/Storage.Admin/generate.ps1
diff --git a/src/AzureStack/StorageAdmin/StorageAdmin.sln b/src/AzureStack/Admin/StorageAdmin/StorageAdmin.sln
similarity index 100%
rename from src/AzureStack/StorageAdmin/StorageAdmin.sln
rename to src/AzureStack/Admin/StorageAdmin/StorageAdmin.sln
diff --git a/src/AzureStack/SubscriptionsAdmin/AzSdk.RP.props b/src/AzureStack/Admin/SubscriptionsAdmin/AzSdk.RP.props
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/AzSdk.RP.props
rename to src/AzureStack/Admin/SubscriptionsAdmin/AzSdk.RP.props
diff --git a/src/AzureStack/Subscription/Subscription.Tests/Properties/AssemblyInfo.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription.Tests/Properties/AssemblyInfo.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/Properties/AssemblyInfo.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/CheckNameAvailability.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/CheckNameAvailability.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/CheckNameAvailability.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/CheckNameAvailability.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/CreateUpdateDeleteSubscription.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/CreateUpdateDeleteSubscription.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/CreateUpdateDeleteSubscription.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/CreateUpdateDeleteSubscription.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/ListAdminOperations.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/ListAdminOperations.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/ListAdminOperations.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/ListAdminOperations.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestCreateThenDeleteAcquiredPlan.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestCreateThenDeleteAcquiredPlan.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestCreateThenDeleteAcquiredPlan.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestCreateThenDeleteAcquiredPlan.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestCreateUpdateThenDeleteDelegatedOffer.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestCreateUpdateThenDeleteDelegatedOffer.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestCreateUpdateThenDeleteDelegatedOffer.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestCreateUpdateThenDeleteDelegatedOffer.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestCreateUpdateThenDeleteOffer.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestCreateUpdateThenDeleteOffer.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestCreateUpdateThenDeleteOffer.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestCreateUpdateThenDeleteOffer.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestCreateUpdateThenDeleteOfferDelegation.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestCreateUpdateThenDeleteOfferDelegation.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestCreateUpdateThenDeleteOfferDelegation.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestCreateUpdateThenDeleteOfferDelegation.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestCreateUpdateThenDeletePlan.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestCreateUpdateThenDeletePlan.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestCreateUpdateThenDeletePlan.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestCreateUpdateThenDeletePlan.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetAcquiredPlan.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetAcquiredPlan.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetAcquiredPlan.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetAcquiredPlan.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetAllAcquiredPlans.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetAllAcquiredPlans.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetAllAcquiredPlans.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetAllAcquiredPlans.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetAllDelegatedProviders.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetAllDelegatedProviders.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetAllDelegatedProviders.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetAllDelegatedProviders.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetAllDirectoryTenants.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetAllDirectoryTenants.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetAllDirectoryTenants.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetAllDirectoryTenants.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetAllLocations.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetAllLocations.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetAllLocations.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetAllLocations.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetAllOffers.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetAllOffers.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetAllOffers.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetAllOffers.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetDelegatedOffer.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetDelegatedOffer.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetDelegatedOffer.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetDelegatedOffer.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetDelegatedProvider.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetDelegatedProvider.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetDelegatedProvider.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetDelegatedProvider.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetDirectoryTenant.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetDirectoryTenant.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetDirectoryTenant.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetDirectoryTenant.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetLocation.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetLocation.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetLocation.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetLocation.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetOffer.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetOffer.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetOffer.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetOffer.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetOfferDelegation.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetOfferDelegation.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetOfferDelegation.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestGetOfferDelegation.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListAcquiredPlans.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListAcquiredPlans.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListAcquiredPlans.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListAcquiredPlans.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListAllDelegatedOffers.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListAllDelegatedOffers.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListAllDelegatedOffers.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListAllDelegatedOffers.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListAllOfferDelegations.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListAllOfferDelegations.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListAllOfferDelegations.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListAllOfferDelegations.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListAllOffers.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListAllOffers.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListAllOffers.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListAllOffers.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListDelegatedOffers.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListDelegatedOffers.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListDelegatedOffers.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListDelegatedOffers.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListDelegatedProviderOffers.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListDelegatedProviderOffers.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListDelegatedProviderOffers.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListDelegatedProviderOffers.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListDelegatedProviders.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListDelegatedProviders.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListDelegatedProviders.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListDelegatedProviders.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListDirectoryTenants.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListDirectoryTenants.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListDirectoryTenants.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListDirectoryTenants.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListLocations.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListLocations.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListLocations.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListLocations.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListOfferDelegations.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListOfferDelegations.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListOfferDelegations.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListOfferDelegations.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListOffers.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListOffers.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListOffers.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListOffers.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListPlans.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListPlans.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListPlans.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListPlans.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListQuotas.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListQuotas.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListQuotas.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListQuotas.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListSubscriptions.json b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListSubscriptions.json
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListSubscriptions.json
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/SessionRecords/SubscriptionsAdminClient/TestListSubscriptions.json
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/Subscriptions.Tests.csproj b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/Subscriptions.Tests.csproj
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/Subscriptions.Tests.csproj
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/Subscriptions.Tests.csproj
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/AcquiredPlanTests.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/AcquiredPlanTests.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/AcquiredPlanTests.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/AcquiredPlanTests.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/DelegatedProviderOfferTests.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/DelegatedProviderOfferTests.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/DelegatedProviderOfferTests.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/DelegatedProviderOfferTests.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/DelegatedProviderTests.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/DelegatedProviderTests.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/DelegatedProviderTests.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/DelegatedProviderTests.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/DirectoryTenantTests.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/DirectoryTenantTests.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/DirectoryTenantTests.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/DirectoryTenantTests.cs
diff --git a/src/AzureStack/Subscription/Subscription.Tests/src/Helpers/AzureStackTestBase.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/Helpers/AzureStackTestBase.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription.Tests/src/Helpers/AzureStackTestBase.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/Helpers/AzureStackTestBase.cs
diff --git a/src/AzureStack/Subscription/Subscription.Tests/src/Helpers/Common.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/Helpers/Common.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription.Tests/src/Helpers/Common.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/Helpers/Common.cs
diff --git a/src/AzureStack/Subscription/Subscription.Tests/src/Helpers/RecordedDelegatingHandler.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription.Tests/src/Helpers/RecordedDelegatingHandler.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/Helpers/SubscriptionsTestBase.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/Helpers/SubscriptionsTestBase.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/Helpers/SubscriptionsTestBase.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/Helpers/SubscriptionsTestBase.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/LocationTests.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/LocationTests.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/LocationTests.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/LocationTests.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/OfferDelegationTests.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/OfferDelegationTests.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/OfferDelegationTests.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/OfferDelegationTests.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/OfferTests.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/OfferTests.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/OfferTests.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/OfferTests.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/PlanTests.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/PlanTests.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/PlanTests.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/PlanTests.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/QuotaTests.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/QuotaTests.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/QuotaTests.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/QuotaTests.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/SubscriptionTests.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/SubscriptionTests.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/SubscriptionTests.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/SubscriptionTests.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/AcquiredPlansOperations.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/AcquiredPlansOperations.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/AcquiredPlansOperations.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/AcquiredPlansOperations.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/AcquiredPlansOperationsExtensions.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/AcquiredPlansOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/AcquiredPlansOperationsExtensions.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/AcquiredPlansOperationsExtensions.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/DelegatedProviderOffersOperations.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/DelegatedProviderOffersOperations.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/DelegatedProviderOffersOperations.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/DelegatedProviderOffersOperations.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/DelegatedProviderOffersOperationsExtensions.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/DelegatedProviderOffersOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/DelegatedProviderOffersOperationsExtensions.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/DelegatedProviderOffersOperationsExtensions.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/DelegatedProvidersOperations.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/DelegatedProvidersOperations.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/DelegatedProvidersOperations.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/DelegatedProvidersOperations.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/DelegatedProvidersOperationsExtensions.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/DelegatedProvidersOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/DelegatedProvidersOperationsExtensions.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/DelegatedProvidersOperationsExtensions.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/DirectoryTenantsOperations.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/DirectoryTenantsOperations.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/DirectoryTenantsOperations.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/DirectoryTenantsOperations.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/DirectoryTenantsOperationsExtensions.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/DirectoryTenantsOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/DirectoryTenantsOperationsExtensions.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/DirectoryTenantsOperationsExtensions.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/IAcquiredPlansOperations.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/IAcquiredPlansOperations.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/IAcquiredPlansOperations.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/IAcquiredPlansOperations.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/IDelegatedProviderOffersOperations.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/IDelegatedProviderOffersOperations.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/IDelegatedProviderOffersOperations.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/IDelegatedProviderOffersOperations.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/IDelegatedProvidersOperations.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/IDelegatedProvidersOperations.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/IDelegatedProvidersOperations.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/IDelegatedProvidersOperations.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/IDirectoryTenantsOperations.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/IDirectoryTenantsOperations.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/IDirectoryTenantsOperations.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/IDirectoryTenantsOperations.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/ILocationsOperations.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/ILocationsOperations.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/ILocationsOperations.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/ILocationsOperations.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/IOfferDelegationsOperations.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/IOfferDelegationsOperations.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/IOfferDelegationsOperations.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/IOfferDelegationsOperations.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/IOffersOperations.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/IOffersOperations.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/IOffersOperations.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/IOffersOperations.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/IOperations.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/IOperations.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/IOperations.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/IOperations.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/IPlansOperations.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/IPlansOperations.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/IPlansOperations.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/IPlansOperations.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/IQuotasOperations.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/IQuotasOperations.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/IQuotasOperations.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/IQuotasOperations.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/ISubscriptionsAdminClient.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/ISubscriptionsAdminClient.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/ISubscriptionsAdminClient.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/ISubscriptionsAdminClient.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/ISubscriptionsOperations.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/ISubscriptionsOperations.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/ISubscriptionsOperations.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/ISubscriptionsOperations.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/LocationsOperations.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/LocationsOperations.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/LocationsOperations.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/LocationsOperations.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/LocationsOperationsExtensions.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/LocationsOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/LocationsOperationsExtensions.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/LocationsOperationsExtensions.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/AccessibilityState.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/AccessibilityState.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/AccessibilityState.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/AccessibilityState.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/AddonPlanDefinition.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/AddonPlanDefinition.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/AddonPlanDefinition.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/AddonPlanDefinition.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/CheckNameAvailabilityDefinition.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/CheckNameAvailabilityDefinition.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/CheckNameAvailabilityDefinition.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/CheckNameAvailabilityDefinition.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/CheckNameAvailabilityResponse.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/CheckNameAvailabilityResponse.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/CheckNameAvailabilityResponse.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/CheckNameAvailabilityResponse.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/DelegatedProviderOffer.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/DelegatedProviderOffer.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/DelegatedProviderOffer.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/DelegatedProviderOffer.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/DirectoryTenant.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/DirectoryTenant.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/DirectoryTenant.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/DirectoryTenant.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Location.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Location.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Location.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Location.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Metric.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Metric.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Metric.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Metric.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricAvailability.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricAvailability.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricAvailability.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricAvailability.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricDefinition.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricDefinition.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricDefinition.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricDefinition.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricDefinitionList.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricDefinitionList.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricDefinitionList.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricDefinitionList.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricList.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricList.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricList.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricList.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricPrimaryAggregationType.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricPrimaryAggregationType.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricPrimaryAggregationType.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricPrimaryAggregationType.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricUnit.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricUnit.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricUnit.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricUnit.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricValue.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricValue.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricValue.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/MetricValue.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/NameUnavailabilityReason.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/NameUnavailabilityReason.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/NameUnavailabilityReason.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/NameUnavailabilityReason.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Offer.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Offer.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Offer.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Offer.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/OfferDelegation.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/OfferDelegation.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/OfferDelegation.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/OfferDelegation.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Operation.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Operation.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Operation.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Operation.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/OperationDisplay.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/OperationDisplay.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/OperationDisplay.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/OperationDisplay.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/OperationList.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/OperationList.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/OperationList.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/OperationList.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Page.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Page.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Page.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Page.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Page1.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Page1.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Page1.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Page1.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Plan.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Plan.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Plan.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Plan.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/PlanAcquisition.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/PlanAcquisition.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/PlanAcquisition.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/PlanAcquisition.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/PlanLinkDefinition.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/PlanLinkDefinition.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/PlanLinkDefinition.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/PlanLinkDefinition.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/PlanLinkType.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/PlanLinkType.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/PlanLinkType.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/PlanLinkType.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/ProvisioningState.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/ProvisioningState.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/ProvisioningState.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/ProvisioningState.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Quota.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Quota.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Quota.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Quota.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Resource.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Resource.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Resource.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Resource.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/ResourceManagerType.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/ResourceManagerType.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/ResourceManagerType.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/ResourceManagerType.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Subscription.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Subscription.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Subscription.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/Subscription.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/SubscriptionList.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/SubscriptionList.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/SubscriptionList.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/SubscriptionList.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/SubscriptionState.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/SubscriptionState.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/SubscriptionState.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Models/SubscriptionState.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/OfferDelegationsOperations.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/OfferDelegationsOperations.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/OfferDelegationsOperations.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/OfferDelegationsOperations.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/OfferDelegationsOperationsExtensions.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/OfferDelegationsOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/OfferDelegationsOperationsExtensions.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/OfferDelegationsOperationsExtensions.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/OffersOperations.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/OffersOperations.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/OffersOperations.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/OffersOperations.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/OffersOperationsExtensions.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/OffersOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/OffersOperationsExtensions.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/OffersOperationsExtensions.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Operations.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Operations.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/Operations.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/Operations.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/OperationsExtensions.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/OperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/OperationsExtensions.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/OperationsExtensions.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/PlansOperations.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/PlansOperations.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/PlansOperations.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/PlansOperations.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/PlansOperationsExtensions.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/PlansOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/PlansOperationsExtensions.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/PlansOperationsExtensions.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/QuotasOperations.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/QuotasOperations.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/QuotasOperations.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/QuotasOperations.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/QuotasOperationsExtensions.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/QuotasOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/QuotasOperationsExtensions.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/QuotasOperationsExtensions.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/SdkInfo_SubscriptionsAdminClient.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/SdkInfo_SubscriptionsAdminClient.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/SdkInfo_SubscriptionsAdminClient.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/SdkInfo_SubscriptionsAdminClient.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/SubscriptionsAdminClient.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/SubscriptionsAdminClient.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/SubscriptionsAdminClient.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/SubscriptionsAdminClient.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/SubscriptionsAdminClientExtensions.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/SubscriptionsAdminClientExtensions.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/SubscriptionsAdminClientExtensions.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/SubscriptionsAdminClientExtensions.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/SubscriptionsOperations.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/SubscriptionsOperations.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/SubscriptionsOperations.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/SubscriptionsOperations.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/SubscriptionsOperationsExtensions.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/SubscriptionsOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Generated/SubscriptionsOperationsExtensions.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Generated/SubscriptionsOperationsExtensions.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Microsoft.AzureStack.Management.Subscriptions.Admin.csproj b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Microsoft.AzureStack.Management.Subscriptions.Admin.csproj
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Microsoft.AzureStack.Management.Subscriptions.Admin.csproj
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Microsoft.AzureStack.Management.Subscriptions.Admin.csproj
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Properties/AssemblyInfo.cs b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/Properties/AssemblyInfo.cs
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/Properties/AssemblyInfo.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/generate.cmd b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/generate.cmd
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/generate.cmd
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/generate.cmd
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/generate.ps1 b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/generate.ps1
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin/generate.ps1
rename to src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin/generate.ps1
diff --git a/src/AzureStack/SubscriptionsAdmin/SubscriptionsAdmin.sln b/src/AzureStack/Admin/SubscriptionsAdmin/SubscriptionsAdmin.sln
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/SubscriptionsAdmin.sln
rename to src/AzureStack/Admin/SubscriptionsAdmin/SubscriptionsAdmin.sln
diff --git a/src/AzureStack/UpdateAdmin/AzSdk.RP.props b/src/AzureStack/Admin/UpdateAdmin/AzSdk.RP.props
similarity index 100%
rename from src/AzureStack/UpdateAdmin/AzSdk.RP.props
rename to src/AzureStack/Admin/UpdateAdmin/AzSdk.RP.props
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin.Tests/Properties/AssemblyInfo.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin.Tests/Properties/AssemblyInfo.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/Properties/AssemblyInfo.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestGetAllUpdateLocations.json b/src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestGetAllUpdateLocations.json
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestGetAllUpdateLocations.json
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestGetAllUpdateLocations.json
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestGetAllUpdateRuns.json b/src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestGetAllUpdateRuns.json
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestGetAllUpdateRuns.json
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestGetAllUpdateRuns.json
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestGetAllUpdates.json b/src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestGetAllUpdates.json
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestGetAllUpdates.json
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestGetAllUpdates.json
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestGetUpdate.json b/src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestGetUpdate.json
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestGetUpdate.json
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestGetUpdate.json
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestGetUpdateLocation.json b/src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestGetUpdateLocation.json
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestGetUpdateLocation.json
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestGetUpdateLocation.json
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestGetUpdateRun.json b/src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestGetUpdateRun.json
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestGetUpdateRun.json
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestGetUpdateRun.json
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestListUpdateLocations.json b/src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestListUpdateLocations.json
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestListUpdateLocations.json
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestListUpdateLocations.json
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestListUpdateRuns.json b/src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestListUpdateRuns.json
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestListUpdateRuns.json
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestListUpdateRuns.json
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestListUpdates.json b/src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestListUpdates.json
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestListUpdates.json
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/SessionRecords/UpdateAdminClient/TestListUpdates.json
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin.Tests/Update.Tests.csproj b/src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/Update.Tests.csproj
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin.Tests/Update.Tests.csproj
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/Update.Tests.csproj
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin.Tests/src/Helpers/AzureStackTestBase.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/src/Helpers/AzureStackTestBase.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin.Tests/src/Helpers/AzureStackTestBase.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/src/Helpers/AzureStackTestBase.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin.Tests/src/Helpers/Common.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/src/Helpers/Common.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin.Tests/src/Helpers/Common.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/src/Helpers/Common.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin.Tests/src/Helpers/UpdateTestBase.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/src/Helpers/UpdateTestBase.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin.Tests/src/Helpers/UpdateTestBase.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/src/Helpers/UpdateTestBase.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin.Tests/src/UpdateLocations.Tests.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/src/UpdateLocations.Tests.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin.Tests/src/UpdateLocations.Tests.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/src/UpdateLocations.Tests.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin.Tests/src/UpdateRuns.Tests.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/src/UpdateRuns.Tests.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin.Tests/src/UpdateRuns.Tests.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/src/UpdateRuns.Tests.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin.Tests/src/Updates.Test.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/src/Updates.Test.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin.Tests/src/Updates.Test.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/src/Updates.Test.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin/Generated/IUpdateAdminClient.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/IUpdateAdminClient.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin/Generated/IUpdateAdminClient.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/IUpdateAdminClient.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin/Generated/IUpdateLocationsOperations.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/IUpdateLocationsOperations.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin/Generated/IUpdateLocationsOperations.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/IUpdateLocationsOperations.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin/Generated/IUpdateRunsOperations.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/IUpdateRunsOperations.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin/Generated/IUpdateRunsOperations.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/IUpdateRunsOperations.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin/Generated/IUpdatesOperations.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/IUpdatesOperations.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin/Generated/IUpdatesOperations.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/IUpdatesOperations.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin/Generated/Models/PackageType.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/Models/PackageType.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin/Generated/Models/PackageType.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/Models/PackageType.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin/Generated/Models/Page.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/Models/Page.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin/Generated/Models/Page.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/Models/Page.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin/Generated/Models/Page1.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/Models/Page1.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin/Generated/Models/Page1.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/Models/Page1.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin/Generated/Models/RegionUpdateState.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/Models/RegionUpdateState.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin/Generated/Models/RegionUpdateState.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/Models/RegionUpdateState.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin/Generated/Models/Resource.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/Models/Resource.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin/Generated/Models/Resource.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/Models/Resource.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin/Generated/Models/Step.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/Models/Step.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin/Generated/Models/Step.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/Models/Step.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin/Generated/Models/Update.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/Models/Update.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin/Generated/Models/Update.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/Models/Update.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin/Generated/Models/UpdateLocation.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/Models/UpdateLocation.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin/Generated/Models/UpdateLocation.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/Models/UpdateLocation.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin/Generated/Models/UpdateRun.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/Models/UpdateRun.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin/Generated/Models/UpdateRun.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/Models/UpdateRun.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin/Generated/Models/UpdateRunState.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/Models/UpdateRunState.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin/Generated/Models/UpdateRunState.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/Models/UpdateRunState.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin/Generated/Models/UpdateState.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/Models/UpdateState.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin/Generated/Models/UpdateState.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/Models/UpdateState.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin/Generated/SdkInfo_UpdateAdminClient.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/SdkInfo_UpdateAdminClient.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin/Generated/SdkInfo_UpdateAdminClient.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/SdkInfo_UpdateAdminClient.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin/Generated/UpdateAdminClient.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/UpdateAdminClient.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin/Generated/UpdateAdminClient.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/UpdateAdminClient.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin/Generated/UpdateLocationsOperations.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/UpdateLocationsOperations.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin/Generated/UpdateLocationsOperations.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/UpdateLocationsOperations.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin/Generated/UpdateLocationsOperationsExtensions.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/UpdateLocationsOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin/Generated/UpdateLocationsOperationsExtensions.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/UpdateLocationsOperationsExtensions.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin/Generated/UpdateRunsOperations.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/UpdateRunsOperations.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin/Generated/UpdateRunsOperations.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/UpdateRunsOperations.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin/Generated/UpdateRunsOperationsExtensions.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/UpdateRunsOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin/Generated/UpdateRunsOperationsExtensions.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/UpdateRunsOperationsExtensions.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin/Generated/UpdatesOperations.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/UpdatesOperations.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin/Generated/UpdatesOperations.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/UpdatesOperations.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin/Generated/UpdatesOperationsExtensions.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/UpdatesOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin/Generated/UpdatesOperationsExtensions.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin/Generated/UpdatesOperationsExtensions.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin/Microsoft.AzureStack.Management.Update.Admin.csproj b/src/AzureStack/Admin/UpdateAdmin/Update.Admin/Microsoft.AzureStack.Management.Update.Admin.csproj
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin/Microsoft.AzureStack.Management.Update.Admin.csproj
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin/Microsoft.AzureStack.Management.Update.Admin.csproj
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin/Properties/AssemblyInfo.cs b/src/AzureStack/Admin/UpdateAdmin/Update.Admin/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin/Properties/AssemblyInfo.cs
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin/Properties/AssemblyInfo.cs
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin/generate.cmd b/src/AzureStack/Admin/UpdateAdmin/Update.Admin/generate.cmd
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin/generate.cmd
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin/generate.cmd
diff --git a/src/AzureStack/UpdateAdmin/Update.Admin/generate.ps1 b/src/AzureStack/Admin/UpdateAdmin/Update.Admin/generate.ps1
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.Admin/generate.ps1
rename to src/AzureStack/Admin/UpdateAdmin/Update.Admin/generate.ps1
diff --git a/src/AzureStack/UpdateAdmin/Update.sln b/src/AzureStack/Admin/UpdateAdmin/Update.sln
similarity index 100%
rename from src/AzureStack/UpdateAdmin/Update.sln
rename to src/AzureStack/Admin/UpdateAdmin/Update.sln
diff --git a/src/AzureStack/BackupAdmin/AzSdk.RP.props b/src/AzureStack/BackupAdmin/AzSdk.RP.props
deleted file mode 100644
index 2ab4f039fe26e..0000000000000
--- a/src/AzureStack/BackupAdmin/AzSdk.RP.props
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!--This file and it's contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
-  <PropertyGroup>
-    <AzureApiTag />
-    <PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/Backup.Tests.csproj b/src/AzureStack/BackupAdmin/Backup.Admin.Tests/Backup.Tests.csproj
deleted file mode 100644
index 8c65cce195b3d..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/Backup.Tests.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.test.reference.props'))" />
-  <PropertyGroup>
-    <PackageId>Backup.Admin.Tests</PackageId>
-    <Description>Backup.Admin.Tests Class Library</Description>
-    <AssemblyName>Backup.Admin.Tests</AssemblyName>
-    <VersionPrefix>1.0.0</VersionPrefix>    
-  </PropertyGroup>
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Backup.Admin\Microsoft.AzureStack.Management.Backup.Admin.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="SessionRecords\**\*.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  
-</Project>
\ No newline at end of file
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/Properties/AssemblyInfo.cs b/src/AzureStack/BackupAdmin/Backup.Admin.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 36361cf2b1786..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("Backup.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Backup.Tests")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: ComVisible(false)]
-
-[assembly: Guid("1b24bc4a-6e4d-4feb-b5d5-c9684c60a308")]
-
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/SessionRecords/BackupAdminClient/TestCreateBackup.json b/src/AzureStack/BackupAdmin/Backup.Admin.Tests/SessionRecords/BackupAdminClient/TestCreateBackup.json
deleted file mode 100644
index 22a4bf6f2aeb3..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/SessionRecords/BackupAdminClient/TestCreateBackup.json
+++ /dev/null
@@ -1,618 +0,0 @@
-{
-  "Entries": [
-    {
-      "RequestUri": "/subscriptions/ab4e818f-4285-488e-93ad-35a8628fd1fa/resourcegroups/System.local/providers/Microsoft.Backup.Admin/backupLocations/local/createBackup?api-version=2016-05-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvYWI0ZTgxOGYtNDI4NS00ODhlLTkzYWQtMzVhODYyOGZkMWZhL3Jlc291cmNlZ3JvdXBzL1N5c3RlbS5sb2NhbC9wcm92aWRlcnMvTWljcm9zb2Z0LkJhY2t1cC5BZG1pbi9iYWNrdXBMb2NhdGlvbnMvbG9jYWwvY3JlYXRlQmFja3VwP2FwaS12ZXJzaW9uPTIwMTYtMDUtMDE=",
-      "RequestMethod": "POST",
-      "RequestBody": "",
-      "RequestHeaders": {
-        "x-ms-client-request-id": [
-          "c04f0709-ae38-4ac4-9db8-b522b5db8b52"
-        ],
-        "accept-language": [
-          "en-US"
-        ],
-        "User-Agent": [
-          "FxVersion/4.6.25211.01",
-          "Microsoft.AzureStack.Management.Backup.Admin.BackupAdminClient/0.1.0.0"
-        ]
-      },
-      "ResponseBody": "",
-      "ResponseHeaders": {
-        "Content-Length": [
-          "0"
-        ],
-        "Expires": [
-          "-1"
-        ],
-        "Cache-Control": [
-          "no-cache"
-        ],
-        "Date": [
-          "Thu, 12 Apr 2018 22:03:26 GMT"
-        ],
-        "Pragma": [
-          "no-cache"
-        ],
-        "Location": [
-          "https://adminmanagement.local.azurestack.external/subscriptions/ab4e818f-4285-488e-93ad-35a8628fd1fa/resourceGroups/system.local/providers/Microsoft.Backup.Admin/backupLocations/local/operationResults/6ef74913-cf73-473b-80fa-c3091f57b95b?api-version=2016-05-01"
-        ],
-        "Retry-After": [
-          "60"
-        ],
-        "Server": [
-          "Microsoft-HTTPAPI/2.0"
-        ],
-        "WWW-Authenticate": [
-          "oYG2MIGzoAMKAQChCwYJKoZIgvcSAQICooGeBIGbYIGYBgkqhkiG9xIBAgICAG+BiDCBhaADAgEFoQMCAQ+ieTB3oAMCARKicARuwavQQq60BnUI7pf2g7zqjudbiECKhquMuy7cIOBCajOP4pRvUkwYxZIfXA9j8wMs7oqpT9OQadvgBbeCMtONa4NlFMp3ZTjpdVCFYtV9IddKJ60NWr22tkskUyNpiGjCXQUWtv3xl2soAdNpMgw="
-        ],
-        "x-ms-correlation-request-id": [
-          "9fb8e322-038f-4fca-977f-170ff9206a0d"
-        ],
-        "x-ms-ratelimit-remaining-subscription-writes": [
-          "1183"
-        ],
-        "x-ms-request-id": [
-          "9fb8e322-038f-4fca-977f-170ff9206a0d"
-        ],
-        "x-ms-routing-request-id": [
-          "LOCAL:20180412T220327Z:9fb8e322-038f-4fca-977f-170ff9206a0d"
-        ],
-        "Strict-Transport-Security": [
-          "max-age=31536000; includeSubDomains"
-        ],
-        "X-Content-Type-Options": [
-          "nosniff"
-        ]
-      },
-      "StatusCode": 202
-    },
-    {
-      "RequestUri": "/subscriptions/ab4e818f-4285-488e-93ad-35a8628fd1fa/resourceGroups/system.local/providers/Microsoft.Backup.Admin/backupLocations/local/operationResults/6ef74913-cf73-473b-80fa-c3091f57b95b?api-version=2016-05-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvYWI0ZTgxOGYtNDI4NS00ODhlLTkzYWQtMzVhODYyOGZkMWZhL3Jlc291cmNlR3JvdXBzL3N5c3RlbS5sb2NhbC9wcm92aWRlcnMvTWljcm9zb2Z0LkJhY2t1cC5BZG1pbi9iYWNrdXBMb2NhdGlvbnMvbG9jYWwvb3BlcmF0aW9uUmVzdWx0cy82ZWY3NDkxMy1jZjczLTQ3M2ItODBmYS1jMzA5MWY1N2I5NWI/YXBpLXZlcnNpb249MjAxNi0wNS0wMQ==",
-      "RequestMethod": "GET",
-      "RequestBody": "",
-      "RequestHeaders": {
-        "User-Agent": [
-          "FxVersion/4.6.25211.01",
-          "Microsoft.AzureStack.Management.Backup.Admin.BackupAdminClient/0.1.0.0"
-        ]
-      },
-      "ResponseBody": "",
-      "ResponseHeaders": {
-        "Content-Length": [
-          "0"
-        ],
-        "Expires": [
-          "-1"
-        ],
-        "Cache-Control": [
-          "no-cache"
-        ],
-        "Date": [
-          "Thu, 12 Apr 2018 22:04:27 GMT"
-        ],
-        "Pragma": [
-          "no-cache"
-        ],
-        "Location": [
-          "https://adminmanagement.local.azurestack.external/subscriptions/ab4e818f-4285-488e-93ad-35a8628fd1fa/resourceGroups/system.local/providers/Microsoft.Backup.Admin/backupLocations/local/operationResults/6ef74913-cf73-473b-80fa-c3091f57b95b?api-version=2016-05-01"
-        ],
-        "Retry-After": [
-          "60"
-        ],
-        "Server": [
-          "Microsoft-HTTPAPI/2.0"
-        ],
-        "WWW-Authenticate": [
-          "oYG2MIGzoAMKAQChCwYJKoZIgvcSAQICooGeBIGbYIGYBgkqhkiG9xIBAgICAG+BiDCBhaADAgEFoQMCAQ+ieTB3oAMCARKicARuXMm4eHNTNGmHio+QZy2E7LTMYCwaMRT1bsTZP6q5KVpPR5/T87IWxxCASD0gqcc+dupDRljl//DCfuRlRPwzNKDZRPy/UlkK7+hkmSJHtOrLMeIxqY2GBHAg6qeipL7Ov/+U/uW6Po7kYaxhYf0="
-        ],
-        "x-ms-correlation-request-id": [
-          "7ae4b564-6d0c-40dd-8e90-3cd61981a68a"
-        ],
-        "x-ms-ratelimit-remaining-subscription-reads": [
-          "14759"
-        ],
-        "x-ms-request-id": [
-          "7ae4b564-6d0c-40dd-8e90-3cd61981a68a"
-        ],
-        "x-ms-routing-request-id": [
-          "LOCAL:20180412T220427Z:7ae4b564-6d0c-40dd-8e90-3cd61981a68a"
-        ],
-        "Strict-Transport-Security": [
-          "max-age=31536000; includeSubDomains"
-        ],
-        "X-Content-Type-Options": [
-          "nosniff"
-        ]
-      },
-      "StatusCode": 202
-    },
-    {
-      "RequestUri": "/subscriptions/ab4e818f-4285-488e-93ad-35a8628fd1fa/resourceGroups/system.local/providers/Microsoft.Backup.Admin/backupLocations/local/operationResults/6ef74913-cf73-473b-80fa-c3091f57b95b?api-version=2016-05-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvYWI0ZTgxOGYtNDI4NS00ODhlLTkzYWQtMzVhODYyOGZkMWZhL3Jlc291cmNlR3JvdXBzL3N5c3RlbS5sb2NhbC9wcm92aWRlcnMvTWljcm9zb2Z0LkJhY2t1cC5BZG1pbi9iYWNrdXBMb2NhdGlvbnMvbG9jYWwvb3BlcmF0aW9uUmVzdWx0cy82ZWY3NDkxMy1jZjczLTQ3M2ItODBmYS1jMzA5MWY1N2I5NWI/YXBpLXZlcnNpb249MjAxNi0wNS0wMQ==",
-      "RequestMethod": "GET",
-      "RequestBody": "",
-      "RequestHeaders": {
-        "User-Agent": [
-          "FxVersion/4.6.25211.01",
-          "Microsoft.AzureStack.Management.Backup.Admin.BackupAdminClient/0.1.0.0"
-        ]
-      },
-      "ResponseBody": "",
-      "ResponseHeaders": {
-        "Content-Length": [
-          "0"
-        ],
-        "Expires": [
-          "-1"
-        ],
-        "Cache-Control": [
-          "no-cache"
-        ],
-        "Date": [
-          "Thu, 12 Apr 2018 22:05:27 GMT"
-        ],
-        "Pragma": [
-          "no-cache"
-        ],
-        "Location": [
-          "https://adminmanagement.local.azurestack.external/subscriptions/ab4e818f-4285-488e-93ad-35a8628fd1fa/resourceGroups/system.local/providers/Microsoft.Backup.Admin/backupLocations/local/operationResults/6ef74913-cf73-473b-80fa-c3091f57b95b?api-version=2016-05-01"
-        ],
-        "Retry-After": [
-          "60"
-        ],
-        "Server": [
-          "Microsoft-HTTPAPI/2.0"
-        ],
-        "WWW-Authenticate": [
-          "oYG2MIGzoAMKAQChCwYJKoZIgvcSAQICooGeBIGbYIGYBgkqhkiG9xIBAgICAG+BiDCBhaADAgEFoQMCAQ+ieTB3oAMCARKicARu8vZZ3aB9r1O3nqnacc+6Lr5c0Y/0RPV3gzwuu5UoFaj3oSW7kkrAFiBQbxHH1rE0mvDOLeWaVB+0giWiBOXsLreBVzGZxCGUs3c8TVxjmOLsgIFsw5wZz1D52jEXg25LyBpAOirAVCxRqpW1Teg="
-        ],
-        "x-ms-correlation-request-id": [
-          "3ab40668-3dfb-455d-bf34-a702aa13be15"
-        ],
-        "x-ms-ratelimit-remaining-subscription-reads": [
-          "14757"
-        ],
-        "x-ms-request-id": [
-          "3ab40668-3dfb-455d-bf34-a702aa13be15"
-        ],
-        "x-ms-routing-request-id": [
-          "LOCAL:20180412T220527Z:3ab40668-3dfb-455d-bf34-a702aa13be15"
-        ],
-        "Strict-Transport-Security": [
-          "max-age=31536000; includeSubDomains"
-        ],
-        "X-Content-Type-Options": [
-          "nosniff"
-        ]
-      },
-      "StatusCode": 202
-    },
-    {
-      "RequestUri": "/subscriptions/ab4e818f-4285-488e-93ad-35a8628fd1fa/resourceGroups/system.local/providers/Microsoft.Backup.Admin/backupLocations/local/operationResults/6ef74913-cf73-473b-80fa-c3091f57b95b?api-version=2016-05-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvYWI0ZTgxOGYtNDI4NS00ODhlLTkzYWQtMzVhODYyOGZkMWZhL3Jlc291cmNlR3JvdXBzL3N5c3RlbS5sb2NhbC9wcm92aWRlcnMvTWljcm9zb2Z0LkJhY2t1cC5BZG1pbi9iYWNrdXBMb2NhdGlvbnMvbG9jYWwvb3BlcmF0aW9uUmVzdWx0cy82ZWY3NDkxMy1jZjczLTQ3M2ItODBmYS1jMzA5MWY1N2I5NWI/YXBpLXZlcnNpb249MjAxNi0wNS0wMQ==",
-      "RequestMethod": "GET",
-      "RequestBody": "",
-      "RequestHeaders": {
-        "User-Agent": [
-          "FxVersion/4.6.25211.01",
-          "Microsoft.AzureStack.Management.Backup.Admin.BackupAdminClient/0.1.0.0"
-        ]
-      },
-      "ResponseBody": "",
-      "ResponseHeaders": {
-        "Content-Length": [
-          "0"
-        ],
-        "Expires": [
-          "-1"
-        ],
-        "Cache-Control": [
-          "no-cache"
-        ],
-        "Date": [
-          "Thu, 12 Apr 2018 22:06:27 GMT"
-        ],
-        "Pragma": [
-          "no-cache"
-        ],
-        "Location": [
-          "https://adminmanagement.local.azurestack.external/subscriptions/ab4e818f-4285-488e-93ad-35a8628fd1fa/resourceGroups/system.local/providers/Microsoft.Backup.Admin/backupLocations/local/operationResults/6ef74913-cf73-473b-80fa-c3091f57b95b?api-version=2016-05-01"
-        ],
-        "Retry-After": [
-          "60"
-        ],
-        "Server": [
-          "Microsoft-HTTPAPI/2.0"
-        ],
-        "WWW-Authenticate": [
-          "oYG2MIGzoAMKAQChCwYJKoZIgvcSAQICooGeBIGbYIGYBgkqhkiG9xIBAgICAG+BiDCBhaADAgEFoQMCAQ+ieTB3oAMCARKicARu/jDhtL4FxrItDQDM9YAApvVompxHm8/JJsbI+mrBoxN+EjJe/Nus79oWmkXpZYal5kJm4wvJzFGaP/JvzPnrUpqAmDMan/6zoALubW4F/GlgC3L0o9SlLvKK6Ke5b5539Rv4TrWnhAjEzhrCbDo="
-        ],
-        "x-ms-correlation-request-id": [
-          "53a9b32f-d96a-4483-bdd7-929ea31dd944"
-        ],
-        "x-ms-ratelimit-remaining-subscription-reads": [
-          "14755"
-        ],
-        "x-ms-request-id": [
-          "53a9b32f-d96a-4483-bdd7-929ea31dd944"
-        ],
-        "x-ms-routing-request-id": [
-          "LOCAL:20180412T220627Z:53a9b32f-d96a-4483-bdd7-929ea31dd944"
-        ],
-        "Strict-Transport-Security": [
-          "max-age=31536000; includeSubDomains"
-        ],
-        "X-Content-Type-Options": [
-          "nosniff"
-        ]
-      },
-      "StatusCode": 202
-    },
-    {
-      "RequestUri": "/subscriptions/ab4e818f-4285-488e-93ad-35a8628fd1fa/resourceGroups/system.local/providers/Microsoft.Backup.Admin/backupLocations/local/operationResults/6ef74913-cf73-473b-80fa-c3091f57b95b?api-version=2016-05-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvYWI0ZTgxOGYtNDI4NS00ODhlLTkzYWQtMzVhODYyOGZkMWZhL3Jlc291cmNlR3JvdXBzL3N5c3RlbS5sb2NhbC9wcm92aWRlcnMvTWljcm9zb2Z0LkJhY2t1cC5BZG1pbi9iYWNrdXBMb2NhdGlvbnMvbG9jYWwvb3BlcmF0aW9uUmVzdWx0cy82ZWY3NDkxMy1jZjczLTQ3M2ItODBmYS1jMzA5MWY1N2I5NWI/YXBpLXZlcnNpb249MjAxNi0wNS0wMQ==",
-      "RequestMethod": "GET",
-      "RequestBody": "",
-      "RequestHeaders": {
-        "User-Agent": [
-          "FxVersion/4.6.25211.01",
-          "Microsoft.AzureStack.Management.Backup.Admin.BackupAdminClient/0.1.0.0"
-        ]
-      },
-      "ResponseBody": "",
-      "ResponseHeaders": {
-        "Content-Length": [
-          "0"
-        ],
-        "Expires": [
-          "-1"
-        ],
-        "Cache-Control": [
-          "no-cache"
-        ],
-        "Date": [
-          "Thu, 12 Apr 2018 22:07:28 GMT"
-        ],
-        "Pragma": [
-          "no-cache"
-        ],
-        "Location": [
-          "https://adminmanagement.local.azurestack.external/subscriptions/ab4e818f-4285-488e-93ad-35a8628fd1fa/resourceGroups/system.local/providers/Microsoft.Backup.Admin/backupLocations/local/operationResults/6ef74913-cf73-473b-80fa-c3091f57b95b?api-version=2016-05-01"
-        ],
-        "Retry-After": [
-          "60"
-        ],
-        "Server": [
-          "Microsoft-HTTPAPI/2.0"
-        ],
-        "WWW-Authenticate": [
-          "oYG2MIGzoAMKAQChCwYJKoZIgvcSAQICooGeBIGbYIGYBgkqhkiG9xIBAgICAG+BiDCBhaADAgEFoQMCAQ+ieTB3oAMCARKicARuxtRLlD7yTC18mebNsoX1NynkSzi07BRTeDnPU0S0GWyF766wH6dJzgVrGiAx6Qv/T4tVVJJxEDq1aj2XXsTCeXxRi2I+2rFzmTt0c6O3kFehk9AfBqDQ/fEgdmBKr/Zlfq0yRnLnX3X2vthoQC8="
-        ],
-        "x-ms-correlation-request-id": [
-          "94086e1a-ace9-450b-9b4a-0377009ea84e"
-        ],
-        "x-ms-ratelimit-remaining-subscription-reads": [
-          "14753"
-        ],
-        "x-ms-request-id": [
-          "94086e1a-ace9-450b-9b4a-0377009ea84e"
-        ],
-        "x-ms-routing-request-id": [
-          "LOCAL:20180412T220728Z:94086e1a-ace9-450b-9b4a-0377009ea84e"
-        ],
-        "Strict-Transport-Security": [
-          "max-age=31536000; includeSubDomains"
-        ],
-        "X-Content-Type-Options": [
-          "nosniff"
-        ]
-      },
-      "StatusCode": 202
-    },
-    {
-      "RequestUri": "/subscriptions/ab4e818f-4285-488e-93ad-35a8628fd1fa/resourceGroups/system.local/providers/Microsoft.Backup.Admin/backupLocations/local/operationResults/6ef74913-cf73-473b-80fa-c3091f57b95b?api-version=2016-05-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvYWI0ZTgxOGYtNDI4NS00ODhlLTkzYWQtMzVhODYyOGZkMWZhL3Jlc291cmNlR3JvdXBzL3N5c3RlbS5sb2NhbC9wcm92aWRlcnMvTWljcm9zb2Z0LkJhY2t1cC5BZG1pbi9iYWNrdXBMb2NhdGlvbnMvbG9jYWwvb3BlcmF0aW9uUmVzdWx0cy82ZWY3NDkxMy1jZjczLTQ3M2ItODBmYS1jMzA5MWY1N2I5NWI/YXBpLXZlcnNpb249MjAxNi0wNS0wMQ==",
-      "RequestMethod": "GET",
-      "RequestBody": "",
-      "RequestHeaders": {
-        "User-Agent": [
-          "FxVersion/4.6.25211.01",
-          "Microsoft.AzureStack.Management.Backup.Admin.BackupAdminClient/0.1.0.0"
-        ]
-      },
-      "ResponseBody": "",
-      "ResponseHeaders": {
-        "Content-Length": [
-          "0"
-        ],
-        "Expires": [
-          "-1"
-        ],
-        "Cache-Control": [
-          "no-cache"
-        ],
-        "Date": [
-          "Thu, 12 Apr 2018 22:08:28 GMT"
-        ],
-        "Pragma": [
-          "no-cache"
-        ],
-        "Location": [
-          "https://adminmanagement.local.azurestack.external/subscriptions/ab4e818f-4285-488e-93ad-35a8628fd1fa/resourceGroups/system.local/providers/Microsoft.Backup.Admin/backupLocations/local/operationResults/6ef74913-cf73-473b-80fa-c3091f57b95b?api-version=2016-05-01"
-        ],
-        "Retry-After": [
-          "60"
-        ],
-        "Server": [
-          "Microsoft-HTTPAPI/2.0"
-        ],
-        "WWW-Authenticate": [
-          "oYG2MIGzoAMKAQChCwYJKoZIgvcSAQICooGeBIGbYIGYBgkqhkiG9xIBAgICAG+BiDCBhaADAgEFoQMCAQ+ieTB3oAMCARKicARuezi6q8KiNAYs7xo/eUkNf8a5u6sYUVgz43EIHXuD6r+cXd4272lz+PHS6HzR0N2N5rIAouAahM0Xhwxb6bvMuAaoMWiM0YqR/YTMIG9s38U6QAONcabCXF1Y/We5Glx5JCPY7XoTFgW6Q1bZBGI="
-        ],
-        "x-ms-correlation-request-id": [
-          "bf81ed8b-6a94-4113-94a7-c397cb6a5ea6"
-        ],
-        "x-ms-ratelimit-remaining-subscription-reads": [
-          "14744"
-        ],
-        "x-ms-request-id": [
-          "bf81ed8b-6a94-4113-94a7-c397cb6a5ea6"
-        ],
-        "x-ms-routing-request-id": [
-          "LOCAL:20180412T220828Z:bf81ed8b-6a94-4113-94a7-c397cb6a5ea6"
-        ],
-        "Strict-Transport-Security": [
-          "max-age=31536000; includeSubDomains"
-        ],
-        "X-Content-Type-Options": [
-          "nosniff"
-        ]
-      },
-      "StatusCode": 202
-    },
-    {
-      "RequestUri": "/subscriptions/ab4e818f-4285-488e-93ad-35a8628fd1fa/resourceGroups/system.local/providers/Microsoft.Backup.Admin/backupLocations/local/operationResults/6ef74913-cf73-473b-80fa-c3091f57b95b?api-version=2016-05-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvYWI0ZTgxOGYtNDI4NS00ODhlLTkzYWQtMzVhODYyOGZkMWZhL3Jlc291cmNlR3JvdXBzL3N5c3RlbS5sb2NhbC9wcm92aWRlcnMvTWljcm9zb2Z0LkJhY2t1cC5BZG1pbi9iYWNrdXBMb2NhdGlvbnMvbG9jYWwvb3BlcmF0aW9uUmVzdWx0cy82ZWY3NDkxMy1jZjczLTQ3M2ItODBmYS1jMzA5MWY1N2I5NWI/YXBpLXZlcnNpb249MjAxNi0wNS0wMQ==",
-      "RequestMethod": "GET",
-      "RequestBody": "",
-      "RequestHeaders": {
-        "User-Agent": [
-          "FxVersion/4.6.25211.01",
-          "Microsoft.AzureStack.Management.Backup.Admin.BackupAdminClient/0.1.0.0"
-        ]
-      },
-      "ResponseBody": "",
-      "ResponseHeaders": {
-        "Content-Length": [
-          "0"
-        ],
-        "Expires": [
-          "-1"
-        ],
-        "Cache-Control": [
-          "no-cache"
-        ],
-        "Date": [
-          "Thu, 12 Apr 2018 22:09:28 GMT"
-        ],
-        "Pragma": [
-          "no-cache"
-        ],
-        "Location": [
-          "https://adminmanagement.local.azurestack.external/subscriptions/ab4e818f-4285-488e-93ad-35a8628fd1fa/resourceGroups/system.local/providers/Microsoft.Backup.Admin/backupLocations/local/operationResults/6ef74913-cf73-473b-80fa-c3091f57b95b?api-version=2016-05-01"
-        ],
-        "Retry-After": [
-          "60"
-        ],
-        "Server": [
-          "Microsoft-HTTPAPI/2.0"
-        ],
-        "WWW-Authenticate": [
-          "oYG2MIGzoAMKAQChCwYJKoZIgvcSAQICooGeBIGbYIGYBgkqhkiG9xIBAgICAG+BiDCBhaADAgEFoQMCAQ+ieTB3oAMCARKicARueyTzb80IYWEWdBEKnTlOzf/bOAQcNMYqKkeXXN7qa+pOYtq2l12juDurAf4V/8RFedyyYyadUn5E/9eSSnAhB5W6dIUlTDlQ4AKW+S4b7TqSSeEXlcepneRJlK/qD8XqXv4GruVi49OVVWxZCkU="
-        ],
-        "x-ms-correlation-request-id": [
-          "ae4d0cd2-73f3-494a-9a41-d9989c720691"
-        ],
-        "x-ms-ratelimit-remaining-subscription-reads": [
-          "14742"
-        ],
-        "x-ms-request-id": [
-          "ae4d0cd2-73f3-494a-9a41-d9989c720691"
-        ],
-        "x-ms-routing-request-id": [
-          "LOCAL:20180412T220928Z:ae4d0cd2-73f3-494a-9a41-d9989c720691"
-        ],
-        "Strict-Transport-Security": [
-          "max-age=31536000; includeSubDomains"
-        ],
-        "X-Content-Type-Options": [
-          "nosniff"
-        ]
-      },
-      "StatusCode": 202
-    },
-    {
-      "RequestUri": "/subscriptions/ab4e818f-4285-488e-93ad-35a8628fd1fa/resourceGroups/system.local/providers/Microsoft.Backup.Admin/backupLocations/local/operationResults/6ef74913-cf73-473b-80fa-c3091f57b95b?api-version=2016-05-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvYWI0ZTgxOGYtNDI4NS00ODhlLTkzYWQtMzVhODYyOGZkMWZhL3Jlc291cmNlR3JvdXBzL3N5c3RlbS5sb2NhbC9wcm92aWRlcnMvTWljcm9zb2Z0LkJhY2t1cC5BZG1pbi9iYWNrdXBMb2NhdGlvbnMvbG9jYWwvb3BlcmF0aW9uUmVzdWx0cy82ZWY3NDkxMy1jZjczLTQ3M2ItODBmYS1jMzA5MWY1N2I5NWI/YXBpLXZlcnNpb249MjAxNi0wNS0wMQ==",
-      "RequestMethod": "GET",
-      "RequestBody": "",
-      "RequestHeaders": {
-        "User-Agent": [
-          "FxVersion/4.6.25211.01",
-          "Microsoft.AzureStack.Management.Backup.Admin.BackupAdminClient/0.1.0.0"
-        ]
-      },
-      "ResponseBody": "",
-      "ResponseHeaders": {
-        "Content-Length": [
-          "0"
-        ],
-        "Expires": [
-          "-1"
-        ],
-        "Cache-Control": [
-          "no-cache"
-        ],
-        "Date": [
-          "Thu, 12 Apr 2018 22:10:28 GMT"
-        ],
-        "Pragma": [
-          "no-cache"
-        ],
-        "Location": [
-          "https://adminmanagement.local.azurestack.external/subscriptions/ab4e818f-4285-488e-93ad-35a8628fd1fa/resourceGroups/system.local/providers/Microsoft.Backup.Admin/backupLocations/local/operationResults/6ef74913-cf73-473b-80fa-c3091f57b95b?api-version=2016-05-01"
-        ],
-        "Retry-After": [
-          "60"
-        ],
-        "Server": [
-          "Microsoft-HTTPAPI/2.0"
-        ],
-        "WWW-Authenticate": [
-          "oYG2MIGzoAMKAQChCwYJKoZIgvcSAQICooGeBIGbYIGYBgkqhkiG9xIBAgICAG+BiDCBhaADAgEFoQMCAQ+ieTB3oAMCARKicARu7xR/lHX9LyjowyRxqueP6fUXvbTbcwVBggpR2QVjyKbJbFsvcOlTHbi3fRXoYlKAi2C3Xkpf3DsZyydE8trJY5rYNQuO9yNHzulngc2cgRgRgdJCEG4rPRniqvaaFC/CgF9nsAUe22w64KEpQso="
-        ],
-        "x-ms-correlation-request-id": [
-          "0347636e-4e9d-41ea-98d2-32d413341baa"
-        ],
-        "x-ms-ratelimit-remaining-subscription-reads": [
-          "14752"
-        ],
-        "x-ms-request-id": [
-          "0347636e-4e9d-41ea-98d2-32d413341baa"
-        ],
-        "x-ms-routing-request-id": [
-          "LOCAL:20180412T221028Z:0347636e-4e9d-41ea-98d2-32d413341baa"
-        ],
-        "Strict-Transport-Security": [
-          "max-age=31536000; includeSubDomains"
-        ],
-        "X-Content-Type-Options": [
-          "nosniff"
-        ]
-      },
-      "StatusCode": 202
-    },
-    {
-      "RequestUri": "/subscriptions/ab4e818f-4285-488e-93ad-35a8628fd1fa/resourceGroups/system.local/providers/Microsoft.Backup.Admin/backupLocations/local/operationResults/6ef74913-cf73-473b-80fa-c3091f57b95b?api-version=2016-05-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvYWI0ZTgxOGYtNDI4NS00ODhlLTkzYWQtMzVhODYyOGZkMWZhL3Jlc291cmNlR3JvdXBzL3N5c3RlbS5sb2NhbC9wcm92aWRlcnMvTWljcm9zb2Z0LkJhY2t1cC5BZG1pbi9iYWNrdXBMb2NhdGlvbnMvbG9jYWwvb3BlcmF0aW9uUmVzdWx0cy82ZWY3NDkxMy1jZjczLTQ3M2ItODBmYS1jMzA5MWY1N2I5NWI/YXBpLXZlcnNpb249MjAxNi0wNS0wMQ==",
-      "RequestMethod": "GET",
-      "RequestBody": "",
-      "RequestHeaders": {
-        "User-Agent": [
-          "FxVersion/4.6.25211.01",
-          "Microsoft.AzureStack.Management.Backup.Admin.BackupAdminClient/0.1.0.0"
-        ]
-      },
-      "ResponseBody": "{\r\n  \"id\": \"/subscriptions/ab4e818f-4285-488e-93ad-35a8628fd1fa/resourceGroups/system.local/providers/Microsoft.Backup.Admin/backupLocations/local/backups/6ef74913-cf73-473b-80fa-c3091f57b95b\",\r\n  \"name\": \"6ef74913-cf73-473b-80fa-c3091f57b95b\",\r\n  \"type\": \"Microsoft.Backup.Admin/backupLocations/backups\",\r\n  \"location\": \"local\",\r\n  \"tags\": {},\r\n  \"properties\": {\r\n    \"backupInfo\": {\r\n      \"backupId\": \"6ef74913-cf73-473b-80fa-c3091f57b95b\",\r\n      \"roleStatus\": [\r\n        {\r\n          \"roleName\": \"NRP\",\r\n          \"status\": 6\r\n        },\r\n        {\r\n          \"roleName\": \"SRP\",\r\n          \"status\": 6\r\n        },\r\n        {\r\n          \"roleName\": \"CRP\",\r\n          \"status\": 6\r\n        },\r\n        {\r\n          \"roleName\": \"KeyVaultInternalControlPlane\",\r\n          \"status\": 6\r\n        },\r\n        {\r\n          \"roleName\": \"KeyVaultInternalDataPlane\",\r\n          \"status\": 6\r\n        },\r\n        {\r\n          \"roleName\": \"KeyVaultControlPlane\",\r\n          \"status\": 6\r\n        },\r\n        {\r\n          \"roleName\": \"KeyVaultDataPlane\",\r\n          \"status\": 6\r\n        },\r\n        {\r\n          \"roleName\": \"KeyVaultNamingService\",\r\n          \"status\": 6\r\n        },\r\n        {\r\n          \"roleName\": \"WAS\",\r\n          \"status\": 6\r\n        },\r\n        {\r\n          \"roleName\": \"ECE\",\r\n          \"status\": 6\r\n        },\r\n        {\r\n          \"roleName\": \"CA\",\r\n          \"status\": 6\r\n        },\r\n        {\r\n          \"roleName\": \"ACS\",\r\n          \"status\": 6\r\n        }\r\n      ],\r\n      \"status\": 6,\r\n      \"createdDateTime\": \"2018-04-12T22:11:15.007887Z\",\r\n      \"timeTakenToCreate\": \"PT7M48.2126743S\"\r\n    }\r\n  }\r\n}",
-      "ResponseHeaders": {
-        "Content-Length": [
-          "966"
-        ],
-        "Content-Type": [
-          "application/json"
-        ],
-        "Expires": [
-          "-1"
-        ],
-        "Cache-Control": [
-          "no-cache"
-        ],
-        "Date": [
-          "Thu, 12 Apr 2018 22:11:29 GMT"
-        ],
-        "Pragma": [
-          "no-cache"
-        ],
-        "Server": [
-          "Microsoft-HTTPAPI/2.0"
-        ],
-        "WWW-Authenticate": [
-          "oYG2MIGzoAMKAQChCwYJKoZIgvcSAQICooGeBIGbYIGYBgkqhkiG9xIBAgICAG+BiDCBhaADAgEFoQMCAQ+ieTB3oAMCARKicARuGz4TlpgVvWHPl1FSQdFbOnGrKuGYH5c5rdxb7kRX4WxDBtK7TLf6mH+utV9xUkmpfBXI1I6WEkENZYC3LDrT9tcmuUSyXZlVsruzyrpWaCGWXIAOVdQcZlaEsICo5VfAqxAri+tYLdYRP4gssLw="
-        ],
-        "x-ms-correlation-request-id": [
-          "0a00156b-ded1-4603-90c4-0627872b30e2"
-        ],
-        "x-ms-ratelimit-remaining-subscription-reads": [
-          "14749"
-        ],
-        "x-ms-request-id": [
-          "0a00156b-ded1-4603-90c4-0627872b30e2"
-        ],
-        "x-ms-routing-request-id": [
-          "LOCAL:20180412T221129Z:0a00156b-ded1-4603-90c4-0627872b30e2"
-        ],
-        "Strict-Transport-Security": [
-          "max-age=31536000; includeSubDomains"
-        ],
-        "X-Content-Type-Options": [
-          "nosniff"
-        ]
-      },
-      "StatusCode": 200
-    },
-    {
-      "RequestUri": "/subscriptions/ab4e818f-4285-488e-93ad-35a8628fd1fa/resourceGroups/system.local/providers/Microsoft.Backup.Admin/backupLocations/local/operationResults/6ef74913-cf73-473b-80fa-c3091f57b95b?api-version=2016-05-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvYWI0ZTgxOGYtNDI4NS00ODhlLTkzYWQtMzVhODYyOGZkMWZhL3Jlc291cmNlR3JvdXBzL3N5c3RlbS5sb2NhbC9wcm92aWRlcnMvTWljcm9zb2Z0LkJhY2t1cC5BZG1pbi9iYWNrdXBMb2NhdGlvbnMvbG9jYWwvb3BlcmF0aW9uUmVzdWx0cy82ZWY3NDkxMy1jZjczLTQ3M2ItODBmYS1jMzA5MWY1N2I5NWI/YXBpLXZlcnNpb249MjAxNi0wNS0wMQ==",
-      "RequestMethod": "GET",
-      "RequestBody": "",
-      "RequestHeaders": {
-        "User-Agent": [
-          "FxVersion/4.6.25211.01",
-          "Microsoft.AzureStack.Management.Backup.Admin.BackupAdminClient/0.1.0.0"
-        ]
-      },
-      "ResponseBody": "{\r\n  \"id\": \"/subscriptions/ab4e818f-4285-488e-93ad-35a8628fd1fa/resourceGroups/system.local/providers/Microsoft.Backup.Admin/backupLocations/local/backups/6ef74913-cf73-473b-80fa-c3091f57b95b\",\r\n  \"name\": \"6ef74913-cf73-473b-80fa-c3091f57b95b\",\r\n  \"type\": \"Microsoft.Backup.Admin/backupLocations/backups\",\r\n  \"location\": \"local\",\r\n  \"tags\": {},\r\n  \"properties\": {\r\n    \"backupInfo\": {\r\n      \"backupId\": \"6ef74913-cf73-473b-80fa-c3091f57b95b\",\r\n      \"roleStatus\": [\r\n        {\r\n          \"roleName\": \"NRP\",\r\n          \"status\": 6\r\n        },\r\n        {\r\n          \"roleName\": \"SRP\",\r\n          \"status\": 6\r\n        },\r\n        {\r\n          \"roleName\": \"CRP\",\r\n          \"status\": 6\r\n        },\r\n        {\r\n          \"roleName\": \"KeyVaultInternalControlPlane\",\r\n          \"status\": 6\r\n        },\r\n        {\r\n          \"roleName\": \"KeyVaultInternalDataPlane\",\r\n          \"status\": 6\r\n        },\r\n        {\r\n          \"roleName\": \"KeyVaultControlPlane\",\r\n          \"status\": 6\r\n        },\r\n        {\r\n          \"roleName\": \"KeyVaultDataPlane\",\r\n          \"status\": 6\r\n        },\r\n        {\r\n          \"roleName\": \"KeyVaultNamingService\",\r\n          \"status\": 6\r\n        },\r\n        {\r\n          \"roleName\": \"WAS\",\r\n          \"status\": 6\r\n        },\r\n        {\r\n          \"roleName\": \"ECE\",\r\n          \"status\": 6\r\n        },\r\n        {\r\n          \"roleName\": \"CA\",\r\n          \"status\": 6\r\n        },\r\n        {\r\n          \"roleName\": \"ACS\",\r\n          \"status\": 6\r\n        }\r\n      ],\r\n      \"status\": 6,\r\n      \"createdDateTime\": \"2018-04-12T22:11:15.007887Z\",\r\n      \"timeTakenToCreate\": \"PT7M48.2126743S\"\r\n    }\r\n  }\r\n}",
-      "ResponseHeaders": {
-        "Content-Length": [
-          "966"
-        ],
-        "Content-Type": [
-          "application/json"
-        ],
-        "Expires": [
-          "-1"
-        ],
-        "Cache-Control": [
-          "no-cache"
-        ],
-        "Date": [
-          "Thu, 12 Apr 2018 22:11:29 GMT"
-        ],
-        "Pragma": [
-          "no-cache"
-        ],
-        "Server": [
-          "Microsoft-HTTPAPI/2.0"
-        ],
-        "WWW-Authenticate": [
-          "oYG2MIGzoAMKAQChCwYJKoZIgvcSAQICooGeBIGbYIGYBgkqhkiG9xIBAgICAG+BiDCBhaADAgEFoQMCAQ+ieTB3oAMCARKicARuGVfPF32kp2ObMoh2qkJdqq3q/HHjssViX3r8RchTLXE9xXkkdM/6w5D1UnnDHIu59w8YPHkzWLiXKAF00oeG4i2i02Hm7hwLPRaTlwN/MsbBrTMJ1xmtd97/IUkrZsfGFsNIOSRDocRZ49zuax8="
-        ],
-        "x-ms-correlation-request-id": [
-          "e1695317-adfc-4fdf-9e11-07ddeee13b29"
-        ],
-        "x-ms-ratelimit-remaining-subscription-reads": [
-          "14748"
-        ],
-        "x-ms-request-id": [
-          "e1695317-adfc-4fdf-9e11-07ddeee13b29"
-        ],
-        "x-ms-routing-request-id": [
-          "LOCAL:20180412T221129Z:e1695317-adfc-4fdf-9e11-07ddeee13b29"
-        ],
-        "Strict-Transport-Security": [
-          "max-age=31536000; includeSubDomains"
-        ],
-        "X-Content-Type-Options": [
-          "nosniff"
-        ]
-      },
-      "StatusCode": 200
-    }
-  ],
-  "Names": {},
-  "Variables": {
-    "SubscriptionId": "ab4e818f-4285-488e-93ad-35a8628fd1fa"
-  }
-}
\ No newline at end of file
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/SessionRecords/BackupAdminClient/TestGetAllBackupLocation.json b/src/AzureStack/BackupAdmin/Backup.Admin.Tests/SessionRecords/BackupAdminClient/TestGetAllBackupLocation.json
deleted file mode 100644
index 7656e21db434c..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/SessionRecords/BackupAdminClient/TestGetAllBackupLocation.json
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-  "Entries": [
-    {
-      "RequestUri": "/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourcegroups/System.local/providers/Microsoft.Backup.Admin/backupLocations?api-version=2016-05-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvODE1ODQ5OGQtMjdiMS00Y2NmLTlhYTEtZGUwZjkyNTczMWU2L3Jlc291cmNlZ3JvdXBzL1N5c3RlbS5sb2NhbC9wcm92aWRlcnMvTWljcm9zb2Z0LkJhY2t1cC5BZG1pbi9iYWNrdXBMb2NhdGlvbnM/YXBpLXZlcnNpb249MjAxNi0wNS0wMQ==",
-      "RequestMethod": "GET",
-      "RequestBody": "",
-      "RequestHeaders": {
-        "x-ms-client-request-id": [
-          "734ca455-3b80-41be-844b-93f7babb5245"
-        ],
-        "accept-language": [
-          "en-US"
-        ],
-        "User-Agent": [
-          "FxVersion/4.6.25211.01",
-          "Microsoft.AzureStack.Management.Backup.Admin.BackupAdminClient/0.1.0.0"
-        ]
-      },
-      "ResponseBody": "{\r\n  \"value\": [\r\n    {\r\n      \"id\": \"/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourceGroups/System.local/providers/Microsoft.Backup.Admin/backupLocations/local\",\r\n      \"name\": \"local\",\r\n      \"type\": \"Microsoft.Backup.Admin/backupLocations\",\r\n      \"location\": \"local\",\r\n      \"tags\": {},\r\n      \"properties\": {\r\n        \"externalStoreDefault\": {\r\n          \"path\": \"\\\\\\\\100.68.88.192\\\\C$\\\\backup_test\",\r\n          \"userName\": \"AzureStack\\\\Administrator\",\r\n          \"password\": null,\r\n          \"encryptionKeyBase64\": null,\r\n          \"backupFrequencyInHours\": \"\",\r\n          \"availableCapacity\": \"10GB\",\r\n          \"isBackupSchedulerEnabled\": false,\r\n          \"nextBackupTime\": null,\r\n          \"lastBackupTime\": null\r\n        }\r\n      }\r\n    }\r\n  ],\r\n  \"nextLink\": null\r\n}",
-      "ResponseHeaders": {
-        "Content-Length": [
-          "563"
-        ],
-        "Content-Type": [
-          "application/json; charset=utf-8"
-        ],
-        "Expires": [
-          "-1"
-        ],
-        "Cache-Control": [
-          "no-cache"
-        ],
-        "Date": [
-          "Fri, 16 Feb 2018 23:02:04 GMT"
-        ],
-        "Pragma": [
-          "no-cache"
-        ],
-        "Server": [
-          "Microsoft-HTTPAPI/2.0"
-        ],
-        "WWW-Authenticate": [
-          "oYG3MIG0oAMKAQChCwYJKoZIgvcSAQICooGfBIGcYIGZBgkqhkiG9xIBAgICAG+BiTCBhqADAgEFoQMCAQ+iejB4oAMCARKicQRvYI+maTPbI2PwfV7Dv4lgp3Cls6GTA3bhaIL6hOlQS0vZqBF2/hSWbTugisxM0J+fypqu9N9GR5hp3fDEIRiqSLX6WNxrDAJ/TAJUzha4WSBMLKZ/kTHi0Hnlw2jdIu+YiZFeiiJTyupFbS2oTQKN"
-        ],
-        "x-ms-correlation-request-id": [
-          "136e70db-9ff9-4da8-9fdf-f3c88dbae6d2"
-        ],
-        "x-ms-ratelimit-remaining-subscription-reads": [
-          "14587"
-        ],
-        "x-ms-request-id": [
-          "136e70db-9ff9-4da8-9fdf-f3c88dbae6d2"
-        ],
-        "x-ms-routing-request-id": [
-          "LOCAL:20180216T230204Z:136e70db-9ff9-4da8-9fdf-f3c88dbae6d2"
-        ],
-        "Strict-Transport-Security": [
-          "max-age=31536000; includeSubDomains"
-        ],
-        "X-Content-Type-Options": [
-          "nosniff"
-        ]
-      },
-      "StatusCode": 200
-    },
-    {
-      "RequestUri": "/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourcegroups/System.local/providers/Microsoft.Backup.Admin/backupLocations/local?api-version=2016-05-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvODE1ODQ5OGQtMjdiMS00Y2NmLTlhYTEtZGUwZjkyNTczMWU2L3Jlc291cmNlZ3JvdXBzL1N5c3RlbS5sb2NhbC9wcm92aWRlcnMvTWljcm9zb2Z0LkJhY2t1cC5BZG1pbi9iYWNrdXBMb2NhdGlvbnMvbG9jYWw/YXBpLXZlcnNpb249MjAxNi0wNS0wMQ==",
-      "RequestMethod": "GET",
-      "RequestBody": "",
-      "RequestHeaders": {
-        "x-ms-client-request-id": [
-          "13760f84-7dd2-48b6-bf70-4a5084e9af9e"
-        ],
-        "accept-language": [
-          "en-US"
-        ],
-        "User-Agent": [
-          "FxVersion/4.6.25211.01",
-          "Microsoft.AzureStack.Management.Backup.Admin.BackupAdminClient/0.1.0.0"
-        ]
-      },
-      "ResponseBody": "{\r\n  \"id\": \"/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourcegroups/System.local/providers/Microsoft.Backup.Admin/backupLocations/local\",\r\n  \"name\": \"local\",\r\n  \"type\": \"Microsoft.Backup.Admin/backupLocations\",\r\n  \"location\": \"local\",\r\n  \"tags\": {},\r\n  \"properties\": {\r\n    \"externalStoreDefault\": {\r\n      \"path\": \"\\\\\\\\100.68.88.192\\\\C$\\\\backup_test\",\r\n      \"userName\": \"AzureStack\\\\Administrator\",\r\n      \"password\": null,\r\n      \"encryptionKeyBase64\": null,\r\n      \"backupFrequencyInHours\": \"\",\r\n      \"availableCapacity\": \"10GB\",\r\n      \"isBackupSchedulerEnabled\": false,\r\n      \"nextBackupTime\": null,\r\n      \"lastBackupTime\": null\r\n    }\r\n  }\r\n}",
-      "ResponseHeaders": {
-        "Content-Length": [
-          "535"
-        ],
-        "Content-Type": [
-          "application/json; charset=utf-8"
-        ],
-        "Expires": [
-          "-1"
-        ],
-        "Cache-Control": [
-          "no-cache"
-        ],
-        "Date": [
-          "Fri, 16 Feb 2018 23:02:04 GMT"
-        ],
-        "Pragma": [
-          "no-cache"
-        ],
-        "Server": [
-          "Microsoft-HTTPAPI/2.0"
-        ],
-        "WWW-Authenticate": [
-          "oYG3MIG0oAMKAQChCwYJKoZIgvcSAQICooGfBIGcYIGZBgkqhkiG9xIBAgICAG+BiTCBhqADAgEFoQMCAQ+iejB4oAMCARKicQRvGa4u1JNxrMr3xm7cqehhVPe4lb76lonQpkYQzQmkf473qnprUWt4w1jDOKs+1EUcVFo0Ku0uMprQGbJ63GVRzxEw6MVEBsl4AF324Votq8YcezVQHiKLhplm75ux32G/ypnyNapGEXYZCW9hXcH4"
-        ],
-        "x-ms-correlation-request-id": [
-          "76a43405-275e-40e9-a516-f0caebbf0cd1"
-        ],
-        "x-ms-ratelimit-remaining-subscription-reads": [
-          "14586"
-        ],
-        "x-ms-request-id": [
-          "76a43405-275e-40e9-a516-f0caebbf0cd1"
-        ],
-        "x-ms-routing-request-id": [
-          "LOCAL:20180216T230204Z:76a43405-275e-40e9-a516-f0caebbf0cd1"
-        ],
-        "Strict-Transport-Security": [
-          "max-age=31536000; includeSubDomains"
-        ],
-        "X-Content-Type-Options": [
-          "nosniff"
-        ]
-      },
-      "StatusCode": 200
-    }
-  ],
-  "Names": {},
-  "Variables": {
-    "SubscriptionId": "8158498d-27b1-4ccf-9aa1-de0f925731e6"
-  }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/SessionRecords/BackupAdminClient/TestGetBackup.json b/src/AzureStack/BackupAdmin/Backup.Admin.Tests/SessionRecords/BackupAdminClient/TestGetBackup.json
deleted file mode 100644
index 0bc7b81633c0d..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/SessionRecords/BackupAdminClient/TestGetBackup.json
+++ /dev/null
@@ -1,200 +0,0 @@
-{
-  "Entries": [
-    {
-      "RequestUri": "/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourcegroups/System.local/providers/Microsoft.Backup.Admin/backupLocations?api-version=2016-05-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvODE1ODQ5OGQtMjdiMS00Y2NmLTlhYTEtZGUwZjkyNTczMWU2L3Jlc291cmNlZ3JvdXBzL1N5c3RlbS5sb2NhbC9wcm92aWRlcnMvTWljcm9zb2Z0LkJhY2t1cC5BZG1pbi9iYWNrdXBMb2NhdGlvbnM/YXBpLXZlcnNpb249MjAxNi0wNS0wMQ==",
-      "RequestMethod": "GET",
-      "RequestBody": "",
-      "RequestHeaders": {
-        "x-ms-client-request-id": [
-          "c324c5b1-c0d8-4632-97dc-d3b7bb5590b4"
-        ],
-        "accept-language": [
-          "en-US"
-        ],
-        "User-Agent": [
-          "FxVersion/4.6.25211.01",
-          "Microsoft.AzureStack.Management.Backup.Admin.BackupAdminClient/0.1.0.0"
-        ]
-      },
-      "ResponseBody": "{\r\n  \"value\": [\r\n    {\r\n      \"id\": \"/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourceGroups/System.local/providers/Microsoft.Backup.Admin/backupLocations/local\",\r\n      \"name\": \"local\",\r\n      \"type\": \"Microsoft.Backup.Admin/backupLocations\",\r\n      \"location\": \"local\",\r\n      \"tags\": {},\r\n      \"properties\": {\r\n        \"externalStoreDefault\": {\r\n          \"path\": \"\\\\\\\\100.68.88.192\\\\C$\\\\backup_test\",\r\n          \"userName\": \"AzureStack\\\\Administrator\",\r\n          \"password\": null,\r\n          \"encryptionKeyBase64\": null,\r\n          \"backupFrequencyInHours\": \"\",\r\n          \"availableCapacity\": \"10GB\",\r\n          \"isBackupSchedulerEnabled\": false,\r\n          \"nextBackupTime\": null,\r\n          \"lastBackupTime\": null\r\n        }\r\n      }\r\n    }\r\n  ],\r\n  \"nextLink\": null\r\n}",
-      "ResponseHeaders": {
-        "Content-Length": [
-          "563"
-        ],
-        "Content-Type": [
-          "application/json; charset=utf-8"
-        ],
-        "Expires": [
-          "-1"
-        ],
-        "Cache-Control": [
-          "no-cache"
-        ],
-        "Date": [
-          "Fri, 16 Feb 2018 22:57:00 GMT"
-        ],
-        "Pragma": [
-          "no-cache"
-        ],
-        "Server": [
-          "Microsoft-HTTPAPI/2.0"
-        ],
-        "WWW-Authenticate": [
-          "oYG3MIG0oAMKAQChCwYJKoZIgvcSAQICooGfBIGcYIGZBgkqhkiG9xIBAgICAG+BiTCBhqADAgEFoQMCAQ+iejB4oAMCARKicQRv5Xb23QRZM92dQHJQbZdhgb3bduLCc6tAvRKQav/CRvU3GjG42apvCEyW0OxU9g6ysiq4cRk0uQGGqK3ubendbpb10CrlURM3lkhrAuHqo7v+P5aZror6+LdiU6J5XsriKdArgZa8wbSW4Ch+CwHv"
-        ],
-        "x-ms-correlation-request-id": [
-          "ecb4a91e-6963-498d-af01-6e2386a5d60c"
-        ],
-        "x-ms-ratelimit-remaining-subscription-reads": [
-          "14604"
-        ],
-        "x-ms-request-id": [
-          "ecb4a91e-6963-498d-af01-6e2386a5d60c"
-        ],
-        "x-ms-routing-request-id": [
-          "LOCAL:20180216T225700Z:ecb4a91e-6963-498d-af01-6e2386a5d60c"
-        ],
-        "Strict-Transport-Security": [
-          "max-age=31536000; includeSubDomains"
-        ],
-        "X-Content-Type-Options": [
-          "nosniff"
-        ]
-      },
-      "StatusCode": 200
-    },
-    {
-      "RequestUri": "/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourcegroups/System.local/providers/Microsoft.Backup.Admin/backupLocations/local/backups?api-version=2016-05-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvODE1ODQ5OGQtMjdiMS00Y2NmLTlhYTEtZGUwZjkyNTczMWU2L3Jlc291cmNlZ3JvdXBzL1N5c3RlbS5sb2NhbC9wcm92aWRlcnMvTWljcm9zb2Z0LkJhY2t1cC5BZG1pbi9iYWNrdXBMb2NhdGlvbnMvbG9jYWwvYmFja3Vwcz9hcGktdmVyc2lvbj0yMDE2LTA1LTAx",
-      "RequestMethod": "GET",
-      "RequestBody": "",
-      "RequestHeaders": {
-        "x-ms-client-request-id": [
-          "e22b3951-de2e-400d-9cdd-3b7ede9ff157"
-        ],
-        "accept-language": [
-          "en-US"
-        ],
-        "User-Agent": [
-          "FxVersion/4.6.25211.01",
-          "Microsoft.AzureStack.Management.Backup.Admin.BackupAdminClient/0.1.0.0"
-        ]
-      },
-      "ResponseBody": "{\r\n  \"value\": [\r\n    {\r\n      \"id\": \"/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourceGroups/System.local/providers/Microsoft.Backup.Admin/backupLocations/local/backups/de038ae0-294d-468d-90a1-fbe5ae028ce2\",\r\n      \"name\": \"de038ae0-294d-468d-90a1-fbe5ae028ce2\",\r\n      \"type\": \"Microsoft.Backup.Admin/backupLocations/backups\",\r\n      \"location\": \"local\",\r\n      \"tags\": {},\r\n      \"properties\": {\r\n        \"backupInfo\": {\r\n          \"backupDataVersion\": null,\r\n          \"backupId\": \"de038ae0-294d-468d-90a1-fbe5ae028ce2\",\r\n          \"roleStatus\": [\r\n            {\r\n              \"roleName\": \"NRP\",\r\n              \"status\": \"Succeeded\"\r\n            },\r\n            {\r\n              \"roleName\": \"SRP\",\r\n              \"status\": \"Succeeded\"\r\n            },\r\n            {\r\n              \"roleName\": \"CRP\",\r\n              \"status\": \"Succeeded\"\r\n            },\r\n            {\r\n              \"roleName\": \"KeyVaultInternalControlPlane\",\r\n              \"status\": \"Succeeded\"\r\n            },\r\n            {\r\n              \"roleName\": \"KeyVaultInternalDataPlane\",\r\n              \"status\": \"Succeeded\"\r\n            },\r\n            {\r\n              \"roleName\": \"KeyVaultControlPlane\",\r\n              \"status\": \"Succeeded\"\r\n            },\r\n            {\r\n              \"roleName\": \"KeyVaultDataPlane\",\r\n              \"status\": \"Succeeded\"\r\n            },\r\n            {\r\n              \"roleName\": \"KeyVaultNamingService\",\r\n              \"status\": \"Succeeded\"\r\n            },\r\n            {\r\n              \"roleName\": \"WAS\",\r\n              \"status\": \"Succeeded\"\r\n            },\r\n            {\r\n              \"roleName\": \"ECE\",\r\n              \"status\": \"Succeeded\"\r\n            },\r\n            {\r\n              \"roleName\": \"CA\",\r\n              \"status\": \"Succeeded\"\r\n            },\r\n            {\r\n              \"roleName\": \"ACS\",\r\n              \"status\": \"Succeeded\"\r\n            }\r\n          ],\r\n          \"status\": \"Succeeded\",\r\n          \"createdDateTime\": \"2018-02-16T16:06:10.1160531Z\",\r\n          \"timeTakenToCreate\": \"PT5M1.5611298S\",\r\n          \"stampVersion\": null,\r\n          \"oemVersion\": null,\r\n          \"deploymentID\": null\r\n        }\r\n      }\r\n    }\r\n  ],\r\n  \"nextLink\": null\r\n}",
-      "ResponseHeaders": {
-        "Content-Length": [
-          "1207"
-        ],
-        "Content-Type": [
-          "application/json; charset=utf-8"
-        ],
-        "Expires": [
-          "-1"
-        ],
-        "Cache-Control": [
-          "no-cache"
-        ],
-        "Date": [
-          "Fri, 16 Feb 2018 22:57:00 GMT"
-        ],
-        "Pragma": [
-          "no-cache"
-        ],
-        "Server": [
-          "Microsoft-HTTPAPI/2.0"
-        ],
-        "WWW-Authenticate": [
-          "oYG3MIG0oAMKAQChCwYJKoZIgvcSAQICooGfBIGcYIGZBgkqhkiG9xIBAgICAG+BiTCBhqADAgEFoQMCAQ+iejB4oAMCARKicQRvmJq3F7jJK5rZbZsa1kXIL48YsUrieJDiQWsv28SSQ4T2Ay96Um9SXi6v1N+5psqCMCP3tYHwimLwvJPampHD7GRn2THQ6EdCPZ6W6GJCRaCScDY2zdiaS6dLzjixLIuN9YunUQ+QoUaZlj5aLdlN"
-        ],
-        "x-ms-correlation-request-id": [
-          "b2328639-ce89-4b3f-a25a-f9d3c4eefb89"
-        ],
-        "x-ms-ratelimit-remaining-subscription-reads": [
-          "14603"
-        ],
-        "x-ms-request-id": [
-          "b2328639-ce89-4b3f-a25a-f9d3c4eefb89"
-        ],
-        "x-ms-routing-request-id": [
-          "LOCAL:20180216T225701Z:b2328639-ce89-4b3f-a25a-f9d3c4eefb89"
-        ],
-        "Strict-Transport-Security": [
-          "max-age=31536000; includeSubDomains"
-        ],
-        "X-Content-Type-Options": [
-          "nosniff"
-        ]
-      },
-      "StatusCode": 200
-    },
-    {
-      "RequestUri": "/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourcegroups/System.local/providers/Microsoft.Backup.Admin/backupLocations/local/backups/de038ae0-294d-468d-90a1-fbe5ae028ce2?api-version=2016-05-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvODE1ODQ5OGQtMjdiMS00Y2NmLTlhYTEtZGUwZjkyNTczMWU2L3Jlc291cmNlZ3JvdXBzL1N5c3RlbS5sb2NhbC9wcm92aWRlcnMvTWljcm9zb2Z0LkJhY2t1cC5BZG1pbi9iYWNrdXBMb2NhdGlvbnMvbG9jYWwvYmFja3Vwcy9kZTAzOGFlMC0yOTRkLTQ2OGQtOTBhMS1mYmU1YWUwMjhjZTI/YXBpLXZlcnNpb249MjAxNi0wNS0wMQ==",
-      "RequestMethod": "GET",
-      "RequestBody": "",
-      "RequestHeaders": {
-        "x-ms-client-request-id": [
-          "84b5694d-4ced-469d-8326-c8b5bdfa34fe"
-        ],
-        "accept-language": [
-          "en-US"
-        ],
-        "User-Agent": [
-          "FxVersion/4.6.25211.01",
-          "Microsoft.AzureStack.Management.Backup.Admin.BackupAdminClient/0.1.0.0"
-        ]
-      },
-      "ResponseBody": "{\r\n  \"id\": \"/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourcegroups/System.local/providers/Microsoft.Backup.Admin/backupLocations/local/backups/de038ae0-294d-468d-90a1-fbe5ae028ce2\",\r\n  \"name\": \"de038ae0-294d-468d-90a1-fbe5ae028ce2\",\r\n  \"type\": \"Microsoft.Backup.Admin/backupLocations/backups\",\r\n  \"location\": \"local\",\r\n  \"tags\": {},\r\n  \"properties\": {\r\n    \"backupInfo\": {\r\n      \"backupDataVersion\": null,\r\n      \"backupId\": \"de038ae0-294d-468d-90a1-fbe5ae028ce2\",\r\n      \"roleStatus\": [\r\n        {\r\n          \"roleName\": \"NRP\",\r\n          \"status\": \"Succeeded\"\r\n        },\r\n        {\r\n          \"roleName\": \"SRP\",\r\n          \"status\": \"Succeeded\"\r\n        },\r\n        {\r\n          \"roleName\": \"CRP\",\r\n          \"status\": \"Succeeded\"\r\n        },\r\n        {\r\n          \"roleName\": \"KeyVaultInternalControlPlane\",\r\n          \"status\": \"Succeeded\"\r\n        },\r\n        {\r\n          \"roleName\": \"KeyVaultInternalDataPlane\",\r\n          \"status\": \"Succeeded\"\r\n        },\r\n        {\r\n          \"roleName\": \"KeyVaultControlPlane\",\r\n          \"status\": \"Succeeded\"\r\n        },\r\n        {\r\n          \"roleName\": \"KeyVaultDataPlane\",\r\n          \"status\": \"Succeeded\"\r\n        },\r\n        {\r\n          \"roleName\": \"KeyVaultNamingService\",\r\n          \"status\": \"Succeeded\"\r\n        },\r\n        {\r\n          \"roleName\": \"WAS\",\r\n          \"status\": \"Succeeded\"\r\n        },\r\n        {\r\n          \"roleName\": \"ECE\",\r\n          \"status\": \"Succeeded\"\r\n        },\r\n        {\r\n          \"roleName\": \"CA\",\r\n          \"status\": \"Succeeded\"\r\n        },\r\n        {\r\n          \"roleName\": \"ACS\",\r\n          \"status\": \"Succeeded\"\r\n        }\r\n      ],\r\n      \"status\": \"Succeeded\",\r\n      \"createdDateTime\": \"2018-02-16T16:06:10.1160531Z\",\r\n      \"timeTakenToCreate\": \"PT5M1.5611298S\",\r\n      \"stampVersion\": null,\r\n      \"oemVersion\": null,\r\n      \"deploymentID\": null\r\n    }\r\n  }\r\n}",
-      "ResponseHeaders": {
-        "Content-Length": [
-          "1179"
-        ],
-        "Content-Type": [
-          "application/json; charset=utf-8"
-        ],
-        "Expires": [
-          "-1"
-        ],
-        "Cache-Control": [
-          "no-cache"
-        ],
-        "Date": [
-          "Fri, 16 Feb 2018 22:57:00 GMT"
-        ],
-        "Pragma": [
-          "no-cache"
-        ],
-        "Server": [
-          "Microsoft-HTTPAPI/2.0"
-        ],
-        "WWW-Authenticate": [
-          "oYG3MIG0oAMKAQChCwYJKoZIgvcSAQICooGfBIGcYIGZBgkqhkiG9xIBAgICAG+BiTCBhqADAgEFoQMCAQ+iejB4oAMCARKicQRv4BNf6dWh5WYTgH8PB1JYiCOPGhhh5zZkz6rNUVqdvlv8ZQiUJ9LQxS32LlmrCOWegN/fWoEYIN57icYDH94N+EY5/wUzDO3bOK37ukgLJ9Uf/ldbKlXS8A5607y3q7sLOdEp1l5xeU+QNRzByxBB"
-        ],
-        "x-ms-correlation-request-id": [
-          "c2aee002-cf4c-4e63-9b2d-436bdbed5c47"
-        ],
-        "x-ms-ratelimit-remaining-subscription-reads": [
-          "14602"
-        ],
-        "x-ms-request-id": [
-          "c2aee002-cf4c-4e63-9b2d-436bdbed5c47"
-        ],
-        "x-ms-routing-request-id": [
-          "LOCAL:20180216T225701Z:c2aee002-cf4c-4e63-9b2d-436bdbed5c47"
-        ],
-        "Strict-Transport-Security": [
-          "max-age=31536000; includeSubDomains"
-        ],
-        "X-Content-Type-Options": [
-          "nosniff"
-        ]
-      },
-      "StatusCode": 200
-    }
-  ],
-  "Names": {},
-  "Variables": {
-    "SubscriptionId": "8158498d-27b1-4ccf-9aa1-de0f925731e6"
-  }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/SessionRecords/BackupAdminClient/TestGetBackupLocation.json b/src/AzureStack/BackupAdmin/Backup.Admin.Tests/SessionRecords/BackupAdminClient/TestGetBackupLocation.json
deleted file mode 100644
index 6c92c7e99367c..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/SessionRecords/BackupAdminClient/TestGetBackupLocation.json
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-  "Entries": [
-    {
-      "RequestUri": "/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourcegroups/System.local/providers/Microsoft.Backup.Admin/backupLocations?api-version=2016-05-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvODE1ODQ5OGQtMjdiMS00Y2NmLTlhYTEtZGUwZjkyNTczMWU2L3Jlc291cmNlZ3JvdXBzL1N5c3RlbS5sb2NhbC9wcm92aWRlcnMvTWljcm9zb2Z0LkJhY2t1cC5BZG1pbi9iYWNrdXBMb2NhdGlvbnM/YXBpLXZlcnNpb249MjAxNi0wNS0wMQ==",
-      "RequestMethod": "GET",
-      "RequestBody": "",
-      "RequestHeaders": {
-        "x-ms-client-request-id": [
-          "21a364d3-c910-4526-a360-6ef9b11cea4c"
-        ],
-        "accept-language": [
-          "en-US"
-        ],
-        "User-Agent": [
-          "FxVersion/4.6.25211.01",
-          "Microsoft.AzureStack.Management.Backup.Admin.BackupAdminClient/0.1.0.0"
-        ]
-      },
-      "ResponseBody": "{\r\n  \"value\": [\r\n    {\r\n      \"id\": \"/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourceGroups/System.local/providers/Microsoft.Backup.Admin/backupLocations/local\",\r\n      \"name\": \"local\",\r\n      \"type\": \"Microsoft.Backup.Admin/backupLocations\",\r\n      \"location\": \"local\",\r\n      \"tags\": {},\r\n      \"properties\": {\r\n        \"externalStoreDefault\": {\r\n          \"path\": \"\\\\\\\\100.68.88.192\\\\C$\\\\backup_test\",\r\n          \"userName\": \"AzureStack\\\\Administrator\",\r\n          \"password\": null,\r\n          \"encryptionKeyBase64\": null,\r\n          \"backupFrequencyInHours\": \"\",\r\n          \"availableCapacity\": \"10GB\",\r\n          \"isBackupSchedulerEnabled\": false,\r\n          \"nextBackupTime\": null,\r\n          \"lastBackupTime\": null\r\n        }\r\n      }\r\n    }\r\n  ],\r\n  \"nextLink\": null\r\n}",
-      "ResponseHeaders": {
-        "Content-Length": [
-          "563"
-        ],
-        "Content-Type": [
-          "application/json; charset=utf-8"
-        ],
-        "Expires": [
-          "-1"
-        ],
-        "Cache-Control": [
-          "no-cache"
-        ],
-        "Date": [
-          "Fri, 16 Feb 2018 23:02:04 GMT"
-        ],
-        "Pragma": [
-          "no-cache"
-        ],
-        "Server": [
-          "Microsoft-HTTPAPI/2.0"
-        ],
-        "WWW-Authenticate": [
-          "oYG3MIG0oAMKAQChCwYJKoZIgvcSAQICooGfBIGcYIGZBgkqhkiG9xIBAgICAG+BiTCBhqADAgEFoQMCAQ+iejB4oAMCARKicQRvVx3/PhY+mQNv2bCxwziPc7AzU80iCGEIR26UD647Ld/PC4o0UyqT3IlegKzf4KGeo65mmy0bdmD36RaLT5LkNN3C1wRA6h2IA3TT5R8ymViQmXK08zaHh0Ys58uqaQpjryXXWJO+QQ6bBvFqcezv"
-        ],
-        "x-ms-correlation-request-id": [
-          "89cb462d-0610-4651-ae35-0dd85a6aff27"
-        ],
-        "x-ms-ratelimit-remaining-subscription-reads": [
-          "14589"
-        ],
-        "x-ms-request-id": [
-          "89cb462d-0610-4651-ae35-0dd85a6aff27"
-        ],
-        "x-ms-routing-request-id": [
-          "LOCAL:20180216T230204Z:89cb462d-0610-4651-ae35-0dd85a6aff27"
-        ],
-        "Strict-Transport-Security": [
-          "max-age=31536000; includeSubDomains"
-        ],
-        "X-Content-Type-Options": [
-          "nosniff"
-        ]
-      },
-      "StatusCode": 200
-    },
-    {
-      "RequestUri": "/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourcegroups/System.local/providers/Microsoft.Backup.Admin/backupLocations/local?api-version=2016-05-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvODE1ODQ5OGQtMjdiMS00Y2NmLTlhYTEtZGUwZjkyNTczMWU2L3Jlc291cmNlZ3JvdXBzL1N5c3RlbS5sb2NhbC9wcm92aWRlcnMvTWljcm9zb2Z0LkJhY2t1cC5BZG1pbi9iYWNrdXBMb2NhdGlvbnMvbG9jYWw/YXBpLXZlcnNpb249MjAxNi0wNS0wMQ==",
-      "RequestMethod": "GET",
-      "RequestBody": "",
-      "RequestHeaders": {
-        "x-ms-client-request-id": [
-          "2241acaf-d45a-4398-b3de-230bbaac9774"
-        ],
-        "accept-language": [
-          "en-US"
-        ],
-        "User-Agent": [
-          "FxVersion/4.6.25211.01",
-          "Microsoft.AzureStack.Management.Backup.Admin.BackupAdminClient/0.1.0.0"
-        ]
-      },
-      "ResponseBody": "{\r\n  \"id\": \"/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourcegroups/System.local/providers/Microsoft.Backup.Admin/backupLocations/local\",\r\n  \"name\": \"local\",\r\n  \"type\": \"Microsoft.Backup.Admin/backupLocations\",\r\n  \"location\": \"local\",\r\n  \"tags\": {},\r\n  \"properties\": {\r\n    \"externalStoreDefault\": {\r\n      \"path\": \"\\\\\\\\100.68.88.192\\\\C$\\\\backup_test\",\r\n      \"userName\": \"AzureStack\\\\Administrator\",\r\n      \"password\": null,\r\n      \"encryptionKeyBase64\": null,\r\n      \"backupFrequencyInHours\": \"\",\r\n      \"availableCapacity\": \"10GB\",\r\n      \"isBackupSchedulerEnabled\": false,\r\n      \"nextBackupTime\": null,\r\n      \"lastBackupTime\": null\r\n    }\r\n  }\r\n}",
-      "ResponseHeaders": {
-        "Content-Length": [
-          "535"
-        ],
-        "Content-Type": [
-          "application/json; charset=utf-8"
-        ],
-        "Expires": [
-          "-1"
-        ],
-        "Cache-Control": [
-          "no-cache"
-        ],
-        "Date": [
-          "Fri, 16 Feb 2018 23:02:04 GMT"
-        ],
-        "Pragma": [
-          "no-cache"
-        ],
-        "Server": [
-          "Microsoft-HTTPAPI/2.0"
-        ],
-        "WWW-Authenticate": [
-          "oYG3MIG0oAMKAQChCwYJKoZIgvcSAQICooGfBIGcYIGZBgkqhkiG9xIBAgICAG+BiTCBhqADAgEFoQMCAQ+iejB4oAMCARKicQRv6Dcv2P5Ocvb6oFIumBLDeOC4zYJlSaLgjZbT/x/gmBY5DG/inl5OWIx04sSs5NTBbz/djOMVHI+iJy90TRbz/H5U+amQMyZjOTntDsG8phdgmJDdCB0Gua+kOBmM3vmJIIEL1mHt8jjweJRz0BWg"
-        ],
-        "x-ms-correlation-request-id": [
-          "13be1d20-6b5c-4440-a8fb-b53107e71f54"
-        ],
-        "x-ms-ratelimit-remaining-subscription-reads": [
-          "14588"
-        ],
-        "x-ms-request-id": [
-          "13be1d20-6b5c-4440-a8fb-b53107e71f54"
-        ],
-        "x-ms-routing-request-id": [
-          "LOCAL:20180216T230204Z:13be1d20-6b5c-4440-a8fb-b53107e71f54"
-        ],
-        "Strict-Transport-Security": [
-          "max-age=31536000; includeSubDomains"
-        ],
-        "X-Content-Type-Options": [
-          "nosniff"
-        ]
-      },
-      "StatusCode": 200
-    }
-  ],
-  "Names": {},
-  "Variables": {
-    "SubscriptionId": "8158498d-27b1-4ccf-9aa1-de0f925731e6"
-  }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/SessionRecords/BackupAdminClient/TestListBackupLocations.json b/src/AzureStack/BackupAdmin/Backup.Admin.Tests/SessionRecords/BackupAdminClient/TestListBackupLocations.json
deleted file mode 100644
index 32abd41bde931..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/SessionRecords/BackupAdminClient/TestListBackupLocations.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "Entries": [
-    {
-      "RequestUri": "/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourcegroups/System.local/providers/Microsoft.Backup.Admin/backupLocations?api-version=2016-05-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvODE1ODQ5OGQtMjdiMS00Y2NmLTlhYTEtZGUwZjkyNTczMWU2L3Jlc291cmNlZ3JvdXBzL1N5c3RlbS5sb2NhbC9wcm92aWRlcnMvTWljcm9zb2Z0LkJhY2t1cC5BZG1pbi9iYWNrdXBMb2NhdGlvbnM/YXBpLXZlcnNpb249MjAxNi0wNS0wMQ==",
-      "RequestMethod": "GET",
-      "RequestBody": "",
-      "RequestHeaders": {
-        "x-ms-client-request-id": [
-          "dd15803f-37cb-4ceb-9d1b-131ed0505299"
-        ],
-        "accept-language": [
-          "en-US"
-        ],
-        "User-Agent": [
-          "FxVersion/4.6.25211.01",
-          "Microsoft.AzureStack.Management.Backup.Admin.BackupAdminClient/0.1.0.0"
-        ]
-      },
-      "ResponseBody": "{\r\n  \"value\": [\r\n    {\r\n      \"id\": \"/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourceGroups/System.local/providers/Microsoft.Backup.Admin/backupLocations/local\",\r\n      \"name\": \"local\",\r\n      \"type\": \"Microsoft.Backup.Admin/backupLocations\",\r\n      \"location\": \"local\",\r\n      \"tags\": {},\r\n      \"properties\": {\r\n        \"externalStoreDefault\": {\r\n          \"path\": \"\\\\\\\\100.68.88.192\\\\C$\\\\backup_test\",\r\n          \"userName\": \"AzureStack\\\\Administrator\",\r\n          \"password\": null,\r\n          \"encryptionKeyBase64\": null,\r\n          \"backupFrequencyInHours\": \"\",\r\n          \"availableCapacity\": \"10GB\",\r\n          \"isBackupSchedulerEnabled\": false,\r\n          \"nextBackupTime\": null,\r\n          \"lastBackupTime\": null\r\n        }\r\n      }\r\n    }\r\n  ],\r\n  \"nextLink\": null\r\n}",
-      "ResponseHeaders": {
-        "Content-Length": [
-          "563"
-        ],
-        "Content-Type": [
-          "application/json; charset=utf-8"
-        ],
-        "Expires": [
-          "-1"
-        ],
-        "Cache-Control": [
-          "no-cache"
-        ],
-        "Date": [
-          "Fri, 16 Feb 2018 23:02:04 GMT"
-        ],
-        "Pragma": [
-          "no-cache"
-        ],
-        "Server": [
-          "Microsoft-HTTPAPI/2.0"
-        ],
-        "WWW-Authenticate": [
-          "oYG3MIG0oAMKAQChCwYJKoZIgvcSAQICooGfBIGcYIGZBgkqhkiG9xIBAgICAG+BiTCBhqADAgEFoQMCAQ+iejB4oAMCARKicQRvZvNKLueszd0NZ1ZIuaP+vam+8xh6SnZNQCLS84ZxJC+6a3P1QIKbqnqA1rLsVrqSry1I25ZpthZzaxmPi73FWS+B0+yCm2S9+Dn/L0FRStSPBdabPbyYc4gcjFxTSZGX8lccYKff1nIiioLv9rJI"
-        ],
-        "x-ms-correlation-request-id": [
-          "8906a070-6eaa-4e06-aa12-b25410c270b0"
-        ],
-        "x-ms-ratelimit-remaining-subscription-reads": [
-          "14590"
-        ],
-        "x-ms-request-id": [
-          "8906a070-6eaa-4e06-aa12-b25410c270b0"
-        ],
-        "x-ms-routing-request-id": [
-          "LOCAL:20180216T230204Z:8906a070-6eaa-4e06-aa12-b25410c270b0"
-        ],
-        "Strict-Transport-Security": [
-          "max-age=31536000; includeSubDomains"
-        ],
-        "X-Content-Type-Options": [
-          "nosniff"
-        ]
-      },
-      "StatusCode": 200
-    }
-  ],
-  "Names": {},
-  "Variables": {
-    "SubscriptionId": "8158498d-27b1-4ccf-9aa1-de0f925731e6"
-  }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/SessionRecords/BackupAdminClient/TestListBackups.json b/src/AzureStack/BackupAdmin/Backup.Admin.Tests/SessionRecords/BackupAdminClient/TestListBackups.json
deleted file mode 100644
index dda4483ec1990..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/SessionRecords/BackupAdminClient/TestListBackups.json
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-  "Entries": [
-    {
-      "RequestUri": "/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourcegroups/System.local/providers/Microsoft.Backup.Admin/backupLocations?api-version=2016-05-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvODE1ODQ5OGQtMjdiMS00Y2NmLTlhYTEtZGUwZjkyNTczMWU2L3Jlc291cmNlZ3JvdXBzL1N5c3RlbS5sb2NhbC9wcm92aWRlcnMvTWljcm9zb2Z0LkJhY2t1cC5BZG1pbi9iYWNrdXBMb2NhdGlvbnM/YXBpLXZlcnNpb249MjAxNi0wNS0wMQ==",
-      "RequestMethod": "GET",
-      "RequestBody": "",
-      "RequestHeaders": {
-        "x-ms-client-request-id": [
-          "12e8429d-e976-4fff-90ce-ea07aee18a80"
-        ],
-        "accept-language": [
-          "en-US"
-        ],
-        "User-Agent": [
-          "FxVersion/4.6.25211.01",
-          "Microsoft.AzureStack.Management.Backup.Admin.BackupAdminClient/0.1.0.0"
-        ]
-      },
-      "ResponseBody": "{\r\n  \"value\": [\r\n    {\r\n      \"id\": \"/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourceGroups/System.local/providers/Microsoft.Backup.Admin/backupLocations/local\",\r\n      \"name\": \"local\",\r\n      \"type\": \"Microsoft.Backup.Admin/backupLocations\",\r\n      \"location\": \"local\",\r\n      \"tags\": {},\r\n      \"properties\": {\r\n        \"externalStoreDefault\": {\r\n          \"path\": \"\\\\\\\\100.68.88.192\\\\C$\\\\backup_test\",\r\n          \"userName\": \"AzureStack\\\\Administrator\",\r\n          \"password\": null,\r\n          \"encryptionKeyBase64\": null,\r\n          \"backupFrequencyInHours\": \"\",\r\n          \"availableCapacity\": \"10GB\",\r\n          \"isBackupSchedulerEnabled\": false,\r\n          \"nextBackupTime\": null,\r\n          \"lastBackupTime\": null\r\n        }\r\n      }\r\n    }\r\n  ],\r\n  \"nextLink\": null\r\n}",
-      "ResponseHeaders": {
-        "Content-Length": [
-          "563"
-        ],
-        "Content-Type": [
-          "application/json; charset=utf-8"
-        ],
-        "Expires": [
-          "-1"
-        ],
-        "Cache-Control": [
-          "no-cache"
-        ],
-        "Date": [
-          "Fri, 16 Feb 2018 22:57:00 GMT"
-        ],
-        "Pragma": [
-          "no-cache"
-        ],
-        "Server": [
-          "Microsoft-HTTPAPI/2.0"
-        ],
-        "WWW-Authenticate": [
-          "oYG3MIG0oAMKAQChCwYJKoZIgvcSAQICooGfBIGcYIGZBgkqhkiG9xIBAgICAG+BiTCBhqADAgEFoQMCAQ+iejB4oAMCARKicQRv/sPhrq7KktnS3IsJ6pzlZ+NymX1wnoX8sVVvrRQ3YAu0didl4NiumQxtgJrM4bKSFRxDci3+SVQadDjR5+t/ojiHHUlaItXNoOhzb0Ar9pD9g57Z0onnZjlsB9FQZfDvCUCKQ1T3/V9TUpqHdT0L"
-        ],
-        "x-ms-correlation-request-id": [
-          "a0b046f4-3ae5-47f8-aab7-a5f141828807"
-        ],
-        "x-ms-ratelimit-remaining-subscription-reads": [
-          "14601"
-        ],
-        "x-ms-request-id": [
-          "a0b046f4-3ae5-47f8-aab7-a5f141828807"
-        ],
-        "x-ms-routing-request-id": [
-          "LOCAL:20180216T225701Z:a0b046f4-3ae5-47f8-aab7-a5f141828807"
-        ],
-        "Strict-Transport-Security": [
-          "max-age=31536000; includeSubDomains"
-        ],
-        "X-Content-Type-Options": [
-          "nosniff"
-        ]
-      },
-      "StatusCode": 200
-    },
-    {
-      "RequestUri": "/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourcegroups/System.local/providers/Microsoft.Backup.Admin/backupLocations/local/backups?api-version=2016-05-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvODE1ODQ5OGQtMjdiMS00Y2NmLTlhYTEtZGUwZjkyNTczMWU2L3Jlc291cmNlZ3JvdXBzL1N5c3RlbS5sb2NhbC9wcm92aWRlcnMvTWljcm9zb2Z0LkJhY2t1cC5BZG1pbi9iYWNrdXBMb2NhdGlvbnMvbG9jYWwvYmFja3Vwcz9hcGktdmVyc2lvbj0yMDE2LTA1LTAx",
-      "RequestMethod": "GET",
-      "RequestBody": "",
-      "RequestHeaders": {
-        "x-ms-client-request-id": [
-          "21d21a30-c846-4e98-88e8-e54e26d93900"
-        ],
-        "accept-language": [
-          "en-US"
-        ],
-        "User-Agent": [
-          "FxVersion/4.6.25211.01",
-          "Microsoft.AzureStack.Management.Backup.Admin.BackupAdminClient/0.1.0.0"
-        ]
-      },
-      "ResponseBody": "{\r\n  \"value\": [\r\n    {\r\n      \"id\": \"/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourceGroups/System.local/providers/Microsoft.Backup.Admin/backupLocations/local/backups/de038ae0-294d-468d-90a1-fbe5ae028ce2\",\r\n      \"name\": \"de038ae0-294d-468d-90a1-fbe5ae028ce2\",\r\n      \"type\": \"Microsoft.Backup.Admin/backupLocations/backups\",\r\n      \"location\": \"local\",\r\n      \"tags\": {},\r\n      \"properties\": {\r\n        \"backupInfo\": {\r\n          \"backupDataVersion\": null,\r\n          \"backupId\": \"de038ae0-294d-468d-90a1-fbe5ae028ce2\",\r\n          \"roleStatus\": [\r\n            {\r\n              \"roleName\": \"NRP\",\r\n              \"status\": \"Succeeded\"\r\n            },\r\n            {\r\n              \"roleName\": \"SRP\",\r\n              \"status\": \"Succeeded\"\r\n            },\r\n            {\r\n              \"roleName\": \"CRP\",\r\n              \"status\": \"Succeeded\"\r\n            },\r\n            {\r\n              \"roleName\": \"KeyVaultInternalControlPlane\",\r\n              \"status\": \"Succeeded\"\r\n            },\r\n            {\r\n              \"roleName\": \"KeyVaultInternalDataPlane\",\r\n              \"status\": \"Succeeded\"\r\n            },\r\n            {\r\n              \"roleName\": \"KeyVaultControlPlane\",\r\n              \"status\": \"Succeeded\"\r\n            },\r\n            {\r\n              \"roleName\": \"KeyVaultDataPlane\",\r\n              \"status\": \"Succeeded\"\r\n            },\r\n            {\r\n              \"roleName\": \"KeyVaultNamingService\",\r\n              \"status\": \"Succeeded\"\r\n            },\r\n            {\r\n              \"roleName\": \"WAS\",\r\n              \"status\": \"Succeeded\"\r\n            },\r\n            {\r\n              \"roleName\": \"ECE\",\r\n              \"status\": \"Succeeded\"\r\n            },\r\n            {\r\n              \"roleName\": \"CA\",\r\n              \"status\": \"Succeeded\"\r\n            },\r\n            {\r\n              \"roleName\": \"ACS\",\r\n              \"status\": \"Succeeded\"\r\n            }\r\n          ],\r\n          \"status\": \"Succeeded\",\r\n          \"createdDateTime\": \"2018-02-16T16:06:10.1160531Z\",\r\n          \"timeTakenToCreate\": \"PT5M1.5611298S\",\r\n          \"stampVersion\": null,\r\n          \"oemVersion\": null,\r\n          \"deploymentID\": null\r\n        }\r\n      }\r\n    }\r\n  ],\r\n  \"nextLink\": null\r\n}",
-      "ResponseHeaders": {
-        "Content-Length": [
-          "1207"
-        ],
-        "Content-Type": [
-          "application/json; charset=utf-8"
-        ],
-        "Expires": [
-          "-1"
-        ],
-        "Cache-Control": [
-          "no-cache"
-        ],
-        "Date": [
-          "Fri, 16 Feb 2018 22:57:00 GMT"
-        ],
-        "Pragma": [
-          "no-cache"
-        ],
-        "Server": [
-          "Microsoft-HTTPAPI/2.0"
-        ],
-        "WWW-Authenticate": [
-          "oYG3MIG0oAMKAQChCwYJKoZIgvcSAQICooGfBIGcYIGZBgkqhkiG9xIBAgICAG+BiTCBhqADAgEFoQMCAQ+iejB4oAMCARKicQRvUgPQwY6ka6cKYG9oFtd1aAL121C/7o37c6J9a0wxRin7i8qXiXPAFGgn5jOd4NucRWe2TXW2XS6jibUYq9yC/fw4p65ql8brhzJLTzdt4lmIuK741Qn9qwAvQoKJL6oa48adQquhtfSSPEFSJyGk"
-        ],
-        "x-ms-correlation-request-id": [
-          "44fedae1-806c-47c3-82ce-5be33c9f29b9"
-        ],
-        "x-ms-ratelimit-remaining-subscription-reads": [
-          "14600"
-        ],
-        "x-ms-request-id": [
-          "44fedae1-806c-47c3-82ce-5be33c9f29b9"
-        ],
-        "x-ms-routing-request-id": [
-          "LOCAL:20180216T225701Z:44fedae1-806c-47c3-82ce-5be33c9f29b9"
-        ],
-        "Strict-Transport-Security": [
-          "max-age=31536000; includeSubDomains"
-        ],
-        "X-Content-Type-Options": [
-          "nosniff"
-        ]
-      },
-      "StatusCode": 200
-    }
-  ],
-  "Names": {},
-  "Variables": {
-    "SubscriptionId": "8158498d-27b1-4ccf-9aa1-de0f925731e6"
-  }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/SessionRecords/BackupAdminClient/TestUpdateBackupLocation.json b/src/AzureStack/BackupAdmin/Backup.Admin.Tests/SessionRecords/BackupAdminClient/TestUpdateBackupLocation.json
deleted file mode 100644
index b7054ed83af7c..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/SessionRecords/BackupAdminClient/TestUpdateBackupLocation.json
+++ /dev/null
@@ -1,212 +0,0 @@
-{
-  "Entries": [
-    {
-      "RequestUri": "/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourcegroups/System.local/providers/Microsoft.Backup.Admin/backupLocations/local?api-version=2016-05-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvODE1ODQ5OGQtMjdiMS00Y2NmLTlhYTEtZGUwZjkyNTczMWU2L3Jlc291cmNlZ3JvdXBzL1N5c3RlbS5sb2NhbC9wcm92aWRlcnMvTWljcm9zb2Z0LkJhY2t1cC5BZG1pbi9iYWNrdXBMb2NhdGlvbnMvbG9jYWw/YXBpLXZlcnNpb249MjAxNi0wNS0wMQ==",
-      "RequestMethod": "GET",
-      "RequestBody": "",
-      "RequestHeaders": {
-        "x-ms-client-request-id": [
-          "35fc8e75-f434-49c6-89db-30d7350b5a38"
-        ],
-        "accept-language": [
-          "en-US"
-        ],
-        "User-Agent": [
-          "FxVersion/4.6.25211.01",
-          "Microsoft.AzureStack.Management.Backup.Admin.BackupAdminClient/0.1.0.0"
-        ]
-      },
-      "ResponseBody": "{\r\n  \"id\": \"/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourcegroups/System.local/providers/Microsoft.Backup.Admin/backupLocations/local\",\r\n  \"name\": \"local\",\r\n  \"type\": \"Microsoft.Backup.Admin/backupLocations\",\r\n  \"location\": \"local\",\r\n  \"tags\": {},\r\n  \"properties\": {\r\n    \"externalStoreDefault\": {\r\n      \"path\": \"\\\\\\\\100.68.88.192\\\\C$\\\\backup_test\",\r\n      \"userName\": \"AzureStack\\\\Administrator\",\r\n      \"password\": null,\r\n      \"encryptionKeyBase64\": null,\r\n      \"backupFrequencyInHours\": \"\",\r\n      \"availableCapacity\": \"10GB\",\r\n      \"isBackupSchedulerEnabled\": false,\r\n      \"nextBackupTime\": null,\r\n      \"lastBackupTime\": null\r\n    }\r\n  }\r\n}",
-      "ResponseHeaders": {
-        "Content-Length": [
-          "535"
-        ],
-        "Content-Type": [
-          "application/json; charset=utf-8"
-        ],
-        "Expires": [
-          "-1"
-        ],
-        "Cache-Control": [
-          "no-cache"
-        ],
-        "Date": [
-          "Fri, 16 Feb 2018 23:02:04 GMT"
-        ],
-        "Pragma": [
-          "no-cache"
-        ],
-        "Server": [
-          "Microsoft-HTTPAPI/2.0"
-        ],
-        "WWW-Authenticate": [
-          "oYG3MIG0oAMKAQChCwYJKoZIgvcSAQICooGfBIGcYIGZBgkqhkiG9xIBAgICAG+BiTCBhqADAgEFoQMCAQ+iejB4oAMCARKicQRvuHA8StB47xUWre3C52O0bRsh9DEPW2VSHCU+WWKlO7yBcPBS7cKc3ilgMw30v6QZFb+CKEgn0gnIKq3F23+gNU+JBblyFTEdqMr9Hr4hAzryv3WmD3NBUGGAh/3QfXju8AVg2gmbOzK9h2W6la2o"
-        ],
-        "x-ms-correlation-request-id": [
-          "c63055e8-66cb-48cf-97b9-c2a70299d375"
-        ],
-        "x-ms-ratelimit-remaining-subscription-reads": [
-          "14585"
-        ],
-        "x-ms-request-id": [
-          "c63055e8-66cb-48cf-97b9-c2a70299d375"
-        ],
-        "x-ms-routing-request-id": [
-          "LOCAL:20180216T230205Z:c63055e8-66cb-48cf-97b9-c2a70299d375"
-        ],
-        "Strict-Transport-Security": [
-          "max-age=31536000; includeSubDomains"
-        ],
-        "X-Content-Type-Options": [
-          "nosniff"
-        ]
-      },
-      "StatusCode": 200
-    },
-    {
-      "RequestUri": "/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourcegroups/System.local/providers/Microsoft.Backup.Admin/backupLocations/local?api-version=2016-05-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvODE1ODQ5OGQtMjdiMS00Y2NmLTlhYTEtZGUwZjkyNTczMWU2L3Jlc291cmNlZ3JvdXBzL1N5c3RlbS5sb2NhbC9wcm92aWRlcnMvTWljcm9zb2Z0LkJhY2t1cC5BZG1pbi9iYWNrdXBMb2NhdGlvbnMvbG9jYWw/YXBpLXZlcnNpb249MjAxNi0wNS0wMQ==",
-      "RequestMethod": "PUT",
-      "RequestBody": "{\r\n  \"properties\": {\r\n    \"externalStoreDefault\": {\r\n      \"path\": \"\\\\\\\\100.68.71.192\\\\Share\",\r\n      \"userName\": \"Administrator\",\r\n      \"password\": \"password\",\r\n      \"encryptionKeyBase64\": \"YVVOa0J3S2xTamhHZ1lyRU9wQ1pKQ0xWanhjaHlkaU5ZQnNDeHRPTGFQenJKdWZsRGtYT25oYmlaa1RMVWFKeQ==\",\r\n      \"backupFrequencyInHours\": \"\",\r\n      \"availableCapacity\": \"10GB\",\r\n      \"isBackupSchedulerEnabled\": false\r\n    }\r\n  },\r\n  \"location\": \"local\",\r\n  \"tags\": {}\r\n}",
-      "RequestHeaders": {
-        "Content-Type": [
-          "application/json; charset=utf-8"
-        ],
-        "Content-Length": [
-          "467"
-        ],
-        "x-ms-client-request-id": [
-          "936d1a55-e702-495d-b6a1-daf95685cf1b"
-        ],
-        "accept-language": [
-          "en-US"
-        ],
-        "User-Agent": [
-          "FxVersion/4.6.25211.01",
-          "Microsoft.AzureStack.Management.Backup.Admin.BackupAdminClient/0.1.0.0"
-        ]
-      },
-      "ResponseBody": "{\r\n  \"id\": \"/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourcegroups/System.local/providers/Microsoft.Backup.Admin/backupLocations/local\",\r\n  \"name\": \"local\",\r\n  \"type\": \"Microsoft.Backup.Admin/backupLocations\",\r\n  \"location\": \"local\",\r\n  \"tags\": {},\r\n  \"properties\": {\r\n    \"externalStoreDefault\": {\r\n      \"path\": \"\\\\\\\\100.68.71.192\\\\Share\",\r\n      \"userName\": \"Administrator\",\r\n      \"password\": \"\",\r\n      \"encryptionKeyBase64\": \"\",\r\n      \"backupFrequencyInHours\": \"\",\r\n      \"availableCapacity\": \"10GB\",\r\n      \"isBackupSchedulerEnabled\": false,\r\n      \"nextBackupTime\": null,\r\n      \"lastBackupTime\": null\r\n    }\r\n  }\r\n}",
-      "ResponseHeaders": {
-        "Content-Length": [
-          "523"
-        ],
-        "Content-Type": [
-          "application/json; charset=utf-8"
-        ],
-        "Expires": [
-          "-1"
-        ],
-        "Cache-Control": [
-          "no-cache"
-        ],
-        "Date": [
-          "Fri, 16 Feb 2018 23:02:04 GMT"
-        ],
-        "Pragma": [
-          "no-cache"
-        ],
-        "Server": [
-          "Microsoft-HTTPAPI/2.0"
-        ],
-        "WWW-Authenticate": [
-          "oYG3MIG0oAMKAQChCwYJKoZIgvcSAQICooGfBIGcYIGZBgkqhkiG9xIBAgICAG+BiTCBhqADAgEFoQMCAQ+iejB4oAMCARKicQRvWrrXSO1XSC3EE+//JRBCI0DQj5Yg1jQtRhbercOVFpapX929VtbyDdMYXpr+DRVWR+YnyOSksxy4vzcxiaNGqlWrbhXboONHnMWUKenK6bDDWe+GXhxJ5AHoNNbKxueGfOXdqArKLbD87nq3qHR9"
-        ],
-        "x-ms-correlation-request-id": [
-          "50e44ecc-1fcc-4b50-8f93-6bea3271665f"
-        ],
-        "x-ms-ratelimit-remaining-subscription-writes": [
-          "1181"
-        ],
-        "x-ms-request-id": [
-          "50e44ecc-1fcc-4b50-8f93-6bea3271665f"
-        ],
-        "x-ms-routing-request-id": [
-          "LOCAL:20180216T230205Z:50e44ecc-1fcc-4b50-8f93-6bea3271665f"
-        ],
-        "Strict-Transport-Security": [
-          "max-age=31536000; includeSubDomains"
-        ],
-        "X-Content-Type-Options": [
-          "nosniff"
-        ]
-      },
-      "StatusCode": 200
-    },
-    {
-      "RequestUri": "/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourcegroups/System.local/providers/Microsoft.Backup.Admin/backupLocations/local?api-version=2016-05-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvODE1ODQ5OGQtMjdiMS00Y2NmLTlhYTEtZGUwZjkyNTczMWU2L3Jlc291cmNlZ3JvdXBzL1N5c3RlbS5sb2NhbC9wcm92aWRlcnMvTWljcm9zb2Z0LkJhY2t1cC5BZG1pbi9iYWNrdXBMb2NhdGlvbnMvbG9jYWw/YXBpLXZlcnNpb249MjAxNi0wNS0wMQ==",
-      "RequestMethod": "PUT",
-      "RequestBody": "{\r\n  \"properties\": {\r\n    \"externalStoreDefault\": {\r\n      \"backupFrequencyInHours\": \"\",\r\n      \"availableCapacity\": \"10GB\",\r\n      \"isBackupSchedulerEnabled\": false\r\n    }\r\n  },\r\n  \"location\": \"local\",\r\n  \"tags\": {}\r\n}",
-      "RequestHeaders": {
-        "Content-Type": [
-          "application/json; charset=utf-8"
-        ],
-        "Content-Length": [
-          "221"
-        ],
-        "x-ms-client-request-id": [
-          "639a2aff-2f02-4554-a56c-7c1bce4680cb"
-        ],
-        "accept-language": [
-          "en-US"
-        ],
-        "User-Agent": [
-          "FxVersion/4.6.25211.01",
-          "Microsoft.AzureStack.Management.Backup.Admin.BackupAdminClient/0.1.0.0"
-        ]
-      },
-      "ResponseBody": "{\r\n  \"id\": \"/subscriptions/8158498d-27b1-4ccf-9aa1-de0f925731e6/resourcegroups/System.local/providers/Microsoft.Backup.Admin/backupLocations/local\",\r\n  \"name\": \"local\",\r\n  \"type\": \"Microsoft.Backup.Admin/backupLocations\",\r\n  \"location\": \"local\",\r\n  \"tags\": {},\r\n  \"properties\": {\r\n    \"externalStoreDefault\": {\r\n      \"path\": null,\r\n      \"userName\": null,\r\n      \"password\": \"\",\r\n      \"encryptionKeyBase64\": \"\",\r\n      \"backupFrequencyInHours\": \"\",\r\n      \"availableCapacity\": \"10GB\",\r\n      \"isBackupSchedulerEnabled\": false,\r\n      \"nextBackupTime\": null,\r\n      \"lastBackupTime\": null\r\n    }\r\n  }\r\n}",
-      "ResponseHeaders": {
-        "Content-Length": [
-          "476"
-        ],
-        "Content-Type": [
-          "application/json; charset=utf-8"
-        ],
-        "Expires": [
-          "-1"
-        ],
-        "Cache-Control": [
-          "no-cache"
-        ],
-        "Date": [
-          "Fri, 16 Feb 2018 23:02:05 GMT"
-        ],
-        "Pragma": [
-          "no-cache"
-        ],
-        "Server": [
-          "Microsoft-HTTPAPI/2.0"
-        ],
-        "WWW-Authenticate": [
-          "oYG3MIG0oAMKAQChCwYJKoZIgvcSAQICooGfBIGcYIGZBgkqhkiG9xIBAgICAG+BiTCBhqADAgEFoQMCAQ+iejB4oAMCARKicQRvSLKSPCL1W+10rvyiDOFOShGX72cJp4WgD0/MdxcxxpWIbUz3hK8XhUFZv+bvefxJPa3lihKiA+okkQzuHXsrnuzywMXnWR7gLcdMoO6T6Lx1KiX1M41TrEjVWq2kgCVBo1VTZL4PK+GmmGutoWty"
-        ],
-        "x-ms-correlation-request-id": [
-          "523b85d3-51d0-4f76-9d3d-cd6bd9578521"
-        ],
-        "x-ms-ratelimit-remaining-subscription-writes": [
-          "1180"
-        ],
-        "x-ms-request-id": [
-          "523b85d3-51d0-4f76-9d3d-cd6bd9578521"
-        ],
-        "x-ms-routing-request-id": [
-          "LOCAL:20180216T230205Z:523b85d3-51d0-4f76-9d3d-cd6bd9578521"
-        ],
-        "Strict-Transport-Security": [
-          "max-age=31536000; includeSubDomains"
-        ],
-        "X-Content-Type-Options": [
-          "nosniff"
-        ]
-      },
-      "StatusCode": 200
-    }
-  ],
-  "Names": {},
-  "Variables": {
-    "SubscriptionId": "8158498d-27b1-4ccf-9aa1-de0f925731e6"
-  }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/src/BackupLocationTests.cs b/src/AzureStack/BackupAdmin/Backup.Admin.Tests/src/BackupLocationTests.cs
deleted file mode 100644
index adf7904a14da2..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/src/BackupLocationTests.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-
-
-namespace Backup.Tests
-{
-    using Microsoft.AzureStack.Management.Backup.Admin;
-    using Microsoft.AzureStack.Management.Backup.Admin.Models;
-    using System;
-    using Xunit;
-
-    public class BackupLocationTests : BackupTestBase
-    {
-
-        private void ValidateBackupLocation(BackupLocation location)
-        {
-            Assert.NotNull(location);
-
-            // Resource properties
-            Assert.NotNull(location.Id);
-            Assert.NotNull(location.Type);
-            Assert.NotNull(location.Name);
-            Assert.NotNull(location.Location);
-
-            // Backup location properties
-            // TODO: Check with teams.
-        }
-
-        private void AssertSame(BackupLocation expected, BackupLocation given)
-        {
-            if (expected == null)
-            {
-                Assert.Null(given);
-            }
-            else
-            {
-                Assert.NotNull(given);
-
-                // Resource properties
-                Assert.Equal(expected.Id.ToLower(), given.Id.ToLower());
-                Assert.Equal(expected.Type, given.Type);
-                Assert.Equal(expected.Name, given.Name);
-                Assert.Equal(expected.Location, given.Location);
-
-                // Location properties
-                Assert.Equal(expected.AvailableCapacity, given.AvailableCapacity);
-                Assert.Equal(expected.BackupFrequencyInHours, given.BackupFrequencyInHours);
-                Assert.Equal(expected.EncryptionKeyBase64, given.EncryptionKeyBase64);
-                Assert.Equal(expected.IsBackupSchedulerEnabled, given.IsBackupSchedulerEnabled);
-                Assert.Equal(expected.LastBackupTime, given.LastBackupTime);
-                Assert.Equal(expected.NextBackupTime, given.NextBackupTime);
-                Assert.Equal(expected.LastBackupTime, given.LastBackupTime);
-                Assert.Equal(expected.Password, given.Password);
-                Assert.Equal(expected.Path, given.Path);
-                Assert.Equal(expected.UserName, given.UserName);
-
-            }
-        }
-
-        [Fact]
-        public void TestListBackupLocations()
-        {
-            RunTest((client) =>
-            {
-                var backupLocations = client.BackupLocations.List(ResourceGroupName);
-                Common.MapOverIPage(backupLocations, client.BackupLocations.ListNext, ValidateBackupLocation);
-            });
-        }
-
-        [Fact]
-        public void TestGetBackupLocation()
-        {
-            RunTest((client) =>
-            {
-                var backupLocations = client.BackupLocations.List(ResourceGroupName);
-                var backupLocation = backupLocations.GetFirst();
-                var result = client.BackupLocations.Get(ResourceGroupName, backupLocation.Name);
-                AssertSame(backupLocation, result);
-            });
-        }
-
-        [Fact]
-        public void TestGetAllBackupLocation()
-        {
-            RunTest((client) =>
-            {
-                var backupLocations = client.BackupLocations.List(ResourceGroupName);
-                Common.MapOverIPage(backupLocations, client.BackupLocations.ListNext, (backupLocation) =>
-                {
-                    var result = client.BackupLocations.Get(ResourceGroupName, backupLocation.Name);
-                    AssertSame(backupLocation, result);
-                });
-            });
-        }
-
-        [Fact]
-        public void TestUpdateBackupLocation()
-        {
-            RunTest((client) =>
-            {
-
-                var backupLocation = client.BackupLocations.Get(ResourceGroupName, "local");
-
-                backupLocation.Path = @"\\100.68.73.194\Share";
-                backupLocation.UserName = @"Administrator";
-                backupLocation.Password = "password";
-                backupLocation.EncryptionKeyBase64 = "YVVOa0J3S2xTamhHZ1lyRU9wQ1pKQ0xWanhjaHlkaU5ZQnNDeHRPTGFQenJKdWZsRGtYT25oYmlaa1RMVWFKeQ==";
-
-                var result = client.BackupLocations.Update(ResourceGroupName, "local", backupLocation);
-                Assert.NotNull(result);
-
-                result.Path = null;
-                result.UserName = null;
-                result.Password = null;
-                result.EncryptionKeyBase64 = null;
-
-                result = client.BackupLocations.Update(ResourceGroupName, "local", result);
-
-                Assert.Null(result.Path);
-                Assert.Null(result.UserName);
-                Assert.Empty(result.Password);
-                Assert.Empty(result.EncryptionKeyBase64);
-
-            }, null, null, System.Net.HttpStatusCode.OK, false);
-        }
-
-        [Fact]
-        public void TestCreateBackup()
-        {
-            RunTest((client) =>
-            {
-                var backup = client.BackupLocations.CreateBackup(ResourceGroupName, "local");
-                Assert.NotNull(backup);
-            });
-        }
-
-
-    }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/src/BackupTests.cs b/src/AzureStack/BackupAdmin/Backup.Admin.Tests/src/BackupTests.cs
deleted file mode 100644
index 528020919820c..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/src/BackupTests.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-
-namespace Backup.Tests
-{
-    using Microsoft.AzureStack.Management.Backup.Admin;
-    using Microsoft.AzureStack.Management.Backup.Admin.Models;
-    using System;
-    using Xunit;
-
-    public class BackupTests : BackupTestBase
-    {
-
-        private void ValidateBackups(Backup backup) {
-            Assert.NotNull(backup);
-        }
-
-        private void AssertSame(Backup expected, Backup found) {
-            if(expected == null)
-            {
-                Assert.Null(found);
-            } else
-            {
-                Assert.NotNull(found);
-
-                // Resource Group
-                Assert.Equal(expected.Id, found.Id);
-                Assert.Equal(expected.Name, found.Name);
-                Assert.Equal(expected.Type, found.Type);
-                Assert.Equal(expected.Location, found.Location);
-            }
-        }
-
-        [Fact]
-        public void TestListBackups() {
-            RunTest((client) => {
-                var backupLocations = client.BackupLocations.List(ResourceGroupName);
-                backupLocations.ForEach((backupLocation) => {
-                    var name = ExtractName(backupLocation.Name);
-                    var backups = client.Backups.List(ResourceGroupName, name);
-                    backups.ForEach(ValidateBackups);
-                });
-            });
-        }
-
-        [Fact]
-        public void TestGetBackup() {
-            RunTest((client) => {
-                var backupLocations = client.BackupLocations.List(ResourceGroupName);
-                backupLocations.ForEach((backupLocation) => {
-                    var blName = ExtractName(backupLocation.Name);
-                    var backups = client.Backups.List(ResourceGroupName, blName);
-                    foreach(var backup in backups)
-                    {
-                        var bName = ExtractName(backup.Name);
-                        client.Backups.Get(ResourceGroupName, blName, bName);
-                        return;
-                    }
-                });
-            });
-        }
-
-        [Fact(Skip="BRP not working.")]
-        public void TestRestoreBackup()
-        {
-            RunTest((client) =>
-            {
-                var backupLocation = "local";
-                var backup = client.BackupLocations.CreateBackup(ResourceGroupName, backupLocation);
-                Assert.NotNull(backup);
-                client.Backups.Restore(backupLocation, ResourceGroupName, backup.Name);
-            });
-        }
-    }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/src/Helpers/AzureStackTestBase.cs b/src/AzureStack/BackupAdmin/Backup.Admin.Tests/src/Helpers/AzureStackTestBase.cs
deleted file mode 100644
index ee3d8bb33b28b..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/src/Helpers/AzureStackTestBase.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Reflection;
-
-using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
-
-namespace Backup.Tests
-{
-    /// <summary>
-    /// Base class for all AzureStack tests.  This class should not be modified but extended through a child class.
-    /// </summary>
-    ///
-    public abstract class AzureStackTestBase<T> where T : class
-    {
-
-        /// <summary>
-        /// Reference to service client.
-        /// </summary>
-        protected T client;
-
-        /// <summary>
-        /// Validate the client.
-        /// </summary>
-        /// <param name="client">The instantiated client we want to validate.</param>
-        protected abstract void ValidateClient(T client);
-
-        /// <summary>
-        /// The default location for all admin actions.  Override in derived class as needed.
-        /// </summary>
-        protected string Location = "local";
-
-        /// <summary>
-        /// Run a test that accepts no arguments.  An exception can be 
-        /// </summary>
-        /// <param name="test">The test we wish to run.</param>
-        /// <param name="before">Function to execute before your test has completed.</param>
-        /// <param name="after">Function to execute after your test has completed.</param>
-        /// <param name="status">Expected returned HttpStatusCode.</param>
-        /// <exception cref="System.Exception">Thrown when an unexpected exception occurs.</exception>  
-        ///
-        protected void RunTest(Action<T> test,
-            Action before = null,
-            Action after = null,
-            HttpStatusCode status = HttpStatusCode.OK,
-            bool undo = true,
-            [System.Runtime.CompilerServices.CallerMemberName]
-            string methodName= "testframework_failed") {
-
-            Exception caught = null;
-
-            try
-            {
-                var handler = new RecordedDelegatingHandler { StatusCodeToReturn = status };
-                handler.IsPassThrough = true;
-
-                using (MockContext context = MockContext.Start(typeof(T).Name, methodName))
-                {
-                    var client = context.GetServiceClient<T>(handlers: handler);
-                    ValidateClient(client);
-                    
-                    if (!undo)
-                    {
-                        context.GetType().GetField("undoHandlers", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.IgnoreCase).SetValue(
-                            context,
-                            new List<ResourceGroupCleaner>());
-                    }
-                    before?.Invoke();
-                    test(client);
-                    after?.Invoke();
-
-                }
-            }
-            catch (Exception ex)
-            {
-                caught = ex;
-            }
-            finally
-            {
-                if (caught != null)
-                {
-                    throw new Exception("Test failed", caught);
-                }
-            }
-        }
-
-        public void IgnoreExceptions(Action action) {
-            try { action(); }
-            catch (Exception) { }
-        }
-
-    }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/src/Helpers/BackupTestBase.cs b/src/AzureStack/BackupAdmin/Backup.Admin.Tests/src/Helpers/BackupTestBase.cs
deleted file mode 100644
index 6f3cf8414a13c..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/src/Helpers/BackupTestBase.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-
-using Microsoft.AzureStack.Management.Backup.Admin;
-using Xunit;
-
-namespace Backup.Tests
-{
-
-    public class BackupTestBase : AzureStackTestBase<BackupAdminClient>
-    {
-        public BackupTestBase()
-        {
-            // Empty
-        }
-
-        public const string ResourceGroupName = "System.local";
-
-        protected string ExtractName(string name) {
-            if(name.Contains("/"))
-            {
-                var idx = name.LastIndexOf('/');
-                name = name.Substring(idx + 1);
-            }
-            return name;
-        }
-
-        protected override void ValidateClient(BackupAdminClient client)
-        {
-            // validate creation
-            Assert.NotNull(client);
-
-            // validate objects
-            Assert.NotNull(client.Backups);
-            Assert.NotNull(client.SubscriptionId);
-        }
-    }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/src/Helpers/Common.cs b/src/AzureStack/BackupAdmin/Backup.Admin.Tests/src/Helpers/Common.cs
deleted file mode 100644
index 0a99172c86b9b..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/src/Helpers/Common.cs
+++ /dev/null
@@ -1,279 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-
-using Microsoft.Rest;
-using Microsoft.Rest.Azure;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Text;
-
-namespace Backup.Tests
-{
-
-    /// <summary>
-    /// A collection of common values and functions
-    /// </summary>
-    public class Common
-    {
-
-        public const string AcceptableCharactersForResourceName = "abcdefghijklmnopqrstuvwxyz0123456789";
-        public const int MaxResourceNameLength = 24;
-
-        // This is just for code readability
-        public const int Milliseconds = 1;
-        public const int Seconds = 1000 * Milliseconds;
-        public const int Minutes = 60 * Seconds;
-        public const int Hours = 60 * Minutes;
-
-        /// <summary>
-        /// Allows tests to retrieve content from Azure Stack directly.
-        /// </summary>
-        /// <param name="client">The client used to connect.</param>
-        /// <param name="creds">Credentials used to connect.</param>
-        /// <param name="uri">The location of the object.</param>
-        /// <returns>Body of the request.</returns>
-        ///
-        public static string RetrieveObject(HttpClient client, ServiceClientCredentials creds, string uri) {
-            return RetrieveObject(client, creds, new Uri(uri));
-        }
-
-
-        /// <summary>
-        /// Allows tests to retrieve content from Azure Stack directly.
-        /// </summary>
-        /// <param name="client">The client used to connect.</param>
-        /// <param name="creds">Credentials used to connect.</param>
-        /// <param name="uri">The location of the object.</param>
-        /// <returns>Body of the request.</returns>
-        public static string RetrieveObject(HttpClient client, ServiceClientCredentials creds, Uri uri) {
-            var message = new HttpRequestMessage(HttpMethod.Get, uri);
-            creds.ProcessHttpRequestAsync(message, System.Threading.CancellationToken.None);
-            var result = client.SendAsync(message).Result;
-            return result.Content.ToString();
-        }
-
-        /// <summary>
-        /// Generate a random name that can be ingested by Azure or AzureStack.
-        /// </summary>
-        /// <param name="prefix">The prefix added to the string.  The default is okaytodelete.</param>
-        /// <returns>The generated string.</returns>
-        public static string GenerateRandomName(string prefix = "okaytodelete", bool useGuid = true) {
-            StringBuilder sb = new StringBuilder(prefix);
-            if (useGuid)
-            {
-                sb.Append(Guid.NewGuid());
-            }
-            else
-            {
-                Random rand = new Random();
-                for (int i = 0; sb.Length < MaxResourceNameLength; ++i)
-                {
-                    sb.Append(AcceptableCharactersForResourceName[rand.Next(AcceptableCharactersForResourceName.Length)]);
-                }
-            }
-            return sb.ToString();
-        }
-
-        /// <summary>
-        /// Given an operation retry it either some given number of times or until it succeeds
-        /// </summary>
-        /// <param name="func">Function which returns true if it succeeds, false otherwise</param>
-        /// <param name="retries">Maximum number of retries</param>
-        /// <param name="delay">Delay between retries</param>
-        public static bool RetryOperation(Func<bool> func, uint retries = 10, int delay = 250 * Common.Milliseconds) {
-            while (retries > 0)
-            {
-                if (func())
-                {
-                    break;
-                }
-                --retries;
-                System.Threading.Thread.Sleep(delay);
-            }
-            return retries >= 0;
-        }
-
-        /// <summary>
-        ///     Given an operation retry it either some given number of times or until an exception is thrown.
-        /// </summary>
-        /// <param name="act">The action we want to perform.</param>
-        /// <param name="retries">Maximum number of retries</param>
-        /// <param name="delay">Delay between retries</param>
-        /// <returns>True if an exception is thrown, false if we reach our retry limit.</returns>
-        public static bool RetryExceptionExpected(Action act, uint retries = 10, int delay = 250 * Common.Milliseconds) {
-            Func<bool> func = () => { try { act(); return false; } catch { } return true; };
-            return RetryOperation(func, retries, delay);
-        }
-
-        /// <summary>
-        /// Go over each page and perform some action on it.
-        /// </summary>
-        /// <typeparam name="T">Type of object held within the pages.</typeparam>
-        /// <param name="start">Page we start from.</param>
-        /// <param name="getNext">Function will return the next page.</param>
-        /// <param name="action">What action to perform on each object.</param>
-        public static void MapOverIPage<T>(IPage<T> start, Func<string, IPage<T>> getNext, Action<T> action = default(Action<T>)) {
-            var curr = start;
-            for (;;)
-            {
-                curr.ForEach(action);
-
-                if (string.IsNullOrEmpty(curr.NextPageLink))
-                {
-                    break;
-                }
-
-                curr = getNext(curr.NextPageLink);
-            }
-        }
-
-        /// <summary>
-        /// Write IPages to a given file from a starting IPage.
-        /// </summary>
-        /// <typeparam name="T">The type of object each IPage holds.</typeparam>  
-        /// <param name="start">The starting IPage.</param>
-        /// <param name="getNext">Given a valid URI returns the next IPage.</param>
-        /// <param name="filename">The name of the file.</param>
-        /// <param name="toString">Returns a string representation of object of type T.</param>
-        ///
-        public static void WriteIPagesToFile<T>(IPage<T> start, Func<string, IPage<T>> getNext, System.String filename, Func<T, string> toString = null) {
-            using (System.IO.FileStream stream = System.IO.File.Create(filename))
-            {
-                WriteIPagesToStream(start, getNext, stream, toString);
-            }
-        }
-
-        /// <summary>
-        /// Write all element in an enumerable to a file on their own line.
-        /// </summary>
-        /// <typeparam name="T">Type held in Enumerable.</typeparam>
-        /// <param name="iter">Input IEnumerable.</param>
-        /// <param name="filename">The name of the file.</param>
-        /// <param name="toString">Returns a string representation of object of type T.  Default action is to call ToString.</param>
-        public static void WriteIEnumerableToFile<T>(IEnumerable<T> iter, System.String filename, Func<T, string> toString = null) {
-            using (System.IO.FileStream stream = System.IO.File.Create(filename))
-            {
-                WriteIEnumerableToStream(iter, stream, toString);
-            }
-        }
-
-        /// <summary>
-        /// Write all IPage 
-        /// </summary>
-        /// <typeparam name="T">Type held in each page.</typeparam>
-        /// <param name="start">Starting page.</param>
-        /// <param name="getNext">Given a valid URI returns the next IPage.</param>
-        /// <param name="stream">The stream written to.</param>
-        /// <param name="toString">Returns a string representation of object of type T.  Default action is to call ToString.</param>
-        public static void WriteIPagesToStream<T>(IPage<T> start, Func<string, IPage<T>> getNext, System.IO.Stream stream, Func<T, string> toString = null) {
-            toString = toString ?? delegate (T t) { return t.ToString(); };
-            StringBuilder sb = new StringBuilder();
-            Action<T> action = (obj) => { sb.Append(toString(obj)); sb.AppendLine(); };
-            MapOverIPage<T>(start, getNext, action);
-            var str = sb.ToString();
-            var bytes = Encoding.ASCII.GetBytes(sb.ToString());
-            stream.Write(bytes, 0, bytes.Length);
-        }
-
-        /// <summary>
-        /// Iterate through each item in the pages and write its string representation to a file.
-        /// The default action to get a string representation is to call toString on each object.
-        /// </summary>
-        /// <typeparam name="T">Type held in Enumerable.</typeparam>
-        /// <param name="iter">Input IEnumerable.</param>
-        /// <param name="stream">The stream written to.</param>
-        /// <param name="toString">Returns a string representation of object of type T.  Default action is to call ToString.</param>
-        public static void WriteIEnumerableToStream<T>(IEnumerable<T> iter, System.IO.Stream stream, Func<T, string> toString = null) {
-            toString = toString ?? delegate (T t) { return t.ToString(); };
-            StringBuilder sb = new StringBuilder();
-            Action<T> action = (obj) => { sb.Append(toString(obj)); sb.AppendLine(); };
-            iter.ForEach(action);
-            var bytes = Encoding.ASCII.GetBytes(sb.ToString());
-            stream.Write(bytes, 0, bytes.Length);
-        }
-
-    }
-}
-
-public static class Extensions
-{
-
-    /// <summary>
-    /// Round down the dateTimeOffset to interval.
-    /// </summary>
-    /// <param name="dateTimeOffset">The date time offset.</param>
-    /// <param name="interval">The interval.</param>
-    public static DateTimeOffset Floor(this DateTimeOffset dateTimeOffset, TimeSpan interval) {
-        return new DateTimeOffset(dateTimeOffset.UtcTicks - (dateTimeOffset.UtcTicks % interval.Ticks), TimeSpan.Zero);
-    }
-
-    /// <summary>
-    /// Round down to the day.
-    /// </summary>
-    /// <param name="dateTime">The date time.</param>
-    public static DateTime Floor(this DateTime dateTime) {
-        return dateTime.Floor(TimeSpan.FromDays(1));
-    }
-
-    /// <summary>
-    /// Round down the DateTime to interval.
-    /// </summary>
-    /// <param name="dateTime">The date.</param>
-    /// <param name="interval">The interval.</param>
-    public static DateTime Floor(this DateTime dateTime, TimeSpan interval) {
-        return new DateTimeOffset(dateTime).Floor(interval).DateTime;
-    }
-
-
-    /// <summary>
-    /// Apply an operation over an IList object
-    /// </summary>
-    /// <typeparam name="T">Underlying type stored in IEnumerable.</typeparam>
-    /// <param name="list">IEnumerable to apply operation to.</param>
-    /// <param name="action">The action performed.</param>
-    public static void ForEach<T>(this IEnumerable<T> list, Action<T> action = default(Action<T>)) {
-        foreach (var item in list)
-        {
-            action(item);
-        }
-    }
-
-    /// <summary>
-    /// Given a page we try to grab the first element we can find
-    /// </summary>
-    /// <typeparam name="T">The value that is held within the page.</typeparam>
-    /// <param name="page">The page we wish to extract the object from</param>
-    /// <returns></returns>
-    public static T GetFirst<T>(this IPage<T> page) where T : class {
-        T result = null;
-        if (page != null)
-        {
-            foreach (var r in page)
-            {
-                result = r;
-                break;
-            }
-        }
-        return result;
-    }
-
-    /// <summary>
-    /// Convert pagination to a list
-    /// </summary>
-    /// <typeparam name="T">Type contained in each Page</typeparam>
-    /// <param name="start">Starting page we want to covert from.</param>
-    /// <param name="getNext">A function that returns the next page.</param>
-    /// <returns></returns>
-    public static IList<T> PageToList<T>(this IPage<T> start, Func<string, IPage<T>> getNext) {
-        List<T> result = new List<T>();
-        Backup.Tests.Common.MapOverIPage(start, getNext, (page) => {
-            result.Add(page);
-        });
-        return result;
-    }
-
-}
\ No newline at end of file
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs b/src/AzureStack/BackupAdmin/Backup.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
deleted file mode 100644
index af7109b540525..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-using System;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Threading.Tasks;
-
-namespace Backup.Tests
-{
-
-    /// <summary>
-    /// Generic delegation handler.
-    /// </summary>
-    public class RecordedDelegatingHandler : DelegatingHandler
-    {
-        // Default response.
-        private HttpResponseMessage _response;
-
-        /// <summary>
-        /// Default RecordedDelegatingHandler.
-        /// </summary>
-        public RecordedDelegatingHandler() {
-            StatusCodeToReturn = HttpStatusCode.Created;
-            SubsequentStatusCodeToReturn = StatusCodeToReturn;
-        }
-
-        /// <summary>
-        /// Default RecordedDelegatingHandler which defaults to returning created.
-        /// </summary>
-        /// <param name="response">Response returned in all cases.</param>
-        public RecordedDelegatingHandler(HttpResponseMessage response) {
-            StatusCodeToReturn = HttpStatusCode.Created;
-            SubsequentStatusCodeToReturn = StatusCodeToReturn;
-            _response = response;
-        }
-
-        public HttpStatusCode StatusCodeToReturn { get; set; }
-
-        public HttpStatusCode SubsequentStatusCodeToReturn { get; set; }
-
-        public string Request { get; private set; }
-
-        public HttpRequestHeaders RequestHeaders { get; private set; }
-
-        public HttpContentHeaders ContentHeaders { get; private set; }
-
-        public HttpMethod Method { get; private set; }
-
-        public Uri Uri { get; private set; }
-
-        public bool IsPassThrough { get; set; }
-
-        private int counter;
-
-        protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, System.Threading.CancellationToken cancellationToken) {
-            counter++;
-            // Save request
-            if (request.Content == null)
-            {
-                Request = string.Empty;
-            }
-            else
-            {
-                Request = await request.Content.ReadAsStringAsync();
-            }
-            RequestHeaders = request.Headers;
-            if (request.Content != null)
-            {
-                ContentHeaders = request.Content.Headers;
-            }
-            Method = request.Method;
-            Uri = request.RequestUri;
-
-            // Prepare response
-            if (IsPassThrough)
-            {
-                return await base.SendAsync(request, cancellationToken);
-            }
-            else
-            {
-                if (_response != null && counter == 1)
-                {
-                    return _response;
-                }
-                else
-                {
-                    var statusCode = StatusCodeToReturn;
-                    if (counter > 1)
-                        statusCode = SubsequentStatusCodeToReturn;
-                    HttpResponseMessage response = new HttpResponseMessage(statusCode);
-                    response.Content = new StringContent("");
-                    return response;
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/src/OperationTest.cs b/src/AzureStack/BackupAdmin/Backup.Admin.Tests/src/OperationTest.cs
deleted file mode 100644
index 24a0a99f9da61..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin.Tests/src/OperationTest.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-
-namespace Backup.Tests
-{
-    using Microsoft.AzureStack.Management.Backup.Admin;
-    using Microsoft.AzureStack.Management.Backup.Admin.Models;
-    using Xunit;
-
-    public class OperationTest : BackupTestBase
-    {
-
-        private void ValidateOperation(Operation op) {
-            Assert.NotNull(op);
-
-            Assert.NotNull(op.Display);
-            Assert.NotNull(op.Name);
-
-            Assert.NotNull(op.Display.Description);
-            Assert.NotNull(op.Display.Operation);
-            Assert.NotNull(op.Display.Provider);
-            Assert.NotNull(op.Display.Resource);
-        }
-        
-        [Fact(Skip ="Need Environment")]
-        public void TestListBackupOperations() {
-            RunTest((client) => {
-                var operations = client.Operations.List();
-                Assert.NotNull(operations);
-                Common.MapOverIPage(operations, client.Operations.ListNext, ValidateOperation);
-            });
-        }
-    }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/BackupAdminClient.cs b/src/AzureStack/BackupAdmin/Backup.Admin/Generated/BackupAdminClient.cs
deleted file mode 100644
index 1f2efdd98d2fd..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/BackupAdminClient.cs
+++ /dev/null
@@ -1,333 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.AzureStack.Management.Backup.Admin
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Azure;
-    using Microsoft.Rest.Serialization;
-    using Models;
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Net;
-    using System.Net.Http;
-
-    /// <summary>
-    /// Backup Admin Client
-    /// </summary>
-    public partial class BackupAdminClient : ServiceClient<BackupAdminClient>, IBackupAdminClient, IAzureClient
-    {
-        /// <summary>
-        /// The base URI of the service.
-        /// </summary>
-        public System.Uri BaseUri { get; set; }
-
-        /// <summary>
-        /// Gets or sets json serialization settings.
-        /// </summary>
-        public JsonSerializerSettings SerializationSettings { get; private set; }
-
-        /// <summary>
-        /// Gets or sets json deserialization settings.
-        /// </summary>
-        public JsonSerializerSettings DeserializationSettings { get; private set; }
-
-        /// <summary>
-        /// Credentials needed for the client to connect to Azure.
-        /// </summary>
-        public ServiceClientCredentials Credentials { get; private set; }
-
-        /// <summary>
-        /// Subscription credentials that uniquely identify Microsoft Azure
-        /// subscription. The subscription ID forms part of the URI for every service
-        /// call.
-        /// </summary>
-        public string SubscriptionId { get; set; }
-
-        /// <summary>
-        /// Client API version.
-        /// </summary>
-        public string ApiVersion { get; private set; }
-
-        /// <summary>
-        /// Gets or sets the preferred language for the response.
-        /// </summary>
-        public string AcceptLanguage { get; set; }
-
-        /// <summary>
-        /// Gets or sets the retry timeout in seconds for Long Running Operations.
-        /// Default value is 30.
-        /// </summary>
-        public int? LongRunningOperationRetryTimeout { get; set; }
-
-        /// <summary>
-        /// When set to true a unique x-ms-client-request-id value is generated and
-        /// included in each request. Default is true.
-        /// </summary>
-        public bool? GenerateClientRequestId { get; set; }
-
-        /// <summary>
-        /// Gets the IOperations.
-        /// </summary>
-        public virtual IOperations Operations { get; private set; }
-
-        /// <summary>
-        /// Gets the IBackupLocationsOperations.
-        /// </summary>
-        public virtual IBackupLocationsOperations BackupLocations { get; private set; }
-
-        /// <summary>
-        /// Gets the IBackupsOperations.
-        /// </summary>
-        public virtual IBackupsOperations Backups { get; private set; }
-
-        /// <summary>
-        /// Initializes a new instance of the BackupAdminClient class.
-        /// </summary>
-        /// <param name='handlers'>
-        /// Optional. The delegating handlers to add to the http client pipeline.
-        /// </param>
-        protected BackupAdminClient(params DelegatingHandler[] handlers) : base(handlers)
-        {
-            Initialize();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the BackupAdminClient class.
-        /// </summary>
-        /// <param name='rootHandler'>
-        /// Optional. The http client handler used to handle http transport.
-        /// </param>
-        /// <param name='handlers'>
-        /// Optional. The delegating handlers to add to the http client pipeline.
-        /// </param>
-        protected BackupAdminClient(HttpClientHandler rootHandler, params DelegatingHandler[] handlers) : base(rootHandler, handlers)
-        {
-            Initialize();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the BackupAdminClient class.
-        /// </summary>
-        /// <param name='baseUri'>
-        /// Optional. The base URI of the service.
-        /// </param>
-        /// <param name='handlers'>
-        /// Optional. The delegating handlers to add to the http client pipeline.
-        /// </param>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        protected BackupAdminClient(System.Uri baseUri, params DelegatingHandler[] handlers) : this(handlers)
-        {
-            if (baseUri == null)
-            {
-                throw new System.ArgumentNullException("baseUri");
-            }
-            BaseUri = baseUri;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the BackupAdminClient class.
-        /// </summary>
-        /// <param name='baseUri'>
-        /// Optional. The base URI of the service.
-        /// </param>
-        /// <param name='rootHandler'>
-        /// Optional. The http client handler used to handle http transport.
-        /// </param>
-        /// <param name='handlers'>
-        /// Optional. The delegating handlers to add to the http client pipeline.
-        /// </param>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        protected BackupAdminClient(System.Uri baseUri, HttpClientHandler rootHandler, params DelegatingHandler[] handlers) : this(rootHandler, handlers)
-        {
-            if (baseUri == null)
-            {
-                throw new System.ArgumentNullException("baseUri");
-            }
-            BaseUri = baseUri;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the BackupAdminClient class.
-        /// </summary>
-        /// <param name='credentials'>
-        /// Required. Credentials needed for the client to connect to Azure.
-        /// </param>
-        /// <param name='handlers'>
-        /// Optional. The delegating handlers to add to the http client pipeline.
-        /// </param>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        public BackupAdminClient(ServiceClientCredentials credentials, params DelegatingHandler[] handlers) : this(handlers)
-        {
-            if (credentials == null)
-            {
-                throw new System.ArgumentNullException("credentials");
-            }
-            Credentials = credentials;
-            if (Credentials != null)
-            {
-                Credentials.InitializeServiceClient(this);
-            }
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the BackupAdminClient class.
-        /// </summary>
-        /// <param name='credentials'>
-        /// Required. Credentials needed for the client to connect to Azure.
-        /// </param>
-        /// <param name='rootHandler'>
-        /// Optional. The http client handler used to handle http transport.
-        /// </param>
-        /// <param name='handlers'>
-        /// Optional. The delegating handlers to add to the http client pipeline.
-        /// </param>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        public BackupAdminClient(ServiceClientCredentials credentials, HttpClientHandler rootHandler, params DelegatingHandler[] handlers) : this(rootHandler, handlers)
-        {
-            if (credentials == null)
-            {
-                throw new System.ArgumentNullException("credentials");
-            }
-            Credentials = credentials;
-            if (Credentials != null)
-            {
-                Credentials.InitializeServiceClient(this);
-            }
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the BackupAdminClient class.
-        /// </summary>
-        /// <param name='baseUri'>
-        /// Optional. The base URI of the service.
-        /// </param>
-        /// <param name='credentials'>
-        /// Required. Credentials needed for the client to connect to Azure.
-        /// </param>
-        /// <param name='handlers'>
-        /// Optional. The delegating handlers to add to the http client pipeline.
-        /// </param>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        public BackupAdminClient(System.Uri baseUri, ServiceClientCredentials credentials, params DelegatingHandler[] handlers) : this(handlers)
-        {
-            if (baseUri == null)
-            {
-                throw new System.ArgumentNullException("baseUri");
-            }
-            if (credentials == null)
-            {
-                throw new System.ArgumentNullException("credentials");
-            }
-            BaseUri = baseUri;
-            Credentials = credentials;
-            if (Credentials != null)
-            {
-                Credentials.InitializeServiceClient(this);
-            }
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the BackupAdminClient class.
-        /// </summary>
-        /// <param name='baseUri'>
-        /// Optional. The base URI of the service.
-        /// </param>
-        /// <param name='credentials'>
-        /// Required. Credentials needed for the client to connect to Azure.
-        /// </param>
-        /// <param name='rootHandler'>
-        /// Optional. The http client handler used to handle http transport.
-        /// </param>
-        /// <param name='handlers'>
-        /// Optional. The delegating handlers to add to the http client pipeline.
-        /// </param>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        public BackupAdminClient(System.Uri baseUri, ServiceClientCredentials credentials, HttpClientHandler rootHandler, params DelegatingHandler[] handlers) : this(rootHandler, handlers)
-        {
-            if (baseUri == null)
-            {
-                throw new System.ArgumentNullException("baseUri");
-            }
-            if (credentials == null)
-            {
-                throw new System.ArgumentNullException("credentials");
-            }
-            BaseUri = baseUri;
-            Credentials = credentials;
-            if (Credentials != null)
-            {
-                Credentials.InitializeServiceClient(this);
-            }
-        }
-
-        /// <summary>
-        /// An optional partial-method to perform custom initialization.
-        /// </summary>
-        partial void CustomInitialize();
-        /// <summary>
-        /// Initializes client properties.
-        /// </summary>
-        private void Initialize()
-        {
-            Operations = new Operations(this);
-            BackupLocations = new BackupLocationsOperations(this);
-            Backups = new BackupsOperations(this);
-            BaseUri = new System.Uri("https://adminmanagement.local.azurestack.external");
-            ApiVersion = "2016-05-01";
-            AcceptLanguage = "en-US";
-            LongRunningOperationRetryTimeout = 30;
-            GenerateClientRequestId = true;
-            SerializationSettings = new JsonSerializerSettings
-            {
-                Formatting = Newtonsoft.Json.Formatting.Indented,
-                DateFormatHandling = Newtonsoft.Json.DateFormatHandling.IsoDateFormat,
-                DateTimeZoneHandling = Newtonsoft.Json.DateTimeZoneHandling.Utc,
-                NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore,
-                ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Serialize,
-                ContractResolver = new ReadOnlyJsonContractResolver(),
-                Converters = new List<JsonConverter>
-                    {
-                        new Iso8601TimeSpanConverter()
-                    }
-            };
-            SerializationSettings.Converters.Add(new TransformationJsonConverter());
-            DeserializationSettings = new JsonSerializerSettings
-            {
-                DateFormatHandling = Newtonsoft.Json.DateFormatHandling.IsoDateFormat,
-                DateTimeZoneHandling = Newtonsoft.Json.DateTimeZoneHandling.Utc,
-                NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore,
-                ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Serialize,
-                ContractResolver = new ReadOnlyJsonContractResolver(),
-                Converters = new List<JsonConverter>
-                    {
-                        new Iso8601TimeSpanConverter()
-                    }
-            };
-            CustomInitialize();
-            DeserializationSettings.Converters.Add(new TransformationJsonConverter());
-            DeserializationSettings.Converters.Add(new CloudErrorJsonConverter());
-        }
-    }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/BackupLocationsOperations.cs b/src/AzureStack/BackupAdmin/Backup.Admin/Generated/BackupLocationsOperations.cs
deleted file mode 100644
index 1df4e6fda4069..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/BackupLocationsOperations.cs
+++ /dev/null
@@ -1,1099 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.AzureStack.Management.Backup.Admin
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Azure;
-    using Models;
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Net;
-    using System.Net.Http;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// BackupLocationsOperations operations.
-    /// </summary>
-    internal partial class BackupLocationsOperations : IServiceOperations<BackupAdminClient>, IBackupLocationsOperations
-    {
-        /// <summary>
-        /// Initializes a new instance of the BackupLocationsOperations class.
-        /// </summary>
-        /// <param name='client'>
-        /// Reference to the service client.
-        /// </param>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        internal BackupLocationsOperations(BackupAdminClient client)
-        {
-            if (client == null)
-            {
-                throw new System.ArgumentNullException("client");
-            }
-            Client = client;
-        }
-
-        /// <summary>
-        /// Gets a reference to the BackupAdminClient
-        /// </summary>
-        public BackupAdminClient Client { get; private set; }
-
-        /// <summary>
-        /// Returns the list of backup locations.
-        /// </summary>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<IPage<BackupLocation>>> ListWithHttpMessagesAsync(string resourceGroupName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (Client.ApiVersion == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Backup.Admin/backupLocations").ToString();
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            List<string> _queryParameters = new List<string>();
-            if (Client.ApiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200)
-            {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex = new CloudException(_errorBody.Message);
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
-                {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-                }
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<IPage<BackupLocation>>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<BackupLocation>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Returns a specific backup location based on name.
-        /// </summary>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group.
-        /// </param>
-        /// <param name='location'>
-        /// Name of the backup location.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<BackupLocation>> GetWithHttpMessagesAsync(string resourceGroupName, string location, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (location == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "location");
-            }
-            if (Client.ApiVersion == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("location", location);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Backup.Admin/backupLocations/{location}").ToString();
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{location}", System.Uri.EscapeDataString(location));
-            List<string> _queryParameters = new List<string>();
-            if (Client.ApiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 404)
-            {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex = new CloudException(_errorBody.Message);
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
-                {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-                }
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<BackupLocation>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<BackupLocation>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Update a backup location.
-        /// </summary>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group.
-        /// </param>
-        /// <param name='location'>
-        /// Name of the backup location.
-        /// </param>
-        /// <param name='backup'>
-        /// Backup location object.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        public async Task<AzureOperationResponse<BackupLocation>> UpdateWithHttpMessagesAsync(string resourceGroupName, string location, BackupLocation backup, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            // Send Request
-            AzureOperationResponse<BackupLocation> _response = await BeginUpdateWithHttpMessagesAsync(resourceGroupName, location, backup, customHeaders, cancellationToken).ConfigureAwait(false);
-            return await Client.GetPutOrPatchOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Back up a specific location.
-        /// </summary>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group.
-        /// </param>
-        /// <param name='location'>
-        /// Name of the backup location.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        public async Task<AzureOperationResponse<Backup>> CreateBackupWithHttpMessagesAsync(string resourceGroupName, string location, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            // Send request
-            AzureOperationResponse<Backup> _response = await BeginCreateBackupWithHttpMessagesAsync(resourceGroupName, location, customHeaders, cancellationToken).ConfigureAwait(false);
-            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Update a backup location.
-        /// </summary>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group.
-        /// </param>
-        /// <param name='location'>
-        /// Name of the backup location.
-        /// </param>
-        /// <param name='backup'>
-        /// Backup location object.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<BackupLocation>> BeginUpdateWithHttpMessagesAsync(string resourceGroupName, string location, BackupLocation backup, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (location == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "location");
-            }
-            if (Client.ApiVersion == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
-            }
-            if (backup == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "backup");
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("location", location);
-                tracingParameters.Add("backup", backup);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "BeginUpdate", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Backup.Admin/backupLocations/{location}").ToString();
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{location}", System.Uri.EscapeDataString(location));
-            List<string> _queryParameters = new List<string>();
-            if (Client.ApiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PUT");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            if(backup != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(backup, Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 202 && (int)_statusCode != 404)
-            {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex = new CloudException(_errorBody.Message);
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
-                {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-                }
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<BackupLocation>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<BackupLocation>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 202)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<BackupLocation>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Back up a specific location.
-        /// </summary>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group.
-        /// </param>
-        /// <param name='location'>
-        /// Name of the backup location.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<Backup>> BeginCreateBackupWithHttpMessagesAsync(string resourceGroupName, string location, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (location == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "location");
-            }
-            if (Client.ApiVersion == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("location", location);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "BeginCreateBackup", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Backup.Admin/backupLocations/{location}/createBackup").ToString();
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{location}", System.Uri.EscapeDataString(location));
-            List<string> _queryParameters = new List<string>();
-            if (Client.ApiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 202)
-            {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex = new CloudException(_errorBody.Message);
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
-                {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-                }
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<Backup>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Backup>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 202)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Backup>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Returns the list of backup locations.
-        /// </summary>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<IPage<BackupLocation>>> ListNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (nextPageLink == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "nextPageLink");
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("nextPageLink", nextPageLink);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListNext", tracingParameters);
-            }
-            // Construct URL
-            string _url = "{nextLink}";
-            _url = _url.Replace("{nextLink}", nextPageLink);
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200)
-            {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex = new CloudException(_errorBody.Message);
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
-                {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-                }
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<IPage<BackupLocation>>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<BackupLocation>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-    }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/BackupLocationsOperationsExtensions.cs b/src/AzureStack/BackupAdmin/Backup.Admin/Generated/BackupLocationsOperationsExtensions.cs
deleted file mode 100644
index 883434b65f528..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/BackupLocationsOperationsExtensions.cs
+++ /dev/null
@@ -1,305 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.AzureStack.Management.Backup.Admin
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Azure;
-    using Models;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Extension methods for BackupLocationsOperations.
-    /// </summary>
-    public static partial class BackupLocationsOperationsExtensions
-    {
-            /// <summary>
-            /// Returns the list of backup locations.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group.
-            /// </param>
-            public static IPage<BackupLocation> List(this IBackupLocationsOperations operations, string resourceGroupName)
-            {
-                return operations.ListAsync(resourceGroupName).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Returns the list of backup locations.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<BackupLocation>> ListAsync(this IBackupLocationsOperations operations, string resourceGroupName, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListWithHttpMessagesAsync(resourceGroupName, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Returns a specific backup location based on name.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group.
-            /// </param>
-            /// <param name='location'>
-            /// Name of the backup location.
-            /// </param>
-            public static BackupLocation Get(this IBackupLocationsOperations operations, string resourceGroupName, string location)
-            {
-                return operations.GetAsync(resourceGroupName, location).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Returns a specific backup location based on name.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group.
-            /// </param>
-            /// <param name='location'>
-            /// Name of the backup location.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<BackupLocation> GetAsync(this IBackupLocationsOperations operations, string resourceGroupName, string location, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.GetWithHttpMessagesAsync(resourceGroupName, location, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Update a backup location.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group.
-            /// </param>
-            /// <param name='location'>
-            /// Name of the backup location.
-            /// </param>
-            /// <param name='backup'>
-            /// Backup location object.
-            /// </param>
-            public static BackupLocation Update(this IBackupLocationsOperations operations, string resourceGroupName, string location, BackupLocation backup)
-            {
-                return operations.UpdateAsync(resourceGroupName, location, backup).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Update a backup location.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group.
-            /// </param>
-            /// <param name='location'>
-            /// Name of the backup location.
-            /// </param>
-            /// <param name='backup'>
-            /// Backup location object.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<BackupLocation> UpdateAsync(this IBackupLocationsOperations operations, string resourceGroupName, string location, BackupLocation backup, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.UpdateWithHttpMessagesAsync(resourceGroupName, location, backup, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Back up a specific location.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group.
-            /// </param>
-            /// <param name='location'>
-            /// Name of the backup location.
-            /// </param>
-            public static Backup CreateBackup(this IBackupLocationsOperations operations, string resourceGroupName, string location)
-            {
-                return operations.CreateBackupAsync(resourceGroupName, location).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Back up a specific location.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group.
-            /// </param>
-            /// <param name='location'>
-            /// Name of the backup location.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<Backup> CreateBackupAsync(this IBackupLocationsOperations operations, string resourceGroupName, string location, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.CreateBackupWithHttpMessagesAsync(resourceGroupName, location, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Update a backup location.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group.
-            /// </param>
-            /// <param name='location'>
-            /// Name of the backup location.
-            /// </param>
-            /// <param name='backup'>
-            /// Backup location object.
-            /// </param>
-            public static BackupLocation BeginUpdate(this IBackupLocationsOperations operations, string resourceGroupName, string location, BackupLocation backup)
-            {
-                return operations.BeginUpdateAsync(resourceGroupName, location, backup).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Update a backup location.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group.
-            /// </param>
-            /// <param name='location'>
-            /// Name of the backup location.
-            /// </param>
-            /// <param name='backup'>
-            /// Backup location object.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<BackupLocation> BeginUpdateAsync(this IBackupLocationsOperations operations, string resourceGroupName, string location, BackupLocation backup, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.BeginUpdateWithHttpMessagesAsync(resourceGroupName, location, backup, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Back up a specific location.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group.
-            /// </param>
-            /// <param name='location'>
-            /// Name of the backup location.
-            /// </param>
-            public static Backup BeginCreateBackup(this IBackupLocationsOperations operations, string resourceGroupName, string location)
-            {
-                return operations.BeginCreateBackupAsync(resourceGroupName, location).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Back up a specific location.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group.
-            /// </param>
-            /// <param name='location'>
-            /// Name of the backup location.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<Backup> BeginCreateBackupAsync(this IBackupLocationsOperations operations, string resourceGroupName, string location, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.BeginCreateBackupWithHttpMessagesAsync(resourceGroupName, location, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Returns the list of backup locations.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='nextPageLink'>
-            /// The NextLink from the previous successful call to List operation.
-            /// </param>
-            public static IPage<BackupLocation> ListNext(this IBackupLocationsOperations operations, string nextPageLink)
-            {
-                return operations.ListNextAsync(nextPageLink).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Returns the list of backup locations.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='nextPageLink'>
-            /// The NextLink from the previous successful call to List operation.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<BackupLocation>> ListNextAsync(this IBackupLocationsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-    }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/BackupsOperations.cs b/src/AzureStack/BackupAdmin/Backup.Admin/Generated/BackupsOperations.cs
deleted file mode 100644
index f95aa0e9fabcc..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/BackupsOperations.cs
+++ /dev/null
@@ -1,664 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.AzureStack.Management.Backup.Admin
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Azure;
-    using Models;
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Net;
-    using System.Net.Http;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// BackupsOperations operations.
-    /// </summary>
-    internal partial class BackupsOperations : IServiceOperations<BackupAdminClient>, IBackupsOperations
-    {
-        /// <summary>
-        /// Initializes a new instance of the BackupsOperations class.
-        /// </summary>
-        /// <param name='client'>
-        /// Reference to the service client.
-        /// </param>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        internal BackupsOperations(BackupAdminClient client)
-        {
-            if (client == null)
-            {
-                throw new System.ArgumentNullException("client");
-            }
-            Client = client;
-        }
-
-        /// <summary>
-        /// Gets a reference to the BackupAdminClient
-        /// </summary>
-        public BackupAdminClient Client { get; private set; }
-
-        /// <summary>
-        /// Returns a list of backups from a location.
-        /// </summary>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group.
-        /// </param>
-        /// <param name='location'>
-        /// Name of the backup location.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<IEnumerable<Backup>>> ListWithHttpMessagesAsync(string resourceGroupName, string location, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (location == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "location");
-            }
-            if (Client.ApiVersion == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("location", location);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Backup.Admin/backupLocations/{location}/backups").ToString();
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{location}", System.Uri.EscapeDataString(location));
-            List<string> _queryParameters = new List<string>();
-            if (Client.ApiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 404)
-            {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex = new CloudException(_errorBody.Message);
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
-                {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-                }
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<IEnumerable<Backup>>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page1<Backup>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Returns a backup from a location based on name.
-        /// </summary>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group.
-        /// </param>
-        /// <param name='location'>
-        /// Name of the backup location.
-        /// </param>
-        /// <param name='backup'>
-        /// Name of the backup.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<Backup>> GetWithHttpMessagesAsync(string resourceGroupName, string location, string backup, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (location == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "location");
-            }
-            if (backup == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "backup");
-            }
-            if (Client.ApiVersion == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("location", location);
-                tracingParameters.Add("backup", backup);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Backup.Admin/backupLocations/{location}/backups/{backup}").ToString();
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{location}", System.Uri.EscapeDataString(location));
-            _url = _url.Replace("{backup}", System.Uri.EscapeDataString(backup));
-            List<string> _queryParameters = new List<string>();
-            if (Client.ApiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 404)
-            {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex = new CloudException(_errorBody.Message);
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
-                {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-                }
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<Backup>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Backup>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Restore a backup.
-        /// </summary>
-        /// <param name='location'>
-        /// Name of the backup location.
-        /// </param>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group.
-        /// </param>
-        /// <param name='backup'>
-        /// Name of the backup.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        public async Task<AzureOperationResponse> RestoreWithHttpMessagesAsync(string location, string resourceGroupName, string backup, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            // Send request
-            AzureOperationResponse _response = await BeginRestoreWithHttpMessagesAsync(location, resourceGroupName, backup, customHeaders, cancellationToken).ConfigureAwait(false);
-            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Restore a backup.
-        /// </summary>
-        /// <param name='location'>
-        /// Name of the backup location.
-        /// </param>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group.
-        /// </param>
-        /// <param name='backup'>
-        /// Name of the backup.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse> BeginRestoreWithHttpMessagesAsync(string location, string resourceGroupName, string backup, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            if (location == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "location");
-            }
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (backup == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "backup");
-            }
-            if (Client.ApiVersion == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("location", location);
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("backup", backup);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "BeginRestore", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Backup.Admin/backupLocations/{location}/backups/{backup}/restore").ToString();
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            _url = _url.Replace("{location}", System.Uri.EscapeDataString(location));
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{backup}", System.Uri.EscapeDataString(backup));
-            List<string> _queryParameters = new List<string>();
-            if (Client.ApiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 202 && (int)_statusCode != 404)
-            {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex = new CloudException(_errorBody.Message);
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
-                {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-                }
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-    }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/BackupsOperationsExtensions.cs b/src/AzureStack/BackupAdmin/Backup.Admin/Generated/BackupsOperationsExtensions.cs
deleted file mode 100644
index 66580ca80c093..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/BackupsOperationsExtensions.cs
+++ /dev/null
@@ -1,199 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.AzureStack.Management.Backup.Admin
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Azure;
-    using Models;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Extension methods for BackupsOperations.
-    /// </summary>
-    public static partial class BackupsOperationsExtensions
-    {
-            /// <summary>
-            /// Returns a list of backups from a location.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group.
-            /// </param>
-            /// <param name='location'>
-            /// Name of the backup location.
-            /// </param>
-            public static IEnumerable<Backup> List(this IBackupsOperations operations, string resourceGroupName, string location)
-            {
-                return operations.ListAsync(resourceGroupName, location).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Returns a list of backups from a location.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group.
-            /// </param>
-            /// <param name='location'>
-            /// Name of the backup location.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IEnumerable<Backup>> ListAsync(this IBackupsOperations operations, string resourceGroupName, string location, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListWithHttpMessagesAsync(resourceGroupName, location, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Returns a backup from a location based on name.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group.
-            /// </param>
-            /// <param name='location'>
-            /// Name of the backup location.
-            /// </param>
-            /// <param name='backup'>
-            /// Name of the backup.
-            /// </param>
-            public static Backup Get(this IBackupsOperations operations, string resourceGroupName, string location, string backup)
-            {
-                return operations.GetAsync(resourceGroupName, location, backup).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Returns a backup from a location based on name.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group.
-            /// </param>
-            /// <param name='location'>
-            /// Name of the backup location.
-            /// </param>
-            /// <param name='backup'>
-            /// Name of the backup.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<Backup> GetAsync(this IBackupsOperations operations, string resourceGroupName, string location, string backup, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.GetWithHttpMessagesAsync(resourceGroupName, location, backup, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Restore a backup.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='location'>
-            /// Name of the backup location.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group.
-            /// </param>
-            /// <param name='backup'>
-            /// Name of the backup.
-            /// </param>
-            public static void Restore(this IBackupsOperations operations, string location, string resourceGroupName, string backup)
-            {
-                operations.RestoreAsync(location, resourceGroupName, backup).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Restore a backup.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='location'>
-            /// Name of the backup location.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group.
-            /// </param>
-            /// <param name='backup'>
-            /// Name of the backup.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task RestoreAsync(this IBackupsOperations operations, string location, string resourceGroupName, string backup, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                (await operations.RestoreWithHttpMessagesAsync(location, resourceGroupName, backup, null, cancellationToken).ConfigureAwait(false)).Dispose();
-            }
-
-            /// <summary>
-            /// Restore a backup.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='location'>
-            /// Name of the backup location.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group.
-            /// </param>
-            /// <param name='backup'>
-            /// Name of the backup.
-            /// </param>
-            public static void BeginRestore(this IBackupsOperations operations, string location, string resourceGroupName, string backup)
-            {
-                operations.BeginRestoreAsync(location, resourceGroupName, backup).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Restore a backup.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='location'>
-            /// Name of the backup location.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group.
-            /// </param>
-            /// <param name='backup'>
-            /// Name of the backup.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task BeginRestoreAsync(this IBackupsOperations operations, string location, string resourceGroupName, string backup, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                (await operations.BeginRestoreWithHttpMessagesAsync(location, resourceGroupName, backup, null, cancellationToken).ConfigureAwait(false)).Dispose();
-            }
-
-    }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/IBackupAdminClient.cs b/src/AzureStack/BackupAdmin/Backup.Admin/Generated/IBackupAdminClient.cs
deleted file mode 100644
index 2ab10cc56d5c5..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/IBackupAdminClient.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.AzureStack.Management.Backup.Admin
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Azure;
-    using Models;
-    using Newtonsoft.Json;
-
-    /// <summary>
-    /// Backup Admin Client
-    /// </summary>
-    public partial interface IBackupAdminClient : System.IDisposable
-    {
-        /// <summary>
-        /// The base URI of the service.
-        /// </summary>
-        System.Uri BaseUri { get; set; }
-
-        /// <summary>
-        /// Gets or sets json serialization settings.
-        /// </summary>
-        JsonSerializerSettings SerializationSettings { get; }
-
-        /// <summary>
-        /// Gets or sets json deserialization settings.
-        /// </summary>
-        JsonSerializerSettings DeserializationSettings { get; }
-
-        /// <summary>
-        /// Credentials needed for the client to connect to Azure.
-        /// </summary>
-        ServiceClientCredentials Credentials { get; }
-
-        /// <summary>
-        /// Subscription credentials that uniquely identify Microsoft Azure
-        /// subscription. The subscription ID forms part of the URI for every
-        /// service call.
-        /// </summary>
-        string SubscriptionId { get; set; }
-
-        /// <summary>
-        /// Client API version.
-        /// </summary>
-        string ApiVersion { get; }
-
-        /// <summary>
-        /// Gets or sets the preferred language for the response.
-        /// </summary>
-        string AcceptLanguage { get; set; }
-
-        /// <summary>
-        /// Gets or sets the retry timeout in seconds for Long Running
-        /// Operations. Default value is 30.
-        /// </summary>
-        int? LongRunningOperationRetryTimeout { get; set; }
-
-        /// <summary>
-        /// When set to true a unique x-ms-client-request-id value is generated
-        /// and included in each request. Default is true.
-        /// </summary>
-        bool? GenerateClientRequestId { get; set; }
-
-
-        /// <summary>
-        /// Gets the IOperations.
-        /// </summary>
-        IOperations Operations { get; }
-
-        /// <summary>
-        /// Gets the IBackupLocationsOperations.
-        /// </summary>
-        IBackupLocationsOperations BackupLocations { get; }
-
-        /// <summary>
-        /// Gets the IBackupsOperations.
-        /// </summary>
-        IBackupsOperations Backups { get; }
-
-    }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/IBackupLocationsOperations.cs b/src/AzureStack/BackupAdmin/Backup.Admin/Generated/IBackupLocationsOperations.cs
deleted file mode 100644
index 751de50ab3271..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/IBackupLocationsOperations.cs
+++ /dev/null
@@ -1,202 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.AzureStack.Management.Backup.Admin
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Azure;
-    using Models;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// BackupLocationsOperations operations.
-    /// </summary>
-    public partial interface IBackupLocationsOperations
-    {
-        /// <summary>
-        /// Returns the list of backup locations.
-        /// </summary>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<IPage<BackupLocation>>> ListWithHttpMessagesAsync(string resourceGroupName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Returns a specific backup location based on name.
-        /// </summary>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group.
-        /// </param>
-        /// <param name='location'>
-        /// Name of the backup location.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<BackupLocation>> GetWithHttpMessagesAsync(string resourceGroupName, string location, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Update a backup location.
-        /// </summary>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group.
-        /// </param>
-        /// <param name='location'>
-        /// Name of the backup location.
-        /// </param>
-        /// <param name='backup'>
-        /// Backup location object.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<BackupLocation>> UpdateWithHttpMessagesAsync(string resourceGroupName, string location, BackupLocation backup, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Back up a specific location.
-        /// </summary>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group.
-        /// </param>
-        /// <param name='location'>
-        /// Name of the backup location.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<Backup>> CreateBackupWithHttpMessagesAsync(string resourceGroupName, string location, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Update a backup location.
-        /// </summary>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group.
-        /// </param>
-        /// <param name='location'>
-        /// Name of the backup location.
-        /// </param>
-        /// <param name='backup'>
-        /// Backup location object.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<BackupLocation>> BeginUpdateWithHttpMessagesAsync(string resourceGroupName, string location, BackupLocation backup, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Back up a specific location.
-        /// </summary>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group.
-        /// </param>
-        /// <param name='location'>
-        /// Name of the backup location.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<Backup>> BeginCreateBackupWithHttpMessagesAsync(string resourceGroupName, string location, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Returns the list of backup locations.
-        /// </summary>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<IPage<BackupLocation>>> ListNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-    }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/IBackupsOperations.cs b/src/AzureStack/BackupAdmin/Backup.Admin/Generated/IBackupsOperations.cs
deleted file mode 100644
index 93f43e3cb98fa..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/IBackupsOperations.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.AzureStack.Management.Backup.Admin
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Azure;
-    using Models;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// BackupsOperations operations.
-    /// </summary>
-    public partial interface IBackupsOperations
-    {
-        /// <summary>
-        /// Returns a list of backups from a location.
-        /// </summary>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group.
-        /// </param>
-        /// <param name='location'>
-        /// Name of the backup location.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<IEnumerable<Backup>>> ListWithHttpMessagesAsync(string resourceGroupName, string location, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Returns a backup from a location based on name.
-        /// </summary>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group.
-        /// </param>
-        /// <param name='location'>
-        /// Name of the backup location.
-        /// </param>
-        /// <param name='backup'>
-        /// Name of the backup.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<Backup>> GetWithHttpMessagesAsync(string resourceGroupName, string location, string backup, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Restore a backup.
-        /// </summary>
-        /// <param name='location'>
-        /// Name of the backup location.
-        /// </param>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group.
-        /// </param>
-        /// <param name='backup'>
-        /// Name of the backup.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse> RestoreWithHttpMessagesAsync(string location, string resourceGroupName, string backup, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Restore a backup.
-        /// </summary>
-        /// <param name='location'>
-        /// Name of the backup location.
-        /// </param>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group.
-        /// </param>
-        /// <param name='backup'>
-        /// Name of the backup.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse> BeginRestoreWithHttpMessagesAsync(string location, string resourceGroupName, string backup, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-    }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/IOperations.cs b/src/AzureStack/BackupAdmin/Backup.Admin/Generated/IOperations.cs
deleted file mode 100644
index 536c308bf2e10..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/IOperations.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.AzureStack.Management.Backup.Admin
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Azure;
-    using Models;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Operations operations.
-    /// </summary>
-    public partial interface IOperations
-    {
-        /// <summary>
-        /// Returns the list of support REST operations.
-        /// </summary>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<IPage<Operation>>> ListWithHttpMessagesAsync(Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Returns the list of support REST operations.
-        /// </summary>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<IPage<Operation>>> ListNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-    }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/Backup.cs b/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/Backup.cs
deleted file mode 100644
index 81efc5203166f..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/Backup.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.AzureStack.Management.Backup.Admin.Models
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Information related to a backup.
-    /// </summary>
-    [Rest.Serialization.JsonTransformation]
-    public partial class Backup : Resource
-    {
-        /// <summary>
-        /// Initializes a new instance of the Backup class.
-        /// </summary>
-        public Backup()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the Backup class.
-        /// </summary>
-        /// <param name="id">URI of the resource.</param>
-        /// <param name="name">Name of the resource.</param>
-        /// <param name="type">Type of resource.</param>
-        /// <param name="location">Location of the resource.</param>
-        /// <param name="tags">List of key value pairs.</param>
-        /// <param name="backupDataVersion">Version of the backup data.</param>
-        /// <param name="backupId">Unique GUID for the backup.</param>
-        /// <param name="roleStatus">Backup status for each role.</param>
-        /// <param name="status">Current status of the backup. Possible values
-        /// include: 'Creating', 'Queued', 'Running', 'Deleted', 'Failed',
-        /// 'PartialSucceeded', 'Succeeded'</param>
-        /// <param name="createdDateTime">Creation time of the backup.</param>
-        /// <param name="timeTakenToCreate">Duration to create the
-        /// backup.</param>
-        /// <param name="deploymentID">Deployment Id of the stamp.</param>
-        /// <param name="stampVersion">Current version.</param>
-        /// <param name="oemVersion">OEM version.</param>
-        public Backup(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary<string, string> tags = default(IDictionary<string, string>), string backupDataVersion = default(string), string backupId = default(string), IList<RoleOperationStatus> roleStatus = default(IList<RoleOperationStatus>), OperationStatus? status = default(OperationStatus?), System.DateTime? createdDateTime = default(System.DateTime?), string timeTakenToCreate = default(string), string deploymentID = default(string), string stampVersion = default(string), string oemVersion = default(string))
-            : base(id, name, type, location, tags)
-        {
-            BackupDataVersion = backupDataVersion;
-            BackupId = backupId;
-            RoleStatus = roleStatus;
-            Status = status;
-            CreatedDateTime = createdDateTime;
-            TimeTakenToCreate = timeTakenToCreate;
-            DeploymentID = deploymentID;
-            StampVersion = stampVersion;
-            OemVersion = oemVersion;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets version of the backup data.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.backupInfo.backupDataVersion")]
-        public string BackupDataVersion { get; private set; }
-
-        /// <summary>
-        /// Gets unique GUID for the backup.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.backupInfo.backupId")]
-        public string BackupId { get; private set; }
-
-        /// <summary>
-        /// Gets backup status for each role.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.backupInfo.roleStatus")]
-        public IList<RoleOperationStatus> RoleStatus { get; private set; }
-
-        /// <summary>
-        /// Gets current status of the backup. Possible values include:
-        /// 'Creating', 'Queued', 'Running', 'Deleted', 'Failed',
-        /// 'PartialSucceeded', 'Succeeded'
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.backupInfo.status")]
-        public OperationStatus? Status { get; private set; }
-
-        /// <summary>
-        /// Gets creation time of the backup.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.backupInfo.createdDateTime")]
-        public System.DateTime? CreatedDateTime { get; private set; }
-
-        /// <summary>
-        /// Gets duration to create the backup.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.backupInfo.timeTakenToCreate")]
-        public string TimeTakenToCreate { get; private set; }
-
-        /// <summary>
-        /// Gets deployment Id of the stamp.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.backupInfo.deploymentID")]
-        public string DeploymentID { get; private set; }
-
-        /// <summary>
-        /// Gets current version.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.backupInfo.stampVersion")]
-        public string StampVersion { get; private set; }
-
-        /// <summary>
-        /// Gets OEM version.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.backupInfo.oemVersion")]
-        public string OemVersion { get; private set; }
-
-    }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/BackupLocation.cs b/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/BackupLocation.cs
deleted file mode 100644
index 1c7299b5a79dd..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/BackupLocation.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.AzureStack.Management.Backup.Admin.Models
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Information about the backup location.
-    /// </summary>
-    [Rest.Serialization.JsonTransformation]
-    public partial class BackupLocation : Resource
-    {
-        /// <summary>
-        /// Initializes a new instance of the BackupLocation class.
-        /// </summary>
-        public BackupLocation()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the BackupLocation class.
-        /// </summary>
-        /// <param name="id">URI of the resource.</param>
-        /// <param name="name">Name of the resource.</param>
-        /// <param name="type">Type of resource.</param>
-        /// <param name="location">Location of the resource.</param>
-        /// <param name="tags">List of key value pairs.</param>
-        /// <param name="path">Path to the update location</param>
-        /// <param name="userName">Username to access the location.</param>
-        /// <param name="password">Password to access the location.</param>
-        /// <param name="encryptionKeyBase64">Encryption key.</param>
-        /// <param name="backupFrequencyInHours">The interval, in hours, for
-        /// the frequency that the scheduler takes a backup.</param>
-        /// <param name="availableCapacity">Free space at the backup
-        /// location.</param>
-        /// <param name="isBackupSchedulerEnabled">True if the backup scheduler
-        /// is enabled.</param>
-        /// <param name="nextBackupTime">The scheduled time of the next
-        /// backup.</param>
-        /// <param name="lastBackupTime">Time of backup.</param>
-        /// <param name="backupRetentionPeriodInDays">The retention period, in
-        /// days, for backs in the storage location.</param>
-        public BackupLocation(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary<string, string> tags = default(IDictionary<string, string>), string path = default(string), string userName = default(string), string password = default(string), string encryptionKeyBase64 = default(string), int? backupFrequencyInHours = default(int?), string availableCapacity = default(string), bool? isBackupSchedulerEnabled = default(bool?), string nextBackupTime = default(string), string lastBackupTime = default(string), int? backupRetentionPeriodInDays = default(int?))
-            : base(id, name, type, location, tags)
-        {
-            Path = path;
-            UserName = userName;
-            Password = password;
-            EncryptionKeyBase64 = encryptionKeyBase64;
-            BackupFrequencyInHours = backupFrequencyInHours;
-            AvailableCapacity = availableCapacity;
-            IsBackupSchedulerEnabled = isBackupSchedulerEnabled;
-            NextBackupTime = nextBackupTime;
-            LastBackupTime = lastBackupTime;
-            BackupRetentionPeriodInDays = backupRetentionPeriodInDays;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets path to the update location
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.externalStoreDefault.path")]
-        public string Path { get; set; }
-
-        /// <summary>
-        /// Gets or sets username to access the location.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.externalStoreDefault.userName")]
-        public string UserName { get; set; }
-
-        /// <summary>
-        /// Gets or sets password to access the location.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.externalStoreDefault.password")]
-        public string Password { get; set; }
-
-        /// <summary>
-        /// Gets or sets encryption key.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.externalStoreDefault.encryptionKeyBase64")]
-        public string EncryptionKeyBase64 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the interval, in hours, for the frequency that the
-        /// scheduler takes a backup.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.externalStoreDefault.backupFrequencyInHours")]
-        public int? BackupFrequencyInHours { get; set; }
-
-        /// <summary>
-        /// Gets or sets free space at the backup location.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.externalStoreDefault.availableCapacity")]
-        public string AvailableCapacity { get; set; }
-
-        /// <summary>
-        /// Gets or sets true if the backup scheduler is enabled.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.externalStoreDefault.isBackupSchedulerEnabled")]
-        public bool? IsBackupSchedulerEnabled { get; set; }
-
-        /// <summary>
-        /// Gets or sets the scheduled time of the next backup.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.externalStoreDefault.nextBackupTime")]
-        public string NextBackupTime { get; set; }
-
-        /// <summary>
-        /// Gets or sets time of backup.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.externalStoreDefault.lastBackupTime")]
-        public string LastBackupTime { get; set; }
-
-        /// <summary>
-        /// Gets or sets the retention period, in days, for backs in the
-        /// storage location.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.externalStoreDefault.backupRetentionPeriodInDays")]
-        public int? BackupRetentionPeriodInDays { get; set; }
-
-    }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/Display.cs b/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/Display.cs
deleted file mode 100644
index e1e892df614d6..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/Display.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.AzureStack.Management.Backup.Admin.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Contains the localized display information for this particular
-    /// operation / action.
-    /// </summary>
-    public partial class Display
-    {
-        /// <summary>
-        /// Initializes a new instance of the Display class.
-        /// </summary>
-        public Display()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the Display class.
-        /// </summary>
-        /// <param name="provider">The localized friendly form of the resource
-        /// provider name – it is expected to also include the
-        /// publisher/company responsible. It should use Title Casing and begin
-        /// with "Microsoft" for 1st party services. e.g. "Microsoft Monitoring
-        /// Insights" or "Microsoft Compute."</param>
-        /// <param name="resource">The localized, friendly version of the
-        /// resource type related to this action or operation; the resource
-        /// type should match the public documentation for the resource
-        /// provider.</param>
-        /// <param name="operation">The localized, friendly name for the
-        /// operation. Use the name as it will displayed to the user.</param>
-        /// <param name="description">The localized, friendly description for
-        /// the operation. The description will be displayed to the user. It
-        /// should be thorough and concise for used in both tooltips and
-        /// detailed views.</param>
-        public Display(string provider = default(string), string resource = default(string), string operation = default(string), string description = default(string))
-        {
-            Provider = provider;
-            Resource = resource;
-            Operation = operation;
-            Description = description;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets the localized friendly form of the resource provider name – it
-        /// is expected to also include the publisher/company responsible. It
-        /// should use Title Casing and begin with "Microsoft" for 1st party
-        /// services. e.g. "Microsoft Monitoring Insights" or "Microsoft
-        /// Compute."
-        /// </summary>
-        [JsonProperty(PropertyName = "provider")]
-        public string Provider { get; private set; }
-
-        /// <summary>
-        /// Gets the localized, friendly version of the resource type related
-        /// to this action or operation; the resource type should match the
-        /// public documentation for the resource provider.
-        /// </summary>
-        [JsonProperty(PropertyName = "resource")]
-        public string Resource { get; private set; }
-
-        /// <summary>
-        /// Gets the localized, friendly name for the operation. Use the name
-        /// as it will displayed to the user.
-        /// </summary>
-        [JsonProperty(PropertyName = "operation")]
-        public string Operation { get; private set; }
-
-        /// <summary>
-        /// Gets the localized, friendly description for the operation. The
-        /// description will be displayed to the user. It should be thorough
-        /// and concise for used in both tooltips and detailed views.
-        /// </summary>
-        [JsonProperty(PropertyName = "description")]
-        public string Description { get; private set; }
-
-    }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/LongRunningOperationStatus.cs b/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/LongRunningOperationStatus.cs
deleted file mode 100644
index 27d2f4dba863b..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/LongRunningOperationStatus.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.AzureStack.Management.Backup.Admin.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Status of a long running operation.
-    /// </summary>
-    public partial class LongRunningOperationStatus
-    {
-        /// <summary>
-        /// Initializes a new instance of the LongRunningOperationStatus class.
-        /// </summary>
-        public LongRunningOperationStatus()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the LongRunningOperationStatus class.
-        /// </summary>
-        /// <param name="code">Operation result code.</param>
-        /// <param name="message">Description of the operation status.</param>
-        public LongRunningOperationStatus(string code = default(string), string message = default(string))
-        {
-            Code = code;
-            Message = message;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets operation result code.
-        /// </summary>
-        [JsonProperty(PropertyName = "code")]
-        public string Code { get; private set; }
-
-        /// <summary>
-        /// Gets description of the operation status.
-        /// </summary>
-        [JsonProperty(PropertyName = "message")]
-        public string Message { get; private set; }
-
-    }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/Operation.cs b/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/Operation.cs
deleted file mode 100644
index 299e8cf8a2464..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/Operation.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.AzureStack.Management.Backup.Admin.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Describes the supported REST operation.
-    /// </summary>
-    public partial class Operation
-    {
-        /// <summary>
-        /// Initializes a new instance of the Operation class.
-        /// </summary>
-        public Operation()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the Operation class.
-        /// </summary>
-        /// <param name="name">The name of the operation being performed on
-        /// this particular object. This name should match the name that
-        /// appears in RBAC or the event service.</param>
-        /// <param name="display">Contains the localized display information
-        /// for this particular operation / action.</param>
-        public Operation(string name = default(string), Display display = default(Display))
-        {
-            Name = name;
-            Display = display;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets the name of the operation being performed on this particular
-        /// object. This name should match the name that appears in RBAC or the
-        /// event service.
-        /// </summary>
-        [JsonProperty(PropertyName = "name")]
-        public string Name { get; private set; }
-
-        /// <summary>
-        /// Gets contains the localized display information for this particular
-        /// operation / action.
-        /// </summary>
-        [JsonProperty(PropertyName = "display")]
-        public Display Display { get; private set; }
-
-    }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/OperationStatus.cs b/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/OperationStatus.cs
deleted file mode 100644
index 4706c7b4f860a..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/OperationStatus.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.AzureStack.Management.Backup.Admin.Models
-{
-    using Newtonsoft.Json;
-    using Newtonsoft.Json.Converters;
-    using System.Runtime;
-    using System.Runtime.Serialization;
-
-    /// <summary>
-    /// Defines values for OperationStatus.
-    /// </summary>
-    [JsonConverter(typeof(StringEnumConverter))]
-    public enum OperationStatus
-    {
-        [EnumMember(Value = "Creating")]
-        Creating,
-        [EnumMember(Value = "Queued")]
-        Queued,
-        [EnumMember(Value = "Running")]
-        Running,
-        [EnumMember(Value = "Deleted")]
-        Deleted,
-        [EnumMember(Value = "Failed")]
-        Failed,
-        [EnumMember(Value = "PartialSucceeded")]
-        PartialSucceeded,
-        [EnumMember(Value = "Succeeded")]
-        Succeeded
-    }
-    internal static class OperationStatusEnumExtension
-    {
-        internal static string ToSerializedValue(this OperationStatus? value)
-        {
-            return value == null ? null : ((OperationStatus)value).ToSerializedValue();
-        }
-
-        internal static string ToSerializedValue(this OperationStatus value)
-        {
-            switch( value )
-            {
-                case OperationStatus.Creating:
-                    return "Creating";
-                case OperationStatus.Queued:
-                    return "Queued";
-                case OperationStatus.Running:
-                    return "Running";
-                case OperationStatus.Deleted:
-                    return "Deleted";
-                case OperationStatus.Failed:
-                    return "Failed";
-                case OperationStatus.PartialSucceeded:
-                    return "PartialSucceeded";
-                case OperationStatus.Succeeded:
-                    return "Succeeded";
-            }
-            return null;
-        }
-
-        internal static OperationStatus? ParseOperationStatus(this string value)
-        {
-            switch( value )
-            {
-                case "Creating":
-                    return OperationStatus.Creating;
-                case "Queued":
-                    return OperationStatus.Queued;
-                case "Running":
-                    return OperationStatus.Running;
-                case "Deleted":
-                    return OperationStatus.Deleted;
-                case "Failed":
-                    return OperationStatus.Failed;
-                case "PartialSucceeded":
-                    return OperationStatus.PartialSucceeded;
-                case "Succeeded":
-                    return OperationStatus.Succeeded;
-            }
-            return null;
-        }
-    }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/Page.cs b/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/Page.cs
deleted file mode 100644
index d36f4997f051c..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/Page.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.AzureStack.Management.Backup.Admin.Models
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Azure;
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// Defines a page in Azure responses.
-    /// </summary>
-    /// <typeparam name="T">Type of the page content items</typeparam>
-    [JsonObject]
-    public class Page<T> : IPage<T>
-    {
-         /// <summary>
-         /// Gets the link to the next page.
-         /// </summary>
-         [JsonProperty("nextLink")]
-         public string NextPageLink { get; private set; }
-
-         [JsonProperty("value")]
-         private IList<T> Items{ get; set; }
-
-         /// <summary>
-         /// Returns an enumerator that iterates through the collection.
-         /// </summary>
-         /// <returns>A an enumerator that can be used to iterate through the collection.</returns>
-         public IEnumerator<T> GetEnumerator()
-         {
-              return Items == null ? System.Linq.Enumerable.Empty<T>().GetEnumerator() : Items.GetEnumerator();
-         }
-
-         /// <summary>
-         /// Returns an enumerator that iterates through the collection.
-         /// </summary>
-         /// <returns>A an enumerator that can be used to iterate through the collection.</returns>
-         IEnumerator IEnumerable.GetEnumerator()
-         {
-             return GetEnumerator();
-         }
-    }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/Page1.cs b/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/Page1.cs
deleted file mode 100644
index 9daae50522606..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/Page1.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.AzureStack.Management.Backup.Admin.Models
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Azure;
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// Defines a page in Azure responses.
-    /// </summary>
-    /// <typeparam name="T">Type of the page content items</typeparam>
-    [JsonObject]
-    public class Page1<T> : IPage<T>
-    {
-         /// <summary>
-         /// Gets the link to the next page.
-         /// </summary>
-         [JsonProperty("")]
-         public string NextPageLink { get; private set; }
-
-         [JsonProperty("value")]
-         private IList<T> Items{ get; set; }
-
-         /// <summary>
-         /// Returns an enumerator that iterates through the collection.
-         /// </summary>
-         /// <returns>A an enumerator that can be used to iterate through the collection.</returns>
-         public IEnumerator<T> GetEnumerator()
-         {
-              return Items == null ? System.Linq.Enumerable.Empty<T>().GetEnumerator() : Items.GetEnumerator();
-         }
-
-         /// <summary>
-         /// Returns an enumerator that iterates through the collection.
-         /// </summary>
-         /// <returns>A an enumerator that can be used to iterate through the collection.</returns>
-         IEnumerator IEnumerable.GetEnumerator()
-         {
-             return GetEnumerator();
-         }
-    }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/Resource.cs b/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/Resource.cs
deleted file mode 100644
index 44927ef453c50..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/Resource.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.AzureStack.Management.Backup.Admin.Models
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Azure;
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Base Resource Object
-    /// </summary>
-    public partial class Resource : IResource
-    {
-        /// <summary>
-        /// Initializes a new instance of the Resource class.
-        /// </summary>
-        public Resource()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the Resource class.
-        /// </summary>
-        /// <param name="id">URI of the resource.</param>
-        /// <param name="name">Name of the resource.</param>
-        /// <param name="type">Type of resource.</param>
-        /// <param name="location">Location of the resource.</param>
-        /// <param name="tags">List of key value pairs.</param>
-        public Resource(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary<string, string> tags = default(IDictionary<string, string>))
-        {
-            Id = id;
-            Name = name;
-            Type = type;
-            Location = location;
-            Tags = tags;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets URI of the resource.
-        /// </summary>
-        [JsonProperty(PropertyName = "id")]
-        public string Id { get; private set; }
-
-        /// <summary>
-        /// Gets name of the resource.
-        /// </summary>
-        [JsonProperty(PropertyName = "name")]
-        public string Name { get; private set; }
-
-        /// <summary>
-        /// Gets type of resource.
-        /// </summary>
-        [JsonProperty(PropertyName = "type")]
-        public string Type { get; private set; }
-
-        /// <summary>
-        /// Gets or sets location of the resource.
-        /// </summary>
-        [JsonProperty(PropertyName = "location")]
-        public string Location { get; set; }
-
-        /// <summary>
-        /// Gets or sets list of key value pairs.
-        /// </summary>
-        [JsonProperty(PropertyName = "tags")]
-        public IDictionary<string, string> Tags { get; set; }
-
-    }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/RoleOperationStatus.cs b/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/RoleOperationStatus.cs
deleted file mode 100644
index 612ea2d088547..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Models/RoleOperationStatus.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.AzureStack.Management.Backup.Admin.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Backup status for a role.
-    /// </summary>
-    public partial class RoleOperationStatus
-    {
-        /// <summary>
-        /// Initializes a new instance of the RoleOperationStatus class.
-        /// </summary>
-        public RoleOperationStatus()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the RoleOperationStatus class.
-        /// </summary>
-        /// <param name="roleName">Name of the role.</param>
-        /// <param name="status">Status of the role. Possible values include:
-        /// 'Creating', 'Queued', 'Running', 'Deleted', 'Failed',
-        /// 'PartialSucceeded', 'Succeeded'</param>
-        public RoleOperationStatus(string roleName = default(string), OperationStatus? status = default(OperationStatus?))
-        {
-            RoleName = roleName;
-            Status = status;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets name of the role.
-        /// </summary>
-        [JsonProperty(PropertyName = "roleName")]
-        public string RoleName { get; set; }
-
-        /// <summary>
-        /// Gets or sets status of the role. Possible values include:
-        /// 'Creating', 'Queued', 'Running', 'Deleted', 'Failed',
-        /// 'PartialSucceeded', 'Succeeded'
-        /// </summary>
-        [JsonProperty(PropertyName = "status")]
-        public OperationStatus? Status { get; set; }
-
-    }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Operations.cs b/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Operations.cs
deleted file mode 100644
index ca09bccc7e7f3..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/Operations.cs
+++ /dev/null
@@ -1,400 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.AzureStack.Management.Backup.Admin
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Azure;
-    using Models;
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Net;
-    using System.Net.Http;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Operations operations.
-    /// </summary>
-    internal partial class Operations : IServiceOperations<BackupAdminClient>, IOperations
-    {
-        /// <summary>
-        /// Initializes a new instance of the Operations class.
-        /// </summary>
-        /// <param name='client'>
-        /// Reference to the service client.
-        /// </param>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        internal Operations(BackupAdminClient client)
-        {
-            if (client == null)
-            {
-                throw new System.ArgumentNullException("client");
-            }
-            Client = client;
-        }
-
-        /// <summary>
-        /// Gets a reference to the BackupAdminClient
-        /// </summary>
-        public BackupAdminClient Client { get; private set; }
-
-        /// <summary>
-        /// Returns the list of support REST operations.
-        /// </summary>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<IPage<Operation>>> ListWithHttpMessagesAsync(Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (Client.ApiVersion == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Backup.Admin/operations").ToString();
-            List<string> _queryParameters = new List<string>();
-            if (Client.ApiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200)
-            {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex = new CloudException(_errorBody.Message);
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
-                {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-                }
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<IPage<Operation>>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Operation>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Returns the list of support REST operations.
-        /// </summary>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<IPage<Operation>>> ListNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (nextPageLink == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "nextPageLink");
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("nextPageLink", nextPageLink);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListNext", tracingParameters);
-            }
-            // Construct URL
-            string _url = "{nextLink}";
-            _url = _url.Replace("{nextLink}", nextPageLink);
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200)
-            {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex = new CloudException(_errorBody.Message);
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
-                {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-                }
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<IPage<Operation>>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Operation>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-    }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/OperationsExtensions.cs b/src/AzureStack/BackupAdmin/Backup.Admin/Generated/OperationsExtensions.cs
deleted file mode 100644
index ee86fa84cf16b..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin/Generated/OperationsExtensions.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// <auto-generated>
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
-//
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is
-// regenerated.
-// </auto-generated>
-
-namespace Microsoft.AzureStack.Management.Backup.Admin
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Azure;
-    using Models;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Extension methods for Operations.
-    /// </summary>
-    public static partial class OperationsExtensions
-    {
-            /// <summary>
-            /// Returns the list of support REST operations.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            public static IPage<Operation> List(this IOperations operations)
-            {
-                return operations.ListAsync().GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Returns the list of support REST operations.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<Operation>> ListAsync(this IOperations operations, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListWithHttpMessagesAsync(null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Returns the list of support REST operations.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='nextPageLink'>
-            /// The NextLink from the previous successful call to List operation.
-            /// </param>
-            public static IPage<Operation> ListNext(this IOperations operations, string nextPageLink)
-            {
-                return operations.ListNextAsync(nextPageLink).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Returns the list of support REST operations.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='nextPageLink'>
-            /// The NextLink from the previous successful call to List operation.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<Operation>> ListNextAsync(this IOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-    }
-}
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin/Microsoft.AzureStack.Management.Backup.Admin.csproj b/src/AzureStack/BackupAdmin/Backup.Admin/Microsoft.AzureStack.Management.Backup.Admin.csproj
deleted file mode 100644
index 2a4e740817d62..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin/Microsoft.AzureStack.Management.Backup.Admin.csproj
+++ /dev/null
@@ -1,30 +0,0 @@
-<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 below this line -->
-
-    <PropertyGroup>
-        <PackageId>Microsoft.AzureStack.Management.Backup.Admin</PackageId>
-        <Description>Provides developers with libraries for the Backup admin under AzureStack to manage backups.</Description>
-        <VersionPrefix>0.1.0-preview</VersionPrefix>
-        <AssemblyName>Microsoft.AzureStack.Management.Backup.Admin</AssemblyName>
-        <PackageTags>Microsoft Azure Stack;Backup;REST HTTP client;azureostackfficial;netcore451511</PackageTags>
-        <PackageReleaseNotes>
-            <![CDATA[
-                Preview release of the Backup administrator SDK that allows administrators to
-                1) Configure where backups are stored
-                2) Perform backups 
-                3) List and restore completed backup. 
-            ]]>
-        </PackageReleaseNotes>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <TargetFrameworks>net452;netstandard1.4</TargetFrameworks>
-    </PropertyGroup>
-
-    <!-- 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>
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin/Properties/AssemblyInfo.cs b/src/AzureStack/BackupAdmin/Backup.Admin/Properties/AssemblyInfo.cs
deleted file mode 100644
index c7cb6100b9653..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Resources;
-
-[assembly: AssemblyTitle("Microsoft Azure Stack Backup Admin Management Library")]
-[assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Stack Backup Admin Resources.")]
-
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Microsoft Azure .NET SDK")]
-[assembly: AssemblyCopyright("Copyright © Microsoft")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en")]
-
-[assembly: AssemblyVersion("0.1.0.0")]
-[assembly: AssemblyFileVersion("0.1.0.0")]
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin/generate.cmd b/src/AzureStack/BackupAdmin/Backup.Admin/generate.cmd
deleted file mode 100644
index 64489aa8dbb62..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin/generate.cmd
+++ /dev/null
@@ -1,7 +0,0 @@
-::
-:: Microsoft Azure SDK for Net - Generate library code
-:: Copyright (C) Microsoft Corporation. All Rights Reserved.
-::
-
-@echo off
-call %~dp0..\..\..\..\tools\generate.cmd azsadmin/resource-manager/backup latest Azure master azure-rest-api-specs %CD%
diff --git a/src/AzureStack/BackupAdmin/Backup.Admin/generate.ps1 b/src/AzureStack/BackupAdmin/Backup.Admin/generate.ps1
deleted file mode 100644
index 8d9b52508fb29..0000000000000
--- a/src/AzureStack/BackupAdmin/Backup.Admin/generate.ps1
+++ /dev/null
@@ -1,9 +0,0 @@
-powershell.exe -ExecutionPolicy Bypass `
-    -NoLogo `
-    -NonInteractive `
-    -NoProfile `
-    -File "$(split-path $SCRIPT:MyInvocation.MyCommand.Path -parent)\..\..\..\..\tools\generateTool.ps1" `
-    -ResourceProvider "azsadmin/resource-manager/backup" `
-    -PowershellInvoker `
-    -AutoRestVersion "latest" `
-    -SdkRootDirectory $PSScriptRoot
diff --git a/src/AzureStack/BackupAdmin/BackupAdmin.sln b/src/AzureStack/BackupAdmin/BackupAdmin.sln
deleted file mode 100644
index d708cceaeb889..0000000000000
--- a/src/AzureStack/BackupAdmin/BackupAdmin.sln
+++ /dev/null
@@ -1,34 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26430.13
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3A13F014-3E55-4ECA-98BA-55216B70A8D4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Backup.Tests", "Backup.Admin.Tests\Backup.Tests.csproj", "{1B24BC4A-6E4D-4FEB-B5D5-C9684C60A308}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Backup.Admin", "Backup.Admin\Microsoft.AzureStack.Management.Backup.Admin.csproj", "{5F30AD46-8F37-4416-8EAE-5B56A1471926}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{EAE2AE14-948D-4613-A4E8-14C50D8D0472}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EAE2AE14-948D-4613-A4E8-14C50D8D0472}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EAE2AE14-948D-4613-A4E8-14C50D8D0472}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EAE2AE14-948D-4613-A4E8-14C50D8D0472}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1B24BC4A-6E4D-4FEB-B5D5-C9684C60A308}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1B24BC4A-6E4D-4FEB-B5D5-C9684C60A308}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1B24BC4A-6E4D-4FEB-B5D5-C9684C60A308}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1B24BC4A-6E4D-4FEB-B5D5-C9684C60A308}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5F30AD46-8F37-4416-8EAE-5B56A1471926}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5F30AD46-8F37-4416-8EAE-5B56A1471926}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5F30AD46-8F37-4416-8EAE-5B56A1471926}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5F30AD46-8F37-4416-8EAE-5B56A1471926}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/src/AzureStack/Subscription/AzSdk.RP.props b/src/AzureStack/Management/Subscription/AzSdk.RP.props
similarity index 100%
rename from src/AzureStack/Subscription/AzSdk.RP.props
rename to src/AzureStack/Management/Subscription/AzSdk.RP.props
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/Properties/AssemblyInfo.cs b/src/AzureStack/Management/Subscription/Subscription.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/Properties/AssemblyInfo.cs
rename to src/AzureStack/Management/Subscription/Subscription.Tests/Properties/AssemblyInfo.cs
diff --git a/src/AzureStack/Subscription/Subscription.Tests/SessionRecords/SubscriptionClient/TestCreateUpdateAndThenDeleteSubscription.json b/src/AzureStack/Management/Subscription/Subscription.Tests/SessionRecords/SubscriptionClient/TestCreateUpdateAndThenDeleteSubscription.json
similarity index 100%
rename from src/AzureStack/Subscription/Subscription.Tests/SessionRecords/SubscriptionClient/TestCreateUpdateAndThenDeleteSubscription.json
rename to src/AzureStack/Management/Subscription/Subscription.Tests/SessionRecords/SubscriptionClient/TestCreateUpdateAndThenDeleteSubscription.json
diff --git a/src/AzureStack/Subscription/Subscription.Tests/SessionRecords/SubscriptionClient/TestGetDelegatedProviderOffers.json b/src/AzureStack/Management/Subscription/Subscription.Tests/SessionRecords/SubscriptionClient/TestGetDelegatedProviderOffers.json
similarity index 100%
rename from src/AzureStack/Subscription/Subscription.Tests/SessionRecords/SubscriptionClient/TestGetDelegatedProviderOffers.json
rename to src/AzureStack/Management/Subscription/Subscription.Tests/SessionRecords/SubscriptionClient/TestGetDelegatedProviderOffers.json
diff --git a/src/AzureStack/Subscription/Subscription.Tests/SessionRecords/SubscriptionClient/TestGetSubscription.json b/src/AzureStack/Management/Subscription/Subscription.Tests/SessionRecords/SubscriptionClient/TestGetSubscription.json
similarity index 100%
rename from src/AzureStack/Subscription/Subscription.Tests/SessionRecords/SubscriptionClient/TestGetSubscription.json
rename to src/AzureStack/Management/Subscription/Subscription.Tests/SessionRecords/SubscriptionClient/TestGetSubscription.json
diff --git a/src/AzureStack/Subscription/Subscription.Tests/SessionRecords/SubscriptionClient/TestListDelegatedProviderOffers.json b/src/AzureStack/Management/Subscription/Subscription.Tests/SessionRecords/SubscriptionClient/TestListDelegatedProviderOffers.json
similarity index 100%
rename from src/AzureStack/Subscription/Subscription.Tests/SessionRecords/SubscriptionClient/TestListDelegatedProviderOffers.json
rename to src/AzureStack/Management/Subscription/Subscription.Tests/SessionRecords/SubscriptionClient/TestListDelegatedProviderOffers.json
diff --git a/src/AzureStack/Subscription/Subscription.Tests/SessionRecords/SubscriptionClient/TestListRootOffers.json b/src/AzureStack/Management/Subscription/Subscription.Tests/SessionRecords/SubscriptionClient/TestListRootOffers.json
similarity index 100%
rename from src/AzureStack/Subscription/Subscription.Tests/SessionRecords/SubscriptionClient/TestListRootOffers.json
rename to src/AzureStack/Management/Subscription/Subscription.Tests/SessionRecords/SubscriptionClient/TestListRootOffers.json
diff --git a/src/AzureStack/Subscription/Subscription.Tests/SessionRecords/SubscriptionClient/TestListSubscriptions.json b/src/AzureStack/Management/Subscription/Subscription.Tests/SessionRecords/SubscriptionClient/TestListSubscriptions.json
similarity index 100%
rename from src/AzureStack/Subscription/Subscription.Tests/SessionRecords/SubscriptionClient/TestListSubscriptions.json
rename to src/AzureStack/Management/Subscription/Subscription.Tests/SessionRecords/SubscriptionClient/TestListSubscriptions.json
diff --git a/src/AzureStack/Subscription/Subscription.Tests/Subscription.Tests.csproj b/src/AzureStack/Management/Subscription/Subscription.Tests/Subscription.Tests.csproj
similarity index 100%
rename from src/AzureStack/Subscription/Subscription.Tests/Subscription.Tests.csproj
rename to src/AzureStack/Management/Subscription/Subscription.Tests/Subscription.Tests.csproj
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/Helpers/AzureStackTestBase.cs b/src/AzureStack/Management/Subscription/Subscription.Tests/src/Helpers/AzureStackTestBase.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/Helpers/AzureStackTestBase.cs
rename to src/AzureStack/Management/Subscription/Subscription.Tests/src/Helpers/AzureStackTestBase.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/Helpers/Common.cs b/src/AzureStack/Management/Subscription/Subscription.Tests/src/Helpers/Common.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/Helpers/Common.cs
rename to src/AzureStack/Management/Subscription/Subscription.Tests/src/Helpers/Common.cs
diff --git a/src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs b/src/AzureStack/Management/Subscription/Subscription.Tests/src/Helpers/RecordedDelegatingHandler.cs
similarity index 100%
rename from src/AzureStack/SubscriptionsAdmin/Subscriptions.Admin.Tests/src/Helpers/RecordedDelegatingHandler.cs
rename to src/AzureStack/Management/Subscription/Subscription.Tests/src/Helpers/RecordedDelegatingHandler.cs
diff --git a/src/AzureStack/Subscription/Subscription.Tests/src/Helpers/SubscriptionsTestBase.cs b/src/AzureStack/Management/Subscription/Subscription.Tests/src/Helpers/SubscriptionsTestBase.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription.Tests/src/Helpers/SubscriptionsTestBase.cs
rename to src/AzureStack/Management/Subscription/Subscription.Tests/src/Helpers/SubscriptionsTestBase.cs
diff --git a/src/AzureStack/Subscription/Subscription.Tests/src/OfferTests.cs b/src/AzureStack/Management/Subscription/Subscription.Tests/src/OfferTests.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription.Tests/src/OfferTests.cs
rename to src/AzureStack/Management/Subscription/Subscription.Tests/src/OfferTests.cs
diff --git a/src/AzureStack/Subscription/Subscription.Tests/src/SubscriptionTests.cs b/src/AzureStack/Management/Subscription/Subscription.Tests/src/SubscriptionTests.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription.Tests/src/SubscriptionTests.cs
rename to src/AzureStack/Management/Subscription/Subscription.Tests/src/SubscriptionTests.cs
diff --git a/src/AzureStack/Subscription/Subscription.sln b/src/AzureStack/Management/Subscription/Subscription.sln
similarity index 100%
rename from src/AzureStack/Subscription/Subscription.sln
rename to src/AzureStack/Management/Subscription/Subscription.sln
diff --git a/src/AzureStack/Subscription/Subscription/Generated/DelegatedProviderOffersOperations.cs b/src/AzureStack/Management/Subscription/Subscription/Generated/DelegatedProviderOffersOperations.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/Generated/DelegatedProviderOffersOperations.cs
rename to src/AzureStack/Management/Subscription/Subscription/Generated/DelegatedProviderOffersOperations.cs
diff --git a/src/AzureStack/Subscription/Subscription/Generated/DelegatedProviderOffersOperationsExtensions.cs b/src/AzureStack/Management/Subscription/Subscription/Generated/DelegatedProviderOffersOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/Generated/DelegatedProviderOffersOperationsExtensions.cs
rename to src/AzureStack/Management/Subscription/Subscription/Generated/DelegatedProviderOffersOperationsExtensions.cs
diff --git a/src/AzureStack/Subscription/Subscription/Generated/IDelegatedProviderOffersOperations.cs b/src/AzureStack/Management/Subscription/Subscription/Generated/IDelegatedProviderOffersOperations.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/Generated/IDelegatedProviderOffersOperations.cs
rename to src/AzureStack/Management/Subscription/Subscription/Generated/IDelegatedProviderOffersOperations.cs
diff --git a/src/AzureStack/Subscription/Subscription/Generated/IOffersOperations.cs b/src/AzureStack/Management/Subscription/Subscription/Generated/IOffersOperations.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/Generated/IOffersOperations.cs
rename to src/AzureStack/Management/Subscription/Subscription/Generated/IOffersOperations.cs
diff --git a/src/AzureStack/Subscription/Subscription/Generated/IOperations.cs b/src/AzureStack/Management/Subscription/Subscription/Generated/IOperations.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/Generated/IOperations.cs
rename to src/AzureStack/Management/Subscription/Subscription/Generated/IOperations.cs
diff --git a/src/AzureStack/Subscription/Subscription/Generated/ISubscriptionClient.cs b/src/AzureStack/Management/Subscription/Subscription/Generated/ISubscriptionClient.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/Generated/ISubscriptionClient.cs
rename to src/AzureStack/Management/Subscription/Subscription/Generated/ISubscriptionClient.cs
diff --git a/src/AzureStack/Subscription/Subscription/Generated/ISubscriptionsOperations.cs b/src/AzureStack/Management/Subscription/Subscription/Generated/ISubscriptionsOperations.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/Generated/ISubscriptionsOperations.cs
rename to src/AzureStack/Management/Subscription/Subscription/Generated/ISubscriptionsOperations.cs
diff --git a/src/AzureStack/Subscription/Subscription/Generated/Models/Offer.cs b/src/AzureStack/Management/Subscription/Subscription/Generated/Models/Offer.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/Generated/Models/Offer.cs
rename to src/AzureStack/Management/Subscription/Subscription/Generated/Models/Offer.cs
diff --git a/src/AzureStack/Subscription/Subscription/Generated/Models/Operation.cs b/src/AzureStack/Management/Subscription/Subscription/Generated/Models/Operation.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/Generated/Models/Operation.cs
rename to src/AzureStack/Management/Subscription/Subscription/Generated/Models/Operation.cs
diff --git a/src/AzureStack/Subscription/Subscription/Generated/Models/OperationDisplay.cs b/src/AzureStack/Management/Subscription/Subscription/Generated/Models/OperationDisplay.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/Generated/Models/OperationDisplay.cs
rename to src/AzureStack/Management/Subscription/Subscription/Generated/Models/OperationDisplay.cs
diff --git a/src/AzureStack/Subscription/Subscription/Generated/Models/OperationList.cs b/src/AzureStack/Management/Subscription/Subscription/Generated/Models/OperationList.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/Generated/Models/OperationList.cs
rename to src/AzureStack/Management/Subscription/Subscription/Generated/Models/OperationList.cs
diff --git a/src/AzureStack/Subscription/Subscription/Generated/Models/Page.cs b/src/AzureStack/Management/Subscription/Subscription/Generated/Models/Page.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/Generated/Models/Page.cs
rename to src/AzureStack/Management/Subscription/Subscription/Generated/Models/Page.cs
diff --git a/src/AzureStack/Subscription/Subscription/Generated/Models/Page1.cs b/src/AzureStack/Management/Subscription/Subscription/Generated/Models/Page1.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/Generated/Models/Page1.cs
rename to src/AzureStack/Management/Subscription/Subscription/Generated/Models/Page1.cs
diff --git a/src/AzureStack/Subscription/Subscription/Generated/Models/Resource.cs b/src/AzureStack/Management/Subscription/Subscription/Generated/Models/Resource.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/Generated/Models/Resource.cs
rename to src/AzureStack/Management/Subscription/Subscription/Generated/Models/Resource.cs
diff --git a/src/AzureStack/Subscription/Subscription/Generated/Models/SubscriptionModel.cs b/src/AzureStack/Management/Subscription/Subscription/Generated/Models/SubscriptionModel.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/Generated/Models/SubscriptionModel.cs
rename to src/AzureStack/Management/Subscription/Subscription/Generated/Models/SubscriptionModel.cs
diff --git a/src/AzureStack/Subscription/Subscription/Generated/Models/SubscriptionState.cs b/src/AzureStack/Management/Subscription/Subscription/Generated/Models/SubscriptionState.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/Generated/Models/SubscriptionState.cs
rename to src/AzureStack/Management/Subscription/Subscription/Generated/Models/SubscriptionState.cs
diff --git a/src/AzureStack/Subscription/Subscription/Generated/OffersOperations.cs b/src/AzureStack/Management/Subscription/Subscription/Generated/OffersOperations.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/Generated/OffersOperations.cs
rename to src/AzureStack/Management/Subscription/Subscription/Generated/OffersOperations.cs
diff --git a/src/AzureStack/Subscription/Subscription/Generated/OffersOperationsExtensions.cs b/src/AzureStack/Management/Subscription/Subscription/Generated/OffersOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/Generated/OffersOperationsExtensions.cs
rename to src/AzureStack/Management/Subscription/Subscription/Generated/OffersOperationsExtensions.cs
diff --git a/src/AzureStack/Subscription/Subscription/Generated/Operations.cs b/src/AzureStack/Management/Subscription/Subscription/Generated/Operations.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/Generated/Operations.cs
rename to src/AzureStack/Management/Subscription/Subscription/Generated/Operations.cs
diff --git a/src/AzureStack/Subscription/Subscription/Generated/OperationsExtensions.cs b/src/AzureStack/Management/Subscription/Subscription/Generated/OperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/Generated/OperationsExtensions.cs
rename to src/AzureStack/Management/Subscription/Subscription/Generated/OperationsExtensions.cs
diff --git a/src/AzureStack/Subscription/Subscription/Generated/SdkInfo_SubscriptionClient.cs b/src/AzureStack/Management/Subscription/Subscription/Generated/SdkInfo_SubscriptionClient.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/Generated/SdkInfo_SubscriptionClient.cs
rename to src/AzureStack/Management/Subscription/Subscription/Generated/SdkInfo_SubscriptionClient.cs
diff --git a/src/AzureStack/Subscription/Subscription/Generated/SubscriptionClient.cs b/src/AzureStack/Management/Subscription/Subscription/Generated/SubscriptionClient.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/Generated/SubscriptionClient.cs
rename to src/AzureStack/Management/Subscription/Subscription/Generated/SubscriptionClient.cs
diff --git a/src/AzureStack/Subscription/Subscription/Generated/SubscriptionsOperations.cs b/src/AzureStack/Management/Subscription/Subscription/Generated/SubscriptionsOperations.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/Generated/SubscriptionsOperations.cs
rename to src/AzureStack/Management/Subscription/Subscription/Generated/SubscriptionsOperations.cs
diff --git a/src/AzureStack/Subscription/Subscription/Generated/SubscriptionsOperationsExtensions.cs b/src/AzureStack/Management/Subscription/Subscription/Generated/SubscriptionsOperationsExtensions.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/Generated/SubscriptionsOperationsExtensions.cs
rename to src/AzureStack/Management/Subscription/Subscription/Generated/SubscriptionsOperationsExtensions.cs
diff --git a/src/AzureStack/Subscription/Subscription/Microsoft.AzureStack.Management.Subscription.csproj b/src/AzureStack/Management/Subscription/Subscription/Microsoft.AzureStack.Management.Subscription.csproj
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/Microsoft.AzureStack.Management.Subscription.csproj
rename to src/AzureStack/Management/Subscription/Subscription/Microsoft.AzureStack.Management.Subscription.csproj
diff --git a/src/AzureStack/Subscription/Subscription/Properties/AssemblyInfo.cs b/src/AzureStack/Management/Subscription/Subscription/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/Properties/AssemblyInfo.cs
rename to src/AzureStack/Management/Subscription/Subscription/Properties/AssemblyInfo.cs
diff --git a/src/AzureStack/Subscription/Subscription/generate.cmd b/src/AzureStack/Management/Subscription/Subscription/generate.cmd
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/generate.cmd
rename to src/AzureStack/Management/Subscription/Subscription/generate.cmd
diff --git a/src/AzureStack/Subscription/Subscription/generate.ps1 b/src/AzureStack/Management/Subscription/Subscription/generate.ps1
similarity index 100%
rename from src/AzureStack/Subscription/Subscription/generate.ps1
rename to src/AzureStack/Management/Subscription/Subscription/generate.ps1