diff --git a/src/VMware/.gitattributes b/src/VMware/VMware.Autorest/.gitattributes
similarity index 100%
rename from src/VMware/.gitattributes
rename to src/VMware/VMware.Autorest/.gitattributes
diff --git a/src/VMware/.gitignore b/src/VMware/VMware.Autorest/.gitignore
similarity index 100%
rename from src/VMware/.gitignore
rename to src/VMware/VMware.Autorest/.gitignore
diff --git a/src/VMware/Az.VMware.psd1 b/src/VMware/VMware.Autorest/Az.VMware.psd1
similarity index 100%
rename from src/VMware/Az.VMware.psd1
rename to src/VMware/VMware.Autorest/Az.VMware.psd1
diff --git a/src/VMware/README.md b/src/VMware/VMware.Autorest/README.md
similarity index 100%
rename from src/VMware/README.md
rename to src/VMware/VMware.Autorest/README.md
diff --git a/src/VMware/UX/Microsoft.AVS/locations.json b/src/VMware/VMware.Autorest/UX/Microsoft.AVS/locations.json
similarity index 100%
rename from src/VMware/UX/Microsoft.AVS/locations.json
rename to src/VMware/VMware.Autorest/UX/Microsoft.AVS/locations.json
diff --git a/src/VMware/UX/Microsoft.AVS/privateClouds-authorizations.json b/src/VMware/VMware.Autorest/UX/Microsoft.AVS/privateClouds-authorizations.json
similarity index 100%
rename from src/VMware/UX/Microsoft.AVS/privateClouds-authorizations.json
rename to src/VMware/VMware.Autorest/UX/Microsoft.AVS/privateClouds-authorizations.json
diff --git a/src/VMware/UX/Microsoft.AVS/privateClouds-cloudLinks.json b/src/VMware/VMware.Autorest/UX/Microsoft.AVS/privateClouds-cloudLinks.json
similarity index 100%
rename from src/VMware/UX/Microsoft.AVS/privateClouds-cloudLinks.json
rename to src/VMware/VMware.Autorest/UX/Microsoft.AVS/privateClouds-cloudLinks.json
diff --git a/src/VMware/UX/Microsoft.AVS/privateClouds-clusters-datastores.json b/src/VMware/VMware.Autorest/UX/Microsoft.AVS/privateClouds-clusters-datastores.json
similarity index 100%
rename from src/VMware/UX/Microsoft.AVS/privateClouds-clusters-datastores.json
rename to src/VMware/VMware.Autorest/UX/Microsoft.AVS/privateClouds-clusters-datastores.json
diff --git a/src/VMware/UX/Microsoft.AVS/privateClouds-clusters-placementPolicies.json b/src/VMware/VMware.Autorest/UX/Microsoft.AVS/privateClouds-clusters-placementPolicies.json
similarity index 100%
rename from src/VMware/UX/Microsoft.AVS/privateClouds-clusters-placementPolicies.json
rename to src/VMware/VMware.Autorest/UX/Microsoft.AVS/privateClouds-clusters-placementPolicies.json
diff --git a/src/VMware/UX/Microsoft.AVS/privateClouds-clusters-virtualMachines.json b/src/VMware/VMware.Autorest/UX/Microsoft.AVS/privateClouds-clusters-virtualMachines.json
similarity index 100%
rename from src/VMware/UX/Microsoft.AVS/privateClouds-clusters-virtualMachines.json
rename to src/VMware/VMware.Autorest/UX/Microsoft.AVS/privateClouds-clusters-virtualMachines.json
diff --git a/src/VMware/UX/Microsoft.AVS/privateClouds-clusters.json b/src/VMware/VMware.Autorest/UX/Microsoft.AVS/privateClouds-clusters.json
similarity index 100%
rename from src/VMware/UX/Microsoft.AVS/privateClouds-clusters.json
rename to src/VMware/VMware.Autorest/UX/Microsoft.AVS/privateClouds-clusters.json
diff --git a/src/VMware/UX/Microsoft.AVS/privateClouds-globalReachConnections.json b/src/VMware/VMware.Autorest/UX/Microsoft.AVS/privateClouds-globalReachConnections.json
similarity index 100%
rename from src/VMware/UX/Microsoft.AVS/privateClouds-globalReachConnections.json
rename to src/VMware/VMware.Autorest/UX/Microsoft.AVS/privateClouds-globalReachConnections.json
diff --git a/src/VMware/UX/Microsoft.AVS/privateClouds.json b/src/VMware/VMware.Autorest/UX/Microsoft.AVS/privateClouds.json
similarity index 100%
rename from src/VMware/UX/Microsoft.AVS/privateClouds.json
rename to src/VMware/VMware.Autorest/UX/Microsoft.AVS/privateClouds.json
diff --git a/src/VMware/custom/Get-AzVMwareAddon.ps1 b/src/VMware/VMware.Autorest/custom/Get-AzVMwareAddon.ps1
similarity index 100%
rename from src/VMware/custom/Get-AzVMwareAddon.ps1
rename to src/VMware/VMware.Autorest/custom/Get-AzVMwareAddon.ps1
diff --git a/src/VMware/custom/LegalTerm.txt b/src/VMware/VMware.Autorest/custom/LegalTerm.txt
similarity index 100%
rename from src/VMware/custom/LegalTerm.txt
rename to src/VMware/VMware.Autorest/custom/LegalTerm.txt
diff --git a/src/VMware/custom/New-AzVMwareAddon.ps1 b/src/VMware/VMware.Autorest/custom/New-AzVMwareAddon.ps1
similarity index 100%
rename from src/VMware/custom/New-AzVMwareAddon.ps1
rename to src/VMware/VMware.Autorest/custom/New-AzVMwareAddon.ps1
diff --git a/src/VMware/custom/New-AzVMwareAddonSrmPropertiesObject.ps1 b/src/VMware/VMware.Autorest/custom/New-AzVMwareAddonSrmPropertiesObject.ps1
similarity index 100%
rename from src/VMware/custom/New-AzVMwareAddonSrmPropertiesObject.ps1
rename to src/VMware/VMware.Autorest/custom/New-AzVMwareAddonSrmPropertiesObject.ps1
diff --git a/src/VMware/custom/New-AzVMwareAddonVrPropertiesObject.ps1 b/src/VMware/VMware.Autorest/custom/New-AzVMwareAddonVrPropertiesObject.ps1
similarity index 100%
rename from src/VMware/custom/New-AzVMwareAddonVrPropertiesObject.ps1
rename to src/VMware/VMware.Autorest/custom/New-AzVMwareAddonVrPropertiesObject.ps1
diff --git a/src/VMware/custom/New-AzVMwarePSCredentialExecutionParameterObject.ps1 b/src/VMware/VMware.Autorest/custom/New-AzVMwarePSCredentialExecutionParameterObject.ps1
similarity index 100%
rename from src/VMware/custom/New-AzVMwarePSCredentialExecutionParameterObject.ps1
rename to src/VMware/VMware.Autorest/custom/New-AzVMwarePSCredentialExecutionParameterObject.ps1
diff --git a/src/VMware/custom/New-AzVMwarePrivateCloud.ps1 b/src/VMware/VMware.Autorest/custom/New-AzVMwarePrivateCloud.ps1
similarity index 100%
rename from src/VMware/custom/New-AzVMwarePrivateCloud.ps1
rename to src/VMware/VMware.Autorest/custom/New-AzVMwarePrivateCloud.ps1
diff --git a/src/VMware/custom/New-AzVMwareScriptSecureStringExecutionParameterObject.ps1 b/src/VMware/VMware.Autorest/custom/New-AzVMwareScriptSecureStringExecutionParameterObject.ps1
similarity index 100%
rename from src/VMware/custom/New-AzVMwareScriptSecureStringExecutionParameterObject.ps1
rename to src/VMware/VMware.Autorest/custom/New-AzVMwareScriptSecureStringExecutionParameterObject.ps1
diff --git a/src/VMware/custom/New-AzVMwareScriptStringExecutionParameterObject.ps1 b/src/VMware/VMware.Autorest/custom/New-AzVMwareScriptStringExecutionParameterObject.ps1
similarity index 100%
rename from src/VMware/custom/New-AzVMwareScriptStringExecutionParameterObject.ps1
rename to src/VMware/VMware.Autorest/custom/New-AzVMwareScriptStringExecutionParameterObject.ps1
diff --git a/src/VMware/custom/New-AzVMwareVMPlacementPolicyPropertiesObject.ps1 b/src/VMware/VMware.Autorest/custom/New-AzVMwareVMPlacementPolicyPropertiesObject.ps1
similarity index 100%
rename from src/VMware/custom/New-AzVMwareVMPlacementPolicyPropertiesObject.ps1
rename to src/VMware/VMware.Autorest/custom/New-AzVMwareVMPlacementPolicyPropertiesObject.ps1
diff --git a/src/VMware/custom/New-AzVMwareVmHostPlacementPolicyPropertiesObject.ps1 b/src/VMware/VMware.Autorest/custom/New-AzVMwareVmHostPlacementPolicyPropertiesObject.ps1
similarity index 100%
rename from src/VMware/custom/New-AzVMwareVmHostPlacementPolicyPropertiesObject.ps1
rename to src/VMware/VMware.Autorest/custom/New-AzVMwareVmHostPlacementPolicyPropertiesObject.ps1
diff --git a/src/VMware/custom/README.md b/src/VMware/VMware.Autorest/custom/README.md
similarity index 100%
rename from src/VMware/custom/README.md
rename to src/VMware/VMware.Autorest/custom/README.md
diff --git a/src/VMware/custom/Remove-AzVMwareAddon.ps1 b/src/VMware/VMware.Autorest/custom/Remove-AzVMwareAddon.ps1
similarity index 100%
rename from src/VMware/custom/Remove-AzVMwareAddon.ps1
rename to src/VMware/VMware.Autorest/custom/Remove-AzVMwareAddon.ps1
diff --git a/src/VMware/custom/Remove-AzVMwarePrivateCloud.ps1 b/src/VMware/VMware.Autorest/custom/Remove-AzVMwarePrivateCloud.ps1
similarity index 100%
rename from src/VMware/custom/Remove-AzVMwarePrivateCloud.ps1
rename to src/VMware/VMware.Autorest/custom/Remove-AzVMwarePrivateCloud.ps1
diff --git a/src/VMware/docs/Az.VMware.md b/src/VMware/VMware.Autorest/docs/Az.VMware.md
similarity index 100%
rename from src/VMware/docs/Az.VMware.md
rename to src/VMware/VMware.Autorest/docs/Az.VMware.md
diff --git a/src/VMware/docs/Get-AzVMwareAddon.md b/src/VMware/VMware.Autorest/docs/Get-AzVMwareAddon.md
similarity index 100%
rename from src/VMware/docs/Get-AzVMwareAddon.md
rename to src/VMware/VMware.Autorest/docs/Get-AzVMwareAddon.md
diff --git a/src/VMware/docs/Get-AzVMwareAuthorization.md b/src/VMware/VMware.Autorest/docs/Get-AzVMwareAuthorization.md
similarity index 100%
rename from src/VMware/docs/Get-AzVMwareAuthorization.md
rename to src/VMware/VMware.Autorest/docs/Get-AzVMwareAuthorization.md
diff --git a/src/VMware/docs/Get-AzVMwareCloudLink.md b/src/VMware/VMware.Autorest/docs/Get-AzVMwareCloudLink.md
similarity index 100%
rename from src/VMware/docs/Get-AzVMwareCloudLink.md
rename to src/VMware/VMware.Autorest/docs/Get-AzVMwareCloudLink.md
diff --git a/src/VMware/docs/Get-AzVMwareCluster.md b/src/VMware/VMware.Autorest/docs/Get-AzVMwareCluster.md
similarity index 100%
rename from src/VMware/docs/Get-AzVMwareCluster.md
rename to src/VMware/VMware.Autorest/docs/Get-AzVMwareCluster.md
diff --git a/src/VMware/docs/Get-AzVMwareDatastore.md b/src/VMware/VMware.Autorest/docs/Get-AzVMwareDatastore.md
similarity index 100%
rename from src/VMware/docs/Get-AzVMwareDatastore.md
rename to src/VMware/VMware.Autorest/docs/Get-AzVMwareDatastore.md
diff --git a/src/VMware/docs/Get-AzVMwareGlobalReachConnection.md b/src/VMware/VMware.Autorest/docs/Get-AzVMwareGlobalReachConnection.md
similarity index 100%
rename from src/VMware/docs/Get-AzVMwareGlobalReachConnection.md
rename to src/VMware/VMware.Autorest/docs/Get-AzVMwareGlobalReachConnection.md
diff --git a/src/VMware/docs/Get-AzVMwarePlacementPolicy.md b/src/VMware/VMware.Autorest/docs/Get-AzVMwarePlacementPolicy.md
similarity index 100%
rename from src/VMware/docs/Get-AzVMwarePlacementPolicy.md
rename to src/VMware/VMware.Autorest/docs/Get-AzVMwarePlacementPolicy.md
diff --git a/src/VMware/docs/Get-AzVMwarePrivateCloud.md b/src/VMware/VMware.Autorest/docs/Get-AzVMwarePrivateCloud.md
similarity index 100%
rename from src/VMware/docs/Get-AzVMwarePrivateCloud.md
rename to src/VMware/VMware.Autorest/docs/Get-AzVMwarePrivateCloud.md
diff --git a/src/VMware/docs/Get-AzVMwarePrivateCloudAdminCredential.md b/src/VMware/VMware.Autorest/docs/Get-AzVMwarePrivateCloudAdminCredential.md
similarity index 100%
rename from src/VMware/docs/Get-AzVMwarePrivateCloudAdminCredential.md
rename to src/VMware/VMware.Autorest/docs/Get-AzVMwarePrivateCloudAdminCredential.md
diff --git a/src/VMware/docs/Get-AzVMwareVirtualMachine.md b/src/VMware/VMware.Autorest/docs/Get-AzVMwareVirtualMachine.md
similarity index 100%
rename from src/VMware/docs/Get-AzVMwareVirtualMachine.md
rename to src/VMware/VMware.Autorest/docs/Get-AzVMwareVirtualMachine.md
diff --git a/src/VMware/docs/New-AzVMwareAddon.md b/src/VMware/VMware.Autorest/docs/New-AzVMwareAddon.md
similarity index 100%
rename from src/VMware/docs/New-AzVMwareAddon.md
rename to src/VMware/VMware.Autorest/docs/New-AzVMwareAddon.md
diff --git a/src/VMware/docs/New-AzVMwareAddonSrmPropertiesObject.md b/src/VMware/VMware.Autorest/docs/New-AzVMwareAddonSrmPropertiesObject.md
similarity index 100%
rename from src/VMware/docs/New-AzVMwareAddonSrmPropertiesObject.md
rename to src/VMware/VMware.Autorest/docs/New-AzVMwareAddonSrmPropertiesObject.md
diff --git a/src/VMware/docs/New-AzVMwareAddonVrPropertiesObject.md b/src/VMware/VMware.Autorest/docs/New-AzVMwareAddonVrPropertiesObject.md
similarity index 100%
rename from src/VMware/docs/New-AzVMwareAddonVrPropertiesObject.md
rename to src/VMware/VMware.Autorest/docs/New-AzVMwareAddonVrPropertiesObject.md
diff --git a/src/VMware/docs/New-AzVMwareAuthorization.md b/src/VMware/VMware.Autorest/docs/New-AzVMwareAuthorization.md
similarity index 100%
rename from src/VMware/docs/New-AzVMwareAuthorization.md
rename to src/VMware/VMware.Autorest/docs/New-AzVMwareAuthorization.md
diff --git a/src/VMware/docs/New-AzVMwareCloudLink.md b/src/VMware/VMware.Autorest/docs/New-AzVMwareCloudLink.md
similarity index 100%
rename from src/VMware/docs/New-AzVMwareCloudLink.md
rename to src/VMware/VMware.Autorest/docs/New-AzVMwareCloudLink.md
diff --git a/src/VMware/docs/New-AzVMwareCluster.md b/src/VMware/VMware.Autorest/docs/New-AzVMwareCluster.md
similarity index 100%
rename from src/VMware/docs/New-AzVMwareCluster.md
rename to src/VMware/VMware.Autorest/docs/New-AzVMwareCluster.md
diff --git a/src/VMware/docs/New-AzVMwareDatastore.md b/src/VMware/VMware.Autorest/docs/New-AzVMwareDatastore.md
similarity index 100%
rename from src/VMware/docs/New-AzVMwareDatastore.md
rename to src/VMware/VMware.Autorest/docs/New-AzVMwareDatastore.md
diff --git a/src/VMware/docs/New-AzVMwareGlobalReachConnection.md b/src/VMware/VMware.Autorest/docs/New-AzVMwareGlobalReachConnection.md
similarity index 100%
rename from src/VMware/docs/New-AzVMwareGlobalReachConnection.md
rename to src/VMware/VMware.Autorest/docs/New-AzVMwareGlobalReachConnection.md
diff --git a/src/VMware/docs/New-AzVMwarePSCredentialExecutionParameterObject.md b/src/VMware/VMware.Autorest/docs/New-AzVMwarePSCredentialExecutionParameterObject.md
similarity index 100%
rename from src/VMware/docs/New-AzVMwarePSCredentialExecutionParameterObject.md
rename to src/VMware/VMware.Autorest/docs/New-AzVMwarePSCredentialExecutionParameterObject.md
diff --git a/src/VMware/docs/New-AzVMwarePlacementPolicy.md b/src/VMware/VMware.Autorest/docs/New-AzVMwarePlacementPolicy.md
similarity index 100%
rename from src/VMware/docs/New-AzVMwarePlacementPolicy.md
rename to src/VMware/VMware.Autorest/docs/New-AzVMwarePlacementPolicy.md
diff --git a/src/VMware/docs/New-AzVMwarePrivateCloud.md b/src/VMware/VMware.Autorest/docs/New-AzVMwarePrivateCloud.md
similarity index 100%
rename from src/VMware/docs/New-AzVMwarePrivateCloud.md
rename to src/VMware/VMware.Autorest/docs/New-AzVMwarePrivateCloud.md
diff --git a/src/VMware/docs/New-AzVMwarePrivateCloudNsxtPassword.md b/src/VMware/VMware.Autorest/docs/New-AzVMwarePrivateCloudNsxtPassword.md
similarity index 100%
rename from src/VMware/docs/New-AzVMwarePrivateCloudNsxtPassword.md
rename to src/VMware/VMware.Autorest/docs/New-AzVMwarePrivateCloudNsxtPassword.md
diff --git a/src/VMware/docs/New-AzVMwarePrivateCloudVcenterPassword.md b/src/VMware/VMware.Autorest/docs/New-AzVMwarePrivateCloudVcenterPassword.md
similarity index 100%
rename from src/VMware/docs/New-AzVMwarePrivateCloudVcenterPassword.md
rename to src/VMware/VMware.Autorest/docs/New-AzVMwarePrivateCloudVcenterPassword.md
diff --git a/src/VMware/docs/New-AzVMwareScriptSecureStringExecutionParameterObject.md b/src/VMware/VMware.Autorest/docs/New-AzVMwareScriptSecureStringExecutionParameterObject.md
similarity index 100%
rename from src/VMware/docs/New-AzVMwareScriptSecureStringExecutionParameterObject.md
rename to src/VMware/VMware.Autorest/docs/New-AzVMwareScriptSecureStringExecutionParameterObject.md
diff --git a/src/VMware/docs/New-AzVMwareScriptStringExecutionParameterObject.md b/src/VMware/VMware.Autorest/docs/New-AzVMwareScriptStringExecutionParameterObject.md
similarity index 100%
rename from src/VMware/docs/New-AzVMwareScriptStringExecutionParameterObject.md
rename to src/VMware/VMware.Autorest/docs/New-AzVMwareScriptStringExecutionParameterObject.md
diff --git a/src/VMware/docs/New-AzVMwareVMPlacementPolicyPropertiesObject.md b/src/VMware/VMware.Autorest/docs/New-AzVMwareVMPlacementPolicyPropertiesObject.md
similarity index 100%
rename from src/VMware/docs/New-AzVMwareVMPlacementPolicyPropertiesObject.md
rename to src/VMware/VMware.Autorest/docs/New-AzVMwareVMPlacementPolicyPropertiesObject.md
diff --git a/src/VMware/docs/New-AzVMwareVmHostPlacementPolicyPropertiesObject.md b/src/VMware/VMware.Autorest/docs/New-AzVMwareVmHostPlacementPolicyPropertiesObject.md
similarity index 100%
rename from src/VMware/docs/New-AzVMwareVmHostPlacementPolicyPropertiesObject.md
rename to src/VMware/VMware.Autorest/docs/New-AzVMwareVmHostPlacementPolicyPropertiesObject.md
diff --git a/src/VMware/docs/README.md b/src/VMware/VMware.Autorest/docs/README.md
similarity index 100%
rename from src/VMware/docs/README.md
rename to src/VMware/VMware.Autorest/docs/README.md
diff --git a/src/VMware/docs/Remove-AzVMwareAddon.md b/src/VMware/VMware.Autorest/docs/Remove-AzVMwareAddon.md
similarity index 100%
rename from src/VMware/docs/Remove-AzVMwareAddon.md
rename to src/VMware/VMware.Autorest/docs/Remove-AzVMwareAddon.md
diff --git a/src/VMware/docs/Remove-AzVMwareAuthorization.md b/src/VMware/VMware.Autorest/docs/Remove-AzVMwareAuthorization.md
similarity index 100%
rename from src/VMware/docs/Remove-AzVMwareAuthorization.md
rename to src/VMware/VMware.Autorest/docs/Remove-AzVMwareAuthorization.md
diff --git a/src/VMware/docs/Remove-AzVMwareCloudLink.md b/src/VMware/VMware.Autorest/docs/Remove-AzVMwareCloudLink.md
similarity index 100%
rename from src/VMware/docs/Remove-AzVMwareCloudLink.md
rename to src/VMware/VMware.Autorest/docs/Remove-AzVMwareCloudLink.md
diff --git a/src/VMware/docs/Remove-AzVMwareCluster.md b/src/VMware/VMware.Autorest/docs/Remove-AzVMwareCluster.md
similarity index 100%
rename from src/VMware/docs/Remove-AzVMwareCluster.md
rename to src/VMware/VMware.Autorest/docs/Remove-AzVMwareCluster.md
diff --git a/src/VMware/docs/Remove-AzVMwareDatastore.md b/src/VMware/VMware.Autorest/docs/Remove-AzVMwareDatastore.md
similarity index 100%
rename from src/VMware/docs/Remove-AzVMwareDatastore.md
rename to src/VMware/VMware.Autorest/docs/Remove-AzVMwareDatastore.md
diff --git a/src/VMware/docs/Remove-AzVMwareGlobalReachConnection.md b/src/VMware/VMware.Autorest/docs/Remove-AzVMwareGlobalReachConnection.md
similarity index 100%
rename from src/VMware/docs/Remove-AzVMwareGlobalReachConnection.md
rename to src/VMware/VMware.Autorest/docs/Remove-AzVMwareGlobalReachConnection.md
diff --git a/src/VMware/docs/Remove-AzVMwarePlacementPolicy.md b/src/VMware/VMware.Autorest/docs/Remove-AzVMwarePlacementPolicy.md
similarity index 100%
rename from src/VMware/docs/Remove-AzVMwarePlacementPolicy.md
rename to src/VMware/VMware.Autorest/docs/Remove-AzVMwarePlacementPolicy.md
diff --git a/src/VMware/docs/Remove-AzVMwarePrivateCloud.md b/src/VMware/VMware.Autorest/docs/Remove-AzVMwarePrivateCloud.md
similarity index 100%
rename from src/VMware/docs/Remove-AzVMwarePrivateCloud.md
rename to src/VMware/VMware.Autorest/docs/Remove-AzVMwarePrivateCloud.md
diff --git a/src/VMware/docs/Test-AzVMwareLocationQuotaAvailability.md b/src/VMware/VMware.Autorest/docs/Test-AzVMwareLocationQuotaAvailability.md
similarity index 100%
rename from src/VMware/docs/Test-AzVMwareLocationQuotaAvailability.md
rename to src/VMware/VMware.Autorest/docs/Test-AzVMwareLocationQuotaAvailability.md
diff --git a/src/VMware/docs/Test-AzVMwareLocationTrialAvailability.md b/src/VMware/VMware.Autorest/docs/Test-AzVMwareLocationTrialAvailability.md
similarity index 100%
rename from src/VMware/docs/Test-AzVMwareLocationTrialAvailability.md
rename to src/VMware/VMware.Autorest/docs/Test-AzVMwareLocationTrialAvailability.md
diff --git a/src/VMware/docs/Update-AzVMwareCluster.md b/src/VMware/VMware.Autorest/docs/Update-AzVMwareCluster.md
similarity index 100%
rename from src/VMware/docs/Update-AzVMwareCluster.md
rename to src/VMware/VMware.Autorest/docs/Update-AzVMwareCluster.md
diff --git a/src/VMware/docs/Update-AzVMwarePlacementPolicy.md b/src/VMware/VMware.Autorest/docs/Update-AzVMwarePlacementPolicy.md
similarity index 100%
rename from src/VMware/docs/Update-AzVMwarePlacementPolicy.md
rename to src/VMware/VMware.Autorest/docs/Update-AzVMwarePlacementPolicy.md
diff --git a/src/VMware/docs/Update-AzVMwarePrivateCloud.md b/src/VMware/VMware.Autorest/docs/Update-AzVMwarePrivateCloud.md
similarity index 100%
rename from src/VMware/docs/Update-AzVMwarePrivateCloud.md
rename to src/VMware/VMware.Autorest/docs/Update-AzVMwarePrivateCloud.md
diff --git a/src/VMware/examples/Get-AzVMwareAddon.md b/src/VMware/VMware.Autorest/examples/Get-AzVMwareAddon.md
similarity index 100%
rename from src/VMware/examples/Get-AzVMwareAddon.md
rename to src/VMware/VMware.Autorest/examples/Get-AzVMwareAddon.md
diff --git a/src/VMware/examples/Get-AzVMwareAuthorization.md b/src/VMware/VMware.Autorest/examples/Get-AzVMwareAuthorization.md
similarity index 100%
rename from src/VMware/examples/Get-AzVMwareAuthorization.md
rename to src/VMware/VMware.Autorest/examples/Get-AzVMwareAuthorization.md
diff --git a/src/VMware/examples/Get-AzVMwareCloudLink.md b/src/VMware/VMware.Autorest/examples/Get-AzVMwareCloudLink.md
similarity index 100%
rename from src/VMware/examples/Get-AzVMwareCloudLink.md
rename to src/VMware/VMware.Autorest/examples/Get-AzVMwareCloudLink.md
diff --git a/src/VMware/examples/Get-AzVMwareCluster.md b/src/VMware/VMware.Autorest/examples/Get-AzVMwareCluster.md
similarity index 100%
rename from src/VMware/examples/Get-AzVMwareCluster.md
rename to src/VMware/VMware.Autorest/examples/Get-AzVMwareCluster.md
diff --git a/src/VMware/examples/Get-AzVMwareDatastore.md b/src/VMware/VMware.Autorest/examples/Get-AzVMwareDatastore.md
similarity index 100%
rename from src/VMware/examples/Get-AzVMwareDatastore.md
rename to src/VMware/VMware.Autorest/examples/Get-AzVMwareDatastore.md
diff --git a/src/VMware/examples/Get-AzVMwareGlobalReachConnection.md b/src/VMware/VMware.Autorest/examples/Get-AzVMwareGlobalReachConnection.md
similarity index 100%
rename from src/VMware/examples/Get-AzVMwareGlobalReachConnection.md
rename to src/VMware/VMware.Autorest/examples/Get-AzVMwareGlobalReachConnection.md
diff --git a/src/VMware/examples/Get-AzVMwarePlacementPolicy.md b/src/VMware/VMware.Autorest/examples/Get-AzVMwarePlacementPolicy.md
similarity index 100%
rename from src/VMware/examples/Get-AzVMwarePlacementPolicy.md
rename to src/VMware/VMware.Autorest/examples/Get-AzVMwarePlacementPolicy.md
diff --git a/src/VMware/examples/Get-AzVMwarePrivateCloud.md b/src/VMware/VMware.Autorest/examples/Get-AzVMwarePrivateCloud.md
similarity index 100%
rename from src/VMware/examples/Get-AzVMwarePrivateCloud.md
rename to src/VMware/VMware.Autorest/examples/Get-AzVMwarePrivateCloud.md
diff --git a/src/VMware/examples/Get-AzVMwarePrivateCloudAdminCredential.md b/src/VMware/VMware.Autorest/examples/Get-AzVMwarePrivateCloudAdminCredential.md
similarity index 100%
rename from src/VMware/examples/Get-AzVMwarePrivateCloudAdminCredential.md
rename to src/VMware/VMware.Autorest/examples/Get-AzVMwarePrivateCloudAdminCredential.md
diff --git a/src/VMware/examples/Get-AzVMwareVirtualMachine.md b/src/VMware/VMware.Autorest/examples/Get-AzVMwareVirtualMachine.md
similarity index 100%
rename from src/VMware/examples/Get-AzVMwareVirtualMachine.md
rename to src/VMware/VMware.Autorest/examples/Get-AzVMwareVirtualMachine.md
diff --git a/src/VMware/examples/New-AzVMwareAddon.md b/src/VMware/VMware.Autorest/examples/New-AzVMwareAddon.md
similarity index 100%
rename from src/VMware/examples/New-AzVMwareAddon.md
rename to src/VMware/VMware.Autorest/examples/New-AzVMwareAddon.md
diff --git a/src/VMware/examples/New-AzVMwareAddonSrmPropertiesObject.md b/src/VMware/VMware.Autorest/examples/New-AzVMwareAddonSrmPropertiesObject.md
similarity index 100%
rename from src/VMware/examples/New-AzVMwareAddonSrmPropertiesObject.md
rename to src/VMware/VMware.Autorest/examples/New-AzVMwareAddonSrmPropertiesObject.md
diff --git a/src/VMware/examples/New-AzVMwareAddonVrPropertiesObject.md b/src/VMware/VMware.Autorest/examples/New-AzVMwareAddonVrPropertiesObject.md
similarity index 100%
rename from src/VMware/examples/New-AzVMwareAddonVrPropertiesObject.md
rename to src/VMware/VMware.Autorest/examples/New-AzVMwareAddonVrPropertiesObject.md
diff --git a/src/VMware/examples/New-AzVMwareAuthorization.md b/src/VMware/VMware.Autorest/examples/New-AzVMwareAuthorization.md
similarity index 100%
rename from src/VMware/examples/New-AzVMwareAuthorization.md
rename to src/VMware/VMware.Autorest/examples/New-AzVMwareAuthorization.md
diff --git a/src/VMware/examples/New-AzVMwareCloudLink.md b/src/VMware/VMware.Autorest/examples/New-AzVMwareCloudLink.md
similarity index 100%
rename from src/VMware/examples/New-AzVMwareCloudLink.md
rename to src/VMware/VMware.Autorest/examples/New-AzVMwareCloudLink.md
diff --git a/src/VMware/examples/New-AzVMwareCluster.md b/src/VMware/VMware.Autorest/examples/New-AzVMwareCluster.md
similarity index 100%
rename from src/VMware/examples/New-AzVMwareCluster.md
rename to src/VMware/VMware.Autorest/examples/New-AzVMwareCluster.md
diff --git a/src/VMware/examples/New-AzVMwareDatastore.md b/src/VMware/VMware.Autorest/examples/New-AzVMwareDatastore.md
similarity index 100%
rename from src/VMware/examples/New-AzVMwareDatastore.md
rename to src/VMware/VMware.Autorest/examples/New-AzVMwareDatastore.md
diff --git a/src/VMware/examples/New-AzVMwareGlobalReachConnection.md b/src/VMware/VMware.Autorest/examples/New-AzVMwareGlobalReachConnection.md
similarity index 100%
rename from src/VMware/examples/New-AzVMwareGlobalReachConnection.md
rename to src/VMware/VMware.Autorest/examples/New-AzVMwareGlobalReachConnection.md
diff --git a/src/VMware/examples/New-AzVMwarePSCredentialExecutionParameterObject.md b/src/VMware/VMware.Autorest/examples/New-AzVMwarePSCredentialExecutionParameterObject.md
similarity index 100%
rename from src/VMware/examples/New-AzVMwarePSCredentialExecutionParameterObject.md
rename to src/VMware/VMware.Autorest/examples/New-AzVMwarePSCredentialExecutionParameterObject.md
diff --git a/src/VMware/examples/New-AzVMwarePlacementPolicy.md b/src/VMware/VMware.Autorest/examples/New-AzVMwarePlacementPolicy.md
similarity index 100%
rename from src/VMware/examples/New-AzVMwarePlacementPolicy.md
rename to src/VMware/VMware.Autorest/examples/New-AzVMwarePlacementPolicy.md
diff --git a/src/VMware/examples/New-AzVMwarePrivateCloud.md b/src/VMware/VMware.Autorest/examples/New-AzVMwarePrivateCloud.md
similarity index 100%
rename from src/VMware/examples/New-AzVMwarePrivateCloud.md
rename to src/VMware/VMware.Autorest/examples/New-AzVMwarePrivateCloud.md
diff --git a/src/VMware/examples/New-AzVMwarePrivateCloudNsxtPassword.md b/src/VMware/VMware.Autorest/examples/New-AzVMwarePrivateCloudNsxtPassword.md
similarity index 100%
rename from src/VMware/examples/New-AzVMwarePrivateCloudNsxtPassword.md
rename to src/VMware/VMware.Autorest/examples/New-AzVMwarePrivateCloudNsxtPassword.md
diff --git a/src/VMware/examples/New-AzVMwarePrivateCloudVcenterPassword.md b/src/VMware/VMware.Autorest/examples/New-AzVMwarePrivateCloudVcenterPassword.md
similarity index 100%
rename from src/VMware/examples/New-AzVMwarePrivateCloudVcenterPassword.md
rename to src/VMware/VMware.Autorest/examples/New-AzVMwarePrivateCloudVcenterPassword.md
diff --git a/src/VMware/examples/New-AzVMwareScriptSecureStringExecutionParameterObject.md b/src/VMware/VMware.Autorest/examples/New-AzVMwareScriptSecureStringExecutionParameterObject.md
similarity index 100%
rename from src/VMware/examples/New-AzVMwareScriptSecureStringExecutionParameterObject.md
rename to src/VMware/VMware.Autorest/examples/New-AzVMwareScriptSecureStringExecutionParameterObject.md
diff --git a/src/VMware/examples/New-AzVMwareScriptStringExecutionParameterObject.md b/src/VMware/VMware.Autorest/examples/New-AzVMwareScriptStringExecutionParameterObject.md
similarity index 100%
rename from src/VMware/examples/New-AzVMwareScriptStringExecutionParameterObject.md
rename to src/VMware/VMware.Autorest/examples/New-AzVMwareScriptStringExecutionParameterObject.md
diff --git a/src/VMware/examples/New-AzVMwareVMPlacementPolicyPropertiesObject.md b/src/VMware/VMware.Autorest/examples/New-AzVMwareVMPlacementPolicyPropertiesObject.md
similarity index 100%
rename from src/VMware/examples/New-AzVMwareVMPlacementPolicyPropertiesObject.md
rename to src/VMware/VMware.Autorest/examples/New-AzVMwareVMPlacementPolicyPropertiesObject.md
diff --git a/src/VMware/examples/New-AzVMwareVmHostPlacementPolicyPropertiesObject.md b/src/VMware/VMware.Autorest/examples/New-AzVMwareVmHostPlacementPolicyPropertiesObject.md
similarity index 100%
rename from src/VMware/examples/New-AzVMwareVmHostPlacementPolicyPropertiesObject.md
rename to src/VMware/VMware.Autorest/examples/New-AzVMwareVmHostPlacementPolicyPropertiesObject.md
diff --git a/src/VMware/examples/Remove-AzVMwareAddon.md b/src/VMware/VMware.Autorest/examples/Remove-AzVMwareAddon.md
similarity index 100%
rename from src/VMware/examples/Remove-AzVMwareAddon.md
rename to src/VMware/VMware.Autorest/examples/Remove-AzVMwareAddon.md
diff --git a/src/VMware/examples/Remove-AzVMwareAuthorization.md b/src/VMware/VMware.Autorest/examples/Remove-AzVMwareAuthorization.md
similarity index 100%
rename from src/VMware/examples/Remove-AzVMwareAuthorization.md
rename to src/VMware/VMware.Autorest/examples/Remove-AzVMwareAuthorization.md
diff --git a/src/VMware/examples/Remove-AzVMwareCloudLink.md b/src/VMware/VMware.Autorest/examples/Remove-AzVMwareCloudLink.md
similarity index 100%
rename from src/VMware/examples/Remove-AzVMwareCloudLink.md
rename to src/VMware/VMware.Autorest/examples/Remove-AzVMwareCloudLink.md
diff --git a/src/VMware/examples/Remove-AzVMwareCluster.md b/src/VMware/VMware.Autorest/examples/Remove-AzVMwareCluster.md
similarity index 100%
rename from src/VMware/examples/Remove-AzVMwareCluster.md
rename to src/VMware/VMware.Autorest/examples/Remove-AzVMwareCluster.md
diff --git a/src/VMware/examples/Remove-AzVMwareDatastore.md b/src/VMware/VMware.Autorest/examples/Remove-AzVMwareDatastore.md
similarity index 100%
rename from src/VMware/examples/Remove-AzVMwareDatastore.md
rename to src/VMware/VMware.Autorest/examples/Remove-AzVMwareDatastore.md
diff --git a/src/VMware/examples/Remove-AzVMwareGlobalReachConnection.md b/src/VMware/VMware.Autorest/examples/Remove-AzVMwareGlobalReachConnection.md
similarity index 100%
rename from src/VMware/examples/Remove-AzVMwareGlobalReachConnection.md
rename to src/VMware/VMware.Autorest/examples/Remove-AzVMwareGlobalReachConnection.md
diff --git a/src/VMware/examples/Remove-AzVMwarePlacementPolicy.md b/src/VMware/VMware.Autorest/examples/Remove-AzVMwarePlacementPolicy.md
similarity index 100%
rename from src/VMware/examples/Remove-AzVMwarePlacementPolicy.md
rename to src/VMware/VMware.Autorest/examples/Remove-AzVMwarePlacementPolicy.md
diff --git a/src/VMware/examples/Remove-AzVMwarePrivateCloud.md b/src/VMware/VMware.Autorest/examples/Remove-AzVMwarePrivateCloud.md
similarity index 100%
rename from src/VMware/examples/Remove-AzVMwarePrivateCloud.md
rename to src/VMware/VMware.Autorest/examples/Remove-AzVMwarePrivateCloud.md
diff --git a/src/VMware/examples/Test-AzVMwareLocationQuotaAvailability.md b/src/VMware/VMware.Autorest/examples/Test-AzVMwareLocationQuotaAvailability.md
similarity index 100%
rename from src/VMware/examples/Test-AzVMwareLocationQuotaAvailability.md
rename to src/VMware/VMware.Autorest/examples/Test-AzVMwareLocationQuotaAvailability.md
diff --git a/src/VMware/examples/Test-AzVMwareLocationTrialAvailability.md b/src/VMware/VMware.Autorest/examples/Test-AzVMwareLocationTrialAvailability.md
similarity index 100%
rename from src/VMware/examples/Test-AzVMwareLocationTrialAvailability.md
rename to src/VMware/VMware.Autorest/examples/Test-AzVMwareLocationTrialAvailability.md
diff --git a/src/VMware/examples/Update-AzVMwareCluster.md b/src/VMware/VMware.Autorest/examples/Update-AzVMwareCluster.md
similarity index 100%
rename from src/VMware/examples/Update-AzVMwareCluster.md
rename to src/VMware/VMware.Autorest/examples/Update-AzVMwareCluster.md
diff --git a/src/VMware/examples/Update-AzVMwarePlacementPolicy.md b/src/VMware/VMware.Autorest/examples/Update-AzVMwarePlacementPolicy.md
similarity index 100%
rename from src/VMware/examples/Update-AzVMwarePlacementPolicy.md
rename to src/VMware/VMware.Autorest/examples/Update-AzVMwarePlacementPolicy.md
diff --git a/src/VMware/examples/Update-AzVMwarePrivateCloud.md b/src/VMware/VMware.Autorest/examples/Update-AzVMwarePrivateCloud.md
similarity index 100%
rename from src/VMware/examples/Update-AzVMwarePrivateCloud.md
rename to src/VMware/VMware.Autorest/examples/Update-AzVMwarePrivateCloud.md
diff --git a/src/VMware/how-to.md b/src/VMware/VMware.Autorest/how-to.md
similarity index 100%
rename from src/VMware/how-to.md
rename to src/VMware/VMware.Autorest/how-to.md
diff --git a/src/VMware/license.txt b/src/VMware/VMware.Autorest/license.txt
similarity index 100%
rename from src/VMware/license.txt
rename to src/VMware/VMware.Autorest/license.txt
diff --git a/src/VMware/resources/README.md b/src/VMware/VMware.Autorest/resources/README.md
similarity index 100%
rename from src/VMware/resources/README.md
rename to src/VMware/VMware.Autorest/resources/README.md
diff --git a/src/VMware/test/AzVMwareAddon.Recording.json b/src/VMware/VMware.Autorest/test/AzVMwareAddon.Recording.json
similarity index 100%
rename from src/VMware/test/AzVMwareAddon.Recording.json
rename to src/VMware/VMware.Autorest/test/AzVMwareAddon.Recording.json
diff --git a/src/VMware/test/AzVMwareAddon.Tests.ps1 b/src/VMware/VMware.Autorest/test/AzVMwareAddon.Tests.ps1
similarity index 100%
rename from src/VMware/test/AzVMwareAddon.Tests.ps1
rename to src/VMware/VMware.Autorest/test/AzVMwareAddon.Tests.ps1
diff --git a/src/VMware/test/AzVMwareAddonSrmPropertiesObject.Tests.ps1 b/src/VMware/VMware.Autorest/test/AzVMwareAddonSrmPropertiesObject.Tests.ps1
similarity index 100%
rename from src/VMware/test/AzVMwareAddonSrmPropertiesObject.Tests.ps1
rename to src/VMware/VMware.Autorest/test/AzVMwareAddonSrmPropertiesObject.Tests.ps1
diff --git a/src/VMware/test/AzVMwareAddonVrPropertiesObject.Tests.ps1 b/src/VMware/VMware.Autorest/test/AzVMwareAddonVrPropertiesObject.Tests.ps1
similarity index 100%
rename from src/VMware/test/AzVMwareAddonVrPropertiesObject.Tests.ps1
rename to src/VMware/VMware.Autorest/test/AzVMwareAddonVrPropertiesObject.Tests.ps1
diff --git a/src/VMware/test/AzVMwareAuthorization.Recording.json b/src/VMware/VMware.Autorest/test/AzVMwareAuthorization.Recording.json
similarity index 100%
rename from src/VMware/test/AzVMwareAuthorization.Recording.json
rename to src/VMware/VMware.Autorest/test/AzVMwareAuthorization.Recording.json
diff --git a/src/VMware/test/AzVMwareAuthorization.Tests.ps1 b/src/VMware/VMware.Autorest/test/AzVMwareAuthorization.Tests.ps1
similarity index 100%
rename from src/VMware/test/AzVMwareAuthorization.Tests.ps1
rename to src/VMware/VMware.Autorest/test/AzVMwareAuthorization.Tests.ps1
diff --git a/src/VMware/test/AzVMwareCloudLink.Recording.json b/src/VMware/VMware.Autorest/test/AzVMwareCloudLink.Recording.json
similarity index 100%
rename from src/VMware/test/AzVMwareCloudLink.Recording.json
rename to src/VMware/VMware.Autorest/test/AzVMwareCloudLink.Recording.json
diff --git a/src/VMware/test/AzVMwareCloudLink.Tests.ps1 b/src/VMware/VMware.Autorest/test/AzVMwareCloudLink.Tests.ps1
similarity index 100%
rename from src/VMware/test/AzVMwareCloudLink.Tests.ps1
rename to src/VMware/VMware.Autorest/test/AzVMwareCloudLink.Tests.ps1
diff --git a/src/VMware/test/AzVMwareCluster.Recording.json b/src/VMware/VMware.Autorest/test/AzVMwareCluster.Recording.json
similarity index 100%
rename from src/VMware/test/AzVMwareCluster.Recording.json
rename to src/VMware/VMware.Autorest/test/AzVMwareCluster.Recording.json
diff --git a/src/VMware/test/AzVMwareCluster.Tests.ps1 b/src/VMware/VMware.Autorest/test/AzVMwareCluster.Tests.ps1
similarity index 100%
rename from src/VMware/test/AzVMwareCluster.Tests.ps1
rename to src/VMware/VMware.Autorest/test/AzVMwareCluster.Tests.ps1
diff --git a/src/VMware/test/AzVMwareDatastore.Recording.json b/src/VMware/VMware.Autorest/test/AzVMwareDatastore.Recording.json
similarity index 100%
rename from src/VMware/test/AzVMwareDatastore.Recording.json
rename to src/VMware/VMware.Autorest/test/AzVMwareDatastore.Recording.json
diff --git a/src/VMware/test/AzVMwareDatastore.Tests.ps1 b/src/VMware/VMware.Autorest/test/AzVMwareDatastore.Tests.ps1
similarity index 100%
rename from src/VMware/test/AzVMwareDatastore.Tests.ps1
rename to src/VMware/VMware.Autorest/test/AzVMwareDatastore.Tests.ps1
diff --git a/src/VMware/test/AzVMwareGlobalReachConnection.Recording.json b/src/VMware/VMware.Autorest/test/AzVMwareGlobalReachConnection.Recording.json
similarity index 100%
rename from src/VMware/test/AzVMwareGlobalReachConnection.Recording.json
rename to src/VMware/VMware.Autorest/test/AzVMwareGlobalReachConnection.Recording.json
diff --git a/src/VMware/test/AzVMwareGlobalReachConnection.Tests.ps1 b/src/VMware/VMware.Autorest/test/AzVMwareGlobalReachConnection.Tests.ps1
similarity index 100%
rename from src/VMware/test/AzVMwareGlobalReachConnection.Tests.ps1
rename to src/VMware/VMware.Autorest/test/AzVMwareGlobalReachConnection.Tests.ps1
diff --git a/src/VMware/test/AzVMwareLocationQuotaAvailability.Recording.json b/src/VMware/VMware.Autorest/test/AzVMwareLocationQuotaAvailability.Recording.json
similarity index 100%
rename from src/VMware/test/AzVMwareLocationQuotaAvailability.Recording.json
rename to src/VMware/VMware.Autorest/test/AzVMwareLocationQuotaAvailability.Recording.json
diff --git a/src/VMware/test/AzVMwareLocationQuotaAvailability.Tests.ps1 b/src/VMware/VMware.Autorest/test/AzVMwareLocationQuotaAvailability.Tests.ps1
similarity index 100%
rename from src/VMware/test/AzVMwareLocationQuotaAvailability.Tests.ps1
rename to src/VMware/VMware.Autorest/test/AzVMwareLocationQuotaAvailability.Tests.ps1
diff --git a/src/VMware/test/AzVMwareLocationTrialAvailability.Recording.json b/src/VMware/VMware.Autorest/test/AzVMwareLocationTrialAvailability.Recording.json
similarity index 100%
rename from src/VMware/test/AzVMwareLocationTrialAvailability.Recording.json
rename to src/VMware/VMware.Autorest/test/AzVMwareLocationTrialAvailability.Recording.json
diff --git a/src/VMware/test/AzVMwareLocationTrialAvailability.Tests.ps1 b/src/VMware/VMware.Autorest/test/AzVMwareLocationTrialAvailability.Tests.ps1
similarity index 100%
rename from src/VMware/test/AzVMwareLocationTrialAvailability.Tests.ps1
rename to src/VMware/VMware.Autorest/test/AzVMwareLocationTrialAvailability.Tests.ps1
diff --git a/src/VMware/test/AzVMwarePSCredentialExecutionParameterObject.Tests.ps1 b/src/VMware/VMware.Autorest/test/AzVMwarePSCredentialExecutionParameterObject.Tests.ps1
similarity index 100%
rename from src/VMware/test/AzVMwarePSCredentialExecutionParameterObject.Tests.ps1
rename to src/VMware/VMware.Autorest/test/AzVMwarePSCredentialExecutionParameterObject.Tests.ps1
diff --git a/src/VMware/test/AzVMwarePlacementPolicy.Recording.json b/src/VMware/VMware.Autorest/test/AzVMwarePlacementPolicy.Recording.json
similarity index 100%
rename from src/VMware/test/AzVMwarePlacementPolicy.Recording.json
rename to src/VMware/VMware.Autorest/test/AzVMwarePlacementPolicy.Recording.json
diff --git a/src/VMware/test/AzVMwarePlacementPolicy.Tests.ps1 b/src/VMware/VMware.Autorest/test/AzVMwarePlacementPolicy.Tests.ps1
similarity index 100%
rename from src/VMware/test/AzVMwarePlacementPolicy.Tests.ps1
rename to src/VMware/VMware.Autorest/test/AzVMwarePlacementPolicy.Tests.ps1
diff --git a/src/VMware/test/AzVMwarePrivateCloud.Recording.json b/src/VMware/VMware.Autorest/test/AzVMwarePrivateCloud.Recording.json
similarity index 100%
rename from src/VMware/test/AzVMwarePrivateCloud.Recording.json
rename to src/VMware/VMware.Autorest/test/AzVMwarePrivateCloud.Recording.json
diff --git a/src/VMware/test/AzVMwarePrivateCloud.Tests.ps1 b/src/VMware/VMware.Autorest/test/AzVMwarePrivateCloud.Tests.ps1
similarity index 100%
rename from src/VMware/test/AzVMwarePrivateCloud.Tests.ps1
rename to src/VMware/VMware.Autorest/test/AzVMwarePrivateCloud.Tests.ps1
diff --git a/src/VMware/test/AzVMwarePrivateCloudAdminCredential.Recording.json b/src/VMware/VMware.Autorest/test/AzVMwarePrivateCloudAdminCredential.Recording.json
similarity index 100%
rename from src/VMware/test/AzVMwarePrivateCloudAdminCredential.Recording.json
rename to src/VMware/VMware.Autorest/test/AzVMwarePrivateCloudAdminCredential.Recording.json
diff --git a/src/VMware/test/AzVMwarePrivateCloudAdminCredential.Tests.ps1 b/src/VMware/VMware.Autorest/test/AzVMwarePrivateCloudAdminCredential.Tests.ps1
similarity index 100%
rename from src/VMware/test/AzVMwarePrivateCloudAdminCredential.Tests.ps1
rename to src/VMware/VMware.Autorest/test/AzVMwarePrivateCloudAdminCredential.Tests.ps1
diff --git a/src/VMware/test/AzVMwarePrivateCloudNsxtPassword.Recording.json b/src/VMware/VMware.Autorest/test/AzVMwarePrivateCloudNsxtPassword.Recording.json
similarity index 100%
rename from src/VMware/test/AzVMwarePrivateCloudNsxtPassword.Recording.json
rename to src/VMware/VMware.Autorest/test/AzVMwarePrivateCloudNsxtPassword.Recording.json
diff --git a/src/VMware/test/AzVMwarePrivateCloudNsxtPassword.Tests.ps1 b/src/VMware/VMware.Autorest/test/AzVMwarePrivateCloudNsxtPassword.Tests.ps1
similarity index 100%
rename from src/VMware/test/AzVMwarePrivateCloudNsxtPassword.Tests.ps1
rename to src/VMware/VMware.Autorest/test/AzVMwarePrivateCloudNsxtPassword.Tests.ps1
diff --git a/src/VMware/test/AzVMwarePrivateCloudVcenterPassword.Recording.json b/src/VMware/VMware.Autorest/test/AzVMwarePrivateCloudVcenterPassword.Recording.json
similarity index 100%
rename from src/VMware/test/AzVMwarePrivateCloudVcenterPassword.Recording.json
rename to src/VMware/VMware.Autorest/test/AzVMwarePrivateCloudVcenterPassword.Recording.json
diff --git a/src/VMware/test/AzVMwarePrivateCloudVcenterPassword.Tests.ps1 b/src/VMware/VMware.Autorest/test/AzVMwarePrivateCloudVcenterPassword.Tests.ps1
similarity index 100%
rename from src/VMware/test/AzVMwarePrivateCloudVcenterPassword.Tests.ps1
rename to src/VMware/VMware.Autorest/test/AzVMwarePrivateCloudVcenterPassword.Tests.ps1
diff --git a/src/VMware/test/AzVMwareScriptSecureStringExecutionParameterObject.Tests.ps1 b/src/VMware/VMware.Autorest/test/AzVMwareScriptSecureStringExecutionParameterObject.Tests.ps1
similarity index 100%
rename from src/VMware/test/AzVMwareScriptSecureStringExecutionParameterObject.Tests.ps1
rename to src/VMware/VMware.Autorest/test/AzVMwareScriptSecureStringExecutionParameterObject.Tests.ps1
diff --git a/src/VMware/test/AzVMwareScriptStringExecutionParameterObject.Tests.ps1 b/src/VMware/VMware.Autorest/test/AzVMwareScriptStringExecutionParameterObject.Tests.ps1
similarity index 100%
rename from src/VMware/test/AzVMwareScriptStringExecutionParameterObject.Tests.ps1
rename to src/VMware/VMware.Autorest/test/AzVMwareScriptStringExecutionParameterObject.Tests.ps1
diff --git a/src/VMware/test/AzVMwareVMPlacementPolicyPropertiesObject.Tests.ps1 b/src/VMware/VMware.Autorest/test/AzVMwareVMPlacementPolicyPropertiesObject.Tests.ps1
similarity index 100%
rename from src/VMware/test/AzVMwareVMPlacementPolicyPropertiesObject.Tests.ps1
rename to src/VMware/VMware.Autorest/test/AzVMwareVMPlacementPolicyPropertiesObject.Tests.ps1
diff --git a/src/VMware/test/AzVMwareVirtualMachine.Recording.json b/src/VMware/VMware.Autorest/test/AzVMwareVirtualMachine.Recording.json
similarity index 100%
rename from src/VMware/test/AzVMwareVirtualMachine.Recording.json
rename to src/VMware/VMware.Autorest/test/AzVMwareVirtualMachine.Recording.json
diff --git a/src/VMware/test/AzVMwareVirtualMachine.Tests.ps1 b/src/VMware/VMware.Autorest/test/AzVMwareVirtualMachine.Tests.ps1
similarity index 100%
rename from src/VMware/test/AzVMwareVirtualMachine.Tests.ps1
rename to src/VMware/VMware.Autorest/test/AzVMwareVirtualMachine.Tests.ps1
diff --git a/src/VMware/test/AzVMwareVmHostPlacementPolicyPropertiesObject.Tests.ps1 b/src/VMware/VMware.Autorest/test/AzVMwareVmHostPlacementPolicyPropertiesObject.Tests.ps1
similarity index 100%
rename from src/VMware/test/AzVMwareVmHostPlacementPolicyPropertiesObject.Tests.ps1
rename to src/VMware/VMware.Autorest/test/AzVMwareVmHostPlacementPolicyPropertiesObject.Tests.ps1
diff --git a/src/VMware/test/README.md b/src/VMware/VMware.Autorest/test/README.md
similarity index 100%
rename from src/VMware/test/README.md
rename to src/VMware/VMware.Autorest/test/README.md
diff --git a/src/VMware/test/env.json b/src/VMware/VMware.Autorest/test/env.json
similarity index 100%
rename from src/VMware/test/env.json
rename to src/VMware/VMware.Autorest/test/env.json
diff --git a/src/VMware/test/loadEnv.ps1 b/src/VMware/VMware.Autorest/test/loadEnv.ps1
similarity index 100%
rename from src/VMware/test/loadEnv.ps1
rename to src/VMware/VMware.Autorest/test/loadEnv.ps1
diff --git a/src/VMware/test/utils.ps1 b/src/VMware/VMware.Autorest/test/utils.ps1
similarity index 100%
rename from src/VMware/test/utils.ps1
rename to src/VMware/VMware.Autorest/test/utils.ps1
diff --git a/src/VMware/utils/Unprotect-SecureString.ps1 b/src/VMware/VMware.Autorest/utils/Unprotect-SecureString.ps1
similarity index 100%
rename from src/VMware/utils/Unprotect-SecureString.ps1
rename to src/VMware/VMware.Autorest/utils/Unprotect-SecureString.ps1
diff --git a/src/VoiceServices/.gitattributes b/src/VoiceServices/VoiceServices.Autorest/.gitattributes
similarity index 100%
rename from src/VoiceServices/.gitattributes
rename to src/VoiceServices/VoiceServices.Autorest/.gitattributes
diff --git a/src/VoiceServices/.gitignore b/src/VoiceServices/VoiceServices.Autorest/.gitignore
similarity index 100%
rename from src/VoiceServices/.gitignore
rename to src/VoiceServices/VoiceServices.Autorest/.gitignore
diff --git a/src/VoiceServices/Az.VoiceServices.psd1 b/src/VoiceServices/VoiceServices.Autorest/Az.VoiceServices.psd1
similarity index 100%
rename from src/VoiceServices/Az.VoiceServices.psd1
rename to src/VoiceServices/VoiceServices.Autorest/Az.VoiceServices.psd1
diff --git a/src/VoiceServices/README.md b/src/VoiceServices/VoiceServices.Autorest/README.md
similarity index 100%
rename from src/VoiceServices/README.md
rename to src/VoiceServices/VoiceServices.Autorest/README.md
diff --git a/src/VoiceServices/UX/Microsoft.VoiceServices/communicationsGateways-testLines.json b/src/VoiceServices/VoiceServices.Autorest/UX/Microsoft.VoiceServices/communicationsGateways-testLines.json
similarity index 100%
rename from src/VoiceServices/UX/Microsoft.VoiceServices/communicationsGateways-testLines.json
rename to src/VoiceServices/VoiceServices.Autorest/UX/Microsoft.VoiceServices/communicationsGateways-testLines.json
diff --git a/src/VoiceServices/UX/Microsoft.VoiceServices/communicationsGateways.json b/src/VoiceServices/VoiceServices.Autorest/UX/Microsoft.VoiceServices/communicationsGateways.json
similarity index 100%
rename from src/VoiceServices/UX/Microsoft.VoiceServices/communicationsGateways.json
rename to src/VoiceServices/VoiceServices.Autorest/UX/Microsoft.VoiceServices/communicationsGateways.json
diff --git a/src/VoiceServices/custom/New-AzVoiceServicesCommunicationsGatewayServiceRegionObject.ps1 b/src/VoiceServices/VoiceServices.Autorest/custom/New-AzVoiceServicesCommunicationsGatewayServiceRegionObject.ps1
similarity index 100%
rename from src/VoiceServices/custom/New-AzVoiceServicesCommunicationsGatewayServiceRegionObject.ps1
rename to src/VoiceServices/VoiceServices.Autorest/custom/New-AzVoiceServicesCommunicationsGatewayServiceRegionObject.ps1
diff --git a/src/VoiceServices/custom/README.md b/src/VoiceServices/VoiceServices.Autorest/custom/README.md
similarity index 100%
rename from src/VoiceServices/custom/README.md
rename to src/VoiceServices/VoiceServices.Autorest/custom/README.md
diff --git a/src/VoiceServices/docs/Az.VoiceServices.md b/src/VoiceServices/VoiceServices.Autorest/docs/Az.VoiceServices.md
similarity index 100%
rename from src/VoiceServices/docs/Az.VoiceServices.md
rename to src/VoiceServices/VoiceServices.Autorest/docs/Az.VoiceServices.md
diff --git a/src/VoiceServices/docs/Get-AzVoiceServicesCommunicationsGateway.md b/src/VoiceServices/VoiceServices.Autorest/docs/Get-AzVoiceServicesCommunicationsGateway.md
similarity index 100%
rename from src/VoiceServices/docs/Get-AzVoiceServicesCommunicationsGateway.md
rename to src/VoiceServices/VoiceServices.Autorest/docs/Get-AzVoiceServicesCommunicationsGateway.md
diff --git a/src/VoiceServices/docs/Get-AzVoiceServicesCommunicationsTestLine.md b/src/VoiceServices/VoiceServices.Autorest/docs/Get-AzVoiceServicesCommunicationsTestLine.md
similarity index 100%
rename from src/VoiceServices/docs/Get-AzVoiceServicesCommunicationsTestLine.md
rename to src/VoiceServices/VoiceServices.Autorest/docs/Get-AzVoiceServicesCommunicationsTestLine.md
diff --git a/src/VoiceServices/docs/New-AzVoiceServicesCommunicationsGateway.md b/src/VoiceServices/VoiceServices.Autorest/docs/New-AzVoiceServicesCommunicationsGateway.md
similarity index 100%
rename from src/VoiceServices/docs/New-AzVoiceServicesCommunicationsGateway.md
rename to src/VoiceServices/VoiceServices.Autorest/docs/New-AzVoiceServicesCommunicationsGateway.md
diff --git a/src/VoiceServices/docs/New-AzVoiceServicesCommunicationsGatewayServiceRegionObject.md b/src/VoiceServices/VoiceServices.Autorest/docs/New-AzVoiceServicesCommunicationsGatewayServiceRegionObject.md
similarity index 100%
rename from src/VoiceServices/docs/New-AzVoiceServicesCommunicationsGatewayServiceRegionObject.md
rename to src/VoiceServices/VoiceServices.Autorest/docs/New-AzVoiceServicesCommunicationsGatewayServiceRegionObject.md
diff --git a/src/VoiceServices/docs/New-AzVoiceServicesCommunicationsTestLine.md b/src/VoiceServices/VoiceServices.Autorest/docs/New-AzVoiceServicesCommunicationsTestLine.md
similarity index 100%
rename from src/VoiceServices/docs/New-AzVoiceServicesCommunicationsTestLine.md
rename to src/VoiceServices/VoiceServices.Autorest/docs/New-AzVoiceServicesCommunicationsTestLine.md
diff --git a/src/VoiceServices/docs/README.md b/src/VoiceServices/VoiceServices.Autorest/docs/README.md
similarity index 100%
rename from src/VoiceServices/docs/README.md
rename to src/VoiceServices/VoiceServices.Autorest/docs/README.md
diff --git a/src/VoiceServices/docs/Remove-AzVoiceServicesCommunicationsGateway.md b/src/VoiceServices/VoiceServices.Autorest/docs/Remove-AzVoiceServicesCommunicationsGateway.md
similarity index 100%
rename from src/VoiceServices/docs/Remove-AzVoiceServicesCommunicationsGateway.md
rename to src/VoiceServices/VoiceServices.Autorest/docs/Remove-AzVoiceServicesCommunicationsGateway.md
diff --git a/src/VoiceServices/docs/Remove-AzVoiceServicesCommunicationsTestLine.md b/src/VoiceServices/VoiceServices.Autorest/docs/Remove-AzVoiceServicesCommunicationsTestLine.md
similarity index 100%
rename from src/VoiceServices/docs/Remove-AzVoiceServicesCommunicationsTestLine.md
rename to src/VoiceServices/VoiceServices.Autorest/docs/Remove-AzVoiceServicesCommunicationsTestLine.md
diff --git a/src/VoiceServices/docs/Test-AzVoiceServicesNameAvailability.md b/src/VoiceServices/VoiceServices.Autorest/docs/Test-AzVoiceServicesNameAvailability.md
similarity index 100%
rename from src/VoiceServices/docs/Test-AzVoiceServicesNameAvailability.md
rename to src/VoiceServices/VoiceServices.Autorest/docs/Test-AzVoiceServicesNameAvailability.md
diff --git a/src/VoiceServices/docs/Update-AzVoiceServicesCommunicationsGateway.md b/src/VoiceServices/VoiceServices.Autorest/docs/Update-AzVoiceServicesCommunicationsGateway.md
similarity index 100%
rename from src/VoiceServices/docs/Update-AzVoiceServicesCommunicationsGateway.md
rename to src/VoiceServices/VoiceServices.Autorest/docs/Update-AzVoiceServicesCommunicationsGateway.md
diff --git a/src/VoiceServices/docs/Update-AzVoiceServicesCommunicationsTestLine.md b/src/VoiceServices/VoiceServices.Autorest/docs/Update-AzVoiceServicesCommunicationsTestLine.md
similarity index 100%
rename from src/VoiceServices/docs/Update-AzVoiceServicesCommunicationsTestLine.md
rename to src/VoiceServices/VoiceServices.Autorest/docs/Update-AzVoiceServicesCommunicationsTestLine.md
diff --git a/src/VoiceServices/examples/Get-AzVoiceServicesCommunicationsGateway.md b/src/VoiceServices/VoiceServices.Autorest/examples/Get-AzVoiceServicesCommunicationsGateway.md
similarity index 100%
rename from src/VoiceServices/examples/Get-AzVoiceServicesCommunicationsGateway.md
rename to src/VoiceServices/VoiceServices.Autorest/examples/Get-AzVoiceServicesCommunicationsGateway.md
diff --git a/src/VoiceServices/examples/Get-AzVoiceServicesCommunicationsTestLine.md b/src/VoiceServices/VoiceServices.Autorest/examples/Get-AzVoiceServicesCommunicationsTestLine.md
similarity index 100%
rename from src/VoiceServices/examples/Get-AzVoiceServicesCommunicationsTestLine.md
rename to src/VoiceServices/VoiceServices.Autorest/examples/Get-AzVoiceServicesCommunicationsTestLine.md
diff --git a/src/VoiceServices/examples/New-AzVoiceServicesCommunicationsGateway.md b/src/VoiceServices/VoiceServices.Autorest/examples/New-AzVoiceServicesCommunicationsGateway.md
similarity index 100%
rename from src/VoiceServices/examples/New-AzVoiceServicesCommunicationsGateway.md
rename to src/VoiceServices/VoiceServices.Autorest/examples/New-AzVoiceServicesCommunicationsGateway.md
diff --git a/src/VoiceServices/examples/New-AzVoiceServicesCommunicationsGatewayServiceRegionObject.md b/src/VoiceServices/VoiceServices.Autorest/examples/New-AzVoiceServicesCommunicationsGatewayServiceRegionObject.md
similarity index 100%
rename from src/VoiceServices/examples/New-AzVoiceServicesCommunicationsGatewayServiceRegionObject.md
rename to src/VoiceServices/VoiceServices.Autorest/examples/New-AzVoiceServicesCommunicationsGatewayServiceRegionObject.md
diff --git a/src/VoiceServices/examples/New-AzVoiceServicesCommunicationsTestLine.md b/src/VoiceServices/VoiceServices.Autorest/examples/New-AzVoiceServicesCommunicationsTestLine.md
similarity index 100%
rename from src/VoiceServices/examples/New-AzVoiceServicesCommunicationsTestLine.md
rename to src/VoiceServices/VoiceServices.Autorest/examples/New-AzVoiceServicesCommunicationsTestLine.md
diff --git a/src/VoiceServices/examples/Remove-AzVoiceServicesCommunicationsGateway.md b/src/VoiceServices/VoiceServices.Autorest/examples/Remove-AzVoiceServicesCommunicationsGateway.md
similarity index 100%
rename from src/VoiceServices/examples/Remove-AzVoiceServicesCommunicationsGateway.md
rename to src/VoiceServices/VoiceServices.Autorest/examples/Remove-AzVoiceServicesCommunicationsGateway.md
diff --git a/src/VoiceServices/examples/Remove-AzVoiceServicesCommunicationsTestLine.md b/src/VoiceServices/VoiceServices.Autorest/examples/Remove-AzVoiceServicesCommunicationsTestLine.md
similarity index 100%
rename from src/VoiceServices/examples/Remove-AzVoiceServicesCommunicationsTestLine.md
rename to src/VoiceServices/VoiceServices.Autorest/examples/Remove-AzVoiceServicesCommunicationsTestLine.md
diff --git a/src/VoiceServices/examples/Test-AzVoiceServicesNameAvailability.md b/src/VoiceServices/VoiceServices.Autorest/examples/Test-AzVoiceServicesNameAvailability.md
similarity index 100%
rename from src/VoiceServices/examples/Test-AzVoiceServicesNameAvailability.md
rename to src/VoiceServices/VoiceServices.Autorest/examples/Test-AzVoiceServicesNameAvailability.md
diff --git a/src/VoiceServices/examples/Update-AzVoiceServicesCommunicationsGateway.md b/src/VoiceServices/VoiceServices.Autorest/examples/Update-AzVoiceServicesCommunicationsGateway.md
similarity index 100%
rename from src/VoiceServices/examples/Update-AzVoiceServicesCommunicationsGateway.md
rename to src/VoiceServices/VoiceServices.Autorest/examples/Update-AzVoiceServicesCommunicationsGateway.md
diff --git a/src/VoiceServices/examples/Update-AzVoiceServicesCommunicationsTestLine.md b/src/VoiceServices/VoiceServices.Autorest/examples/Update-AzVoiceServicesCommunicationsTestLine.md
similarity index 100%
rename from src/VoiceServices/examples/Update-AzVoiceServicesCommunicationsTestLine.md
rename to src/VoiceServices/VoiceServices.Autorest/examples/Update-AzVoiceServicesCommunicationsTestLine.md
diff --git a/src/VoiceServices/how-to.md b/src/VoiceServices/VoiceServices.Autorest/how-to.md
similarity index 100%
rename from src/VoiceServices/how-to.md
rename to src/VoiceServices/VoiceServices.Autorest/how-to.md
diff --git a/src/VoiceServices/license.txt b/src/VoiceServices/VoiceServices.Autorest/license.txt
similarity index 100%
rename from src/VoiceServices/license.txt
rename to src/VoiceServices/VoiceServices.Autorest/license.txt
diff --git a/src/VoiceServices/resources/README.md b/src/VoiceServices/VoiceServices.Autorest/resources/README.md
similarity index 100%
rename from src/VoiceServices/resources/README.md
rename to src/VoiceServices/VoiceServices.Autorest/resources/README.md
diff --git a/src/VoiceServices/test/Get-AzVoiceServicesCommunicationsContact.Tests.ps1 b/src/VoiceServices/VoiceServices.Autorest/test/Get-AzVoiceServicesCommunicationsContact.Tests.ps1
similarity index 100%
rename from src/VoiceServices/test/Get-AzVoiceServicesCommunicationsContact.Tests.ps1
rename to src/VoiceServices/VoiceServices.Autorest/test/Get-AzVoiceServicesCommunicationsContact.Tests.ps1
diff --git a/src/VoiceServices/test/Get-AzVoiceServicesCommunicationsGateway.Tests.ps1 b/src/VoiceServices/VoiceServices.Autorest/test/Get-AzVoiceServicesCommunicationsGateway.Tests.ps1
similarity index 100%
rename from src/VoiceServices/test/Get-AzVoiceServicesCommunicationsGateway.Tests.ps1
rename to src/VoiceServices/VoiceServices.Autorest/test/Get-AzVoiceServicesCommunicationsGateway.Tests.ps1
diff --git a/src/VoiceServices/test/Get-AzVoiceServicesCommunicationsTestLine.Tests.ps1 b/src/VoiceServices/VoiceServices.Autorest/test/Get-AzVoiceServicesCommunicationsTestLine.Tests.ps1
similarity index 100%
rename from src/VoiceServices/test/Get-AzVoiceServicesCommunicationsTestLine.Tests.ps1
rename to src/VoiceServices/VoiceServices.Autorest/test/Get-AzVoiceServicesCommunicationsTestLine.Tests.ps1
diff --git a/src/VoiceServices/test/New-AzVoiceServicesCommunicationsGateway.Recording.json b/src/VoiceServices/VoiceServices.Autorest/test/New-AzVoiceServicesCommunicationsGateway.Recording.json
similarity index 100%
rename from src/VoiceServices/test/New-AzVoiceServicesCommunicationsGateway.Recording.json
rename to src/VoiceServices/VoiceServices.Autorest/test/New-AzVoiceServicesCommunicationsGateway.Recording.json
diff --git a/src/VoiceServices/test/New-AzVoiceServicesCommunicationsGateway.Tests.ps1 b/src/VoiceServices/VoiceServices.Autorest/test/New-AzVoiceServicesCommunicationsGateway.Tests.ps1
similarity index 100%
rename from src/VoiceServices/test/New-AzVoiceServicesCommunicationsGateway.Tests.ps1
rename to src/VoiceServices/VoiceServices.Autorest/test/New-AzVoiceServicesCommunicationsGateway.Tests.ps1
diff --git a/src/VoiceServices/test/New-AzVoiceServicesCommunicationsGatewayServiceRegionObject.Tests.ps1 b/src/VoiceServices/VoiceServices.Autorest/test/New-AzVoiceServicesCommunicationsGatewayServiceRegionObject.Tests.ps1
similarity index 100%
rename from src/VoiceServices/test/New-AzVoiceServicesCommunicationsGatewayServiceRegionObject.Tests.ps1
rename to src/VoiceServices/VoiceServices.Autorest/test/New-AzVoiceServicesCommunicationsGatewayServiceRegionObject.Tests.ps1
diff --git a/src/VoiceServices/test/New-AzVoiceServicesCommunicationsTestLine.Recording.json b/src/VoiceServices/VoiceServices.Autorest/test/New-AzVoiceServicesCommunicationsTestLine.Recording.json
similarity index 100%
rename from src/VoiceServices/test/New-AzVoiceServicesCommunicationsTestLine.Recording.json
rename to src/VoiceServices/VoiceServices.Autorest/test/New-AzVoiceServicesCommunicationsTestLine.Recording.json
diff --git a/src/VoiceServices/test/New-AzVoiceServicesCommunicationsTestLine.Tests.ps1 b/src/VoiceServices/VoiceServices.Autorest/test/New-AzVoiceServicesCommunicationsTestLine.Tests.ps1
similarity index 100%
rename from src/VoiceServices/test/New-AzVoiceServicesCommunicationsTestLine.Tests.ps1
rename to src/VoiceServices/VoiceServices.Autorest/test/New-AzVoiceServicesCommunicationsTestLine.Tests.ps1
diff --git a/src/VoiceServices/test/README.md b/src/VoiceServices/VoiceServices.Autorest/test/README.md
similarity index 100%
rename from src/VoiceServices/test/README.md
rename to src/VoiceServices/VoiceServices.Autorest/test/README.md
diff --git a/src/VoiceServices/test/Remove-AzVoiceServicesCommunicationsContact.Tests.ps1 b/src/VoiceServices/VoiceServices.Autorest/test/Remove-AzVoiceServicesCommunicationsContact.Tests.ps1
similarity index 100%
rename from src/VoiceServices/test/Remove-AzVoiceServicesCommunicationsContact.Tests.ps1
rename to src/VoiceServices/VoiceServices.Autorest/test/Remove-AzVoiceServicesCommunicationsContact.Tests.ps1
diff --git a/src/VoiceServices/test/Remove-AzVoiceServicesCommunicationsGateway.Tests.ps1 b/src/VoiceServices/VoiceServices.Autorest/test/Remove-AzVoiceServicesCommunicationsGateway.Tests.ps1
similarity index 100%
rename from src/VoiceServices/test/Remove-AzVoiceServicesCommunicationsGateway.Tests.ps1
rename to src/VoiceServices/VoiceServices.Autorest/test/Remove-AzVoiceServicesCommunicationsGateway.Tests.ps1
diff --git a/src/VoiceServices/test/Remove-AzVoiceServicesCommunicationsTestLine.Tests.ps1 b/src/VoiceServices/VoiceServices.Autorest/test/Remove-AzVoiceServicesCommunicationsTestLine.Tests.ps1
similarity index 100%
rename from src/VoiceServices/test/Remove-AzVoiceServicesCommunicationsTestLine.Tests.ps1
rename to src/VoiceServices/VoiceServices.Autorest/test/Remove-AzVoiceServicesCommunicationsTestLine.Tests.ps1
diff --git a/src/VoiceServices/test/Test-AzVoiceServicesNameAvailability.Recording.json b/src/VoiceServices/VoiceServices.Autorest/test/Test-AzVoiceServicesNameAvailability.Recording.json
similarity index 100%
rename from src/VoiceServices/test/Test-AzVoiceServicesNameAvailability.Recording.json
rename to src/VoiceServices/VoiceServices.Autorest/test/Test-AzVoiceServicesNameAvailability.Recording.json
diff --git a/src/VoiceServices/test/Test-AzVoiceServicesNameAvailability.Tests.ps1 b/src/VoiceServices/VoiceServices.Autorest/test/Test-AzVoiceServicesNameAvailability.Tests.ps1
similarity index 100%
rename from src/VoiceServices/test/Test-AzVoiceServicesNameAvailability.Tests.ps1
rename to src/VoiceServices/VoiceServices.Autorest/test/Test-AzVoiceServicesNameAvailability.Tests.ps1
diff --git a/src/VoiceServices/test/Update-AzVoiceServicesCommunicationsContact.Tests.ps1 b/src/VoiceServices/VoiceServices.Autorest/test/Update-AzVoiceServicesCommunicationsContact.Tests.ps1
similarity index 100%
rename from src/VoiceServices/test/Update-AzVoiceServicesCommunicationsContact.Tests.ps1
rename to src/VoiceServices/VoiceServices.Autorest/test/Update-AzVoiceServicesCommunicationsContact.Tests.ps1
diff --git a/src/VoiceServices/test/Update-AzVoiceServicesCommunicationsGateway.Tests.ps1 b/src/VoiceServices/VoiceServices.Autorest/test/Update-AzVoiceServicesCommunicationsGateway.Tests.ps1
similarity index 100%
rename from src/VoiceServices/test/Update-AzVoiceServicesCommunicationsGateway.Tests.ps1
rename to src/VoiceServices/VoiceServices.Autorest/test/Update-AzVoiceServicesCommunicationsGateway.Tests.ps1
diff --git a/src/VoiceServices/test/Update-AzVoiceServicesCommunicationsTestLine.Tests.ps1 b/src/VoiceServices/VoiceServices.Autorest/test/Update-AzVoiceServicesCommunicationsTestLine.Tests.ps1
similarity index 100%
rename from src/VoiceServices/test/Update-AzVoiceServicesCommunicationsTestLine.Tests.ps1
rename to src/VoiceServices/VoiceServices.Autorest/test/Update-AzVoiceServicesCommunicationsTestLine.Tests.ps1
diff --git a/src/VoiceServices/test/env.json b/src/VoiceServices/VoiceServices.Autorest/test/env.json
similarity index 100%
rename from src/VoiceServices/test/env.json
rename to src/VoiceServices/VoiceServices.Autorest/test/env.json
diff --git a/src/VoiceServices/test/loadEnv.ps1 b/src/VoiceServices/VoiceServices.Autorest/test/loadEnv.ps1
similarity index 100%
rename from src/VoiceServices/test/loadEnv.ps1
rename to src/VoiceServices/VoiceServices.Autorest/test/loadEnv.ps1
diff --git a/src/VoiceServices/test/utils.ps1 b/src/VoiceServices/VoiceServices.Autorest/test/utils.ps1
similarity index 100%
rename from src/VoiceServices/test/utils.ps1
rename to src/VoiceServices/VoiceServices.Autorest/test/utils.ps1
diff --git a/src/VoiceServices/utils/Unprotect-SecureString.ps1 b/src/VoiceServices/VoiceServices.Autorest/utils/Unprotect-SecureString.ps1
similarity index 100%
rename from src/VoiceServices/utils/Unprotect-SecureString.ps1
rename to src/VoiceServices/VoiceServices.Autorest/utils/Unprotect-SecureString.ps1
diff --git a/src/WindowsIotServices/.gitattributes b/src/WindowsIotServices/WindowsIotServices.Autorest/.gitattributes
similarity index 100%
rename from src/WindowsIotServices/.gitattributes
rename to src/WindowsIotServices/WindowsIotServices.Autorest/.gitattributes
diff --git a/src/WindowsIotServices/.gitignore b/src/WindowsIotServices/WindowsIotServices.Autorest/.gitignore
similarity index 100%
rename from src/WindowsIotServices/.gitignore
rename to src/WindowsIotServices/WindowsIotServices.Autorest/.gitignore
diff --git a/src/WindowsIotServices/Az.WindowsIotServices.psd1 b/src/WindowsIotServices/WindowsIotServices.Autorest/Az.WindowsIotServices.psd1
similarity index 100%
rename from src/WindowsIotServices/Az.WindowsIotServices.psd1
rename to src/WindowsIotServices/WindowsIotServices.Autorest/Az.WindowsIotServices.psd1
diff --git a/src/WindowsIotServices/README.md b/src/WindowsIotServices/WindowsIotServices.Autorest/README.md
similarity index 100%
rename from src/WindowsIotServices/README.md
rename to src/WindowsIotServices/WindowsIotServices.Autorest/README.md
diff --git a/src/WindowsIotServices/UX/Microsoft.WindowsIoT/DeviceServices.json b/src/WindowsIotServices/WindowsIotServices.Autorest/UX/Microsoft.WindowsIoT/DeviceServices.json
similarity index 100%
rename from src/WindowsIotServices/UX/Microsoft.WindowsIoT/DeviceServices.json
rename to src/WindowsIotServices/WindowsIotServices.Autorest/UX/Microsoft.WindowsIoT/DeviceServices.json
diff --git a/src/WindowsIotServices/custom/README.md b/src/WindowsIotServices/WindowsIotServices.Autorest/custom/README.md
similarity index 100%
rename from src/WindowsIotServices/custom/README.md
rename to src/WindowsIotServices/WindowsIotServices.Autorest/custom/README.md
diff --git a/src/WindowsIotServices/docs/Az.WindowsIotServices.md b/src/WindowsIotServices/WindowsIotServices.Autorest/docs/Az.WindowsIotServices.md
similarity index 100%
rename from src/WindowsIotServices/docs/Az.WindowsIotServices.md
rename to src/WindowsIotServices/WindowsIotServices.Autorest/docs/Az.WindowsIotServices.md
diff --git a/src/WindowsIotServices/docs/Get-AzWindowsIotServicesDevice.md b/src/WindowsIotServices/WindowsIotServices.Autorest/docs/Get-AzWindowsIotServicesDevice.md
similarity index 100%
rename from src/WindowsIotServices/docs/Get-AzWindowsIotServicesDevice.md
rename to src/WindowsIotServices/WindowsIotServices.Autorest/docs/Get-AzWindowsIotServicesDevice.md
diff --git a/src/WindowsIotServices/docs/New-AzWindowsIotServicesDevice.md b/src/WindowsIotServices/WindowsIotServices.Autorest/docs/New-AzWindowsIotServicesDevice.md
similarity index 100%
rename from src/WindowsIotServices/docs/New-AzWindowsIotServicesDevice.md
rename to src/WindowsIotServices/WindowsIotServices.Autorest/docs/New-AzWindowsIotServicesDevice.md
diff --git a/src/WindowsIotServices/docs/README.md b/src/WindowsIotServices/WindowsIotServices.Autorest/docs/README.md
similarity index 100%
rename from src/WindowsIotServices/docs/README.md
rename to src/WindowsIotServices/WindowsIotServices.Autorest/docs/README.md
diff --git a/src/WindowsIotServices/docs/Remove-AzWindowsIotServicesDevice.md b/src/WindowsIotServices/WindowsIotServices.Autorest/docs/Remove-AzWindowsIotServicesDevice.md
similarity index 100%
rename from src/WindowsIotServices/docs/Remove-AzWindowsIotServicesDevice.md
rename to src/WindowsIotServices/WindowsIotServices.Autorest/docs/Remove-AzWindowsIotServicesDevice.md
diff --git a/src/WindowsIotServices/docs/Update-AzWindowsIotServicesDevice.md b/src/WindowsIotServices/WindowsIotServices.Autorest/docs/Update-AzWindowsIotServicesDevice.md
similarity index 100%
rename from src/WindowsIotServices/docs/Update-AzWindowsIotServicesDevice.md
rename to src/WindowsIotServices/WindowsIotServices.Autorest/docs/Update-AzWindowsIotServicesDevice.md
diff --git a/src/WindowsIotServices/examples/Get-AzWindowsIotServicesDevice.md b/src/WindowsIotServices/WindowsIotServices.Autorest/examples/Get-AzWindowsIotServicesDevice.md
similarity index 100%
rename from src/WindowsIotServices/examples/Get-AzWindowsIotServicesDevice.md
rename to src/WindowsIotServices/WindowsIotServices.Autorest/examples/Get-AzWindowsIotServicesDevice.md
diff --git a/src/WindowsIotServices/examples/New-AzWindowsIotServicesDevice.md b/src/WindowsIotServices/WindowsIotServices.Autorest/examples/New-AzWindowsIotServicesDevice.md
similarity index 100%
rename from src/WindowsIotServices/examples/New-AzWindowsIotServicesDevice.md
rename to src/WindowsIotServices/WindowsIotServices.Autorest/examples/New-AzWindowsIotServicesDevice.md
diff --git a/src/WindowsIotServices/examples/Remove-AzWindowsIotServicesDevice.md b/src/WindowsIotServices/WindowsIotServices.Autorest/examples/Remove-AzWindowsIotServicesDevice.md
similarity index 100%
rename from src/WindowsIotServices/examples/Remove-AzWindowsIotServicesDevice.md
rename to src/WindowsIotServices/WindowsIotServices.Autorest/examples/Remove-AzWindowsIotServicesDevice.md
diff --git a/src/WindowsIotServices/examples/Update-AzWindowsIotServicesDevice.md b/src/WindowsIotServices/WindowsIotServices.Autorest/examples/Update-AzWindowsIotServicesDevice.md
similarity index 100%
rename from src/WindowsIotServices/examples/Update-AzWindowsIotServicesDevice.md
rename to src/WindowsIotServices/WindowsIotServices.Autorest/examples/Update-AzWindowsIotServicesDevice.md
diff --git a/src/WindowsIotServices/how-to.md b/src/WindowsIotServices/WindowsIotServices.Autorest/how-to.md
similarity index 100%
rename from src/WindowsIotServices/how-to.md
rename to src/WindowsIotServices/WindowsIotServices.Autorest/how-to.md
diff --git a/src/WindowsIotServices/license.txt b/src/WindowsIotServices/WindowsIotServices.Autorest/license.txt
similarity index 100%
rename from src/WindowsIotServices/license.txt
rename to src/WindowsIotServices/WindowsIotServices.Autorest/license.txt
diff --git a/src/WindowsIotServices/resources/README.md b/src/WindowsIotServices/WindowsIotServices.Autorest/resources/README.md
similarity index 100%
rename from src/WindowsIotServices/resources/README.md
rename to src/WindowsIotServices/WindowsIotServices.Autorest/resources/README.md
diff --git a/src/WindowsIotServices/test/Get-AzWindowsIotServicesDevice.Recording.json b/src/WindowsIotServices/WindowsIotServices.Autorest/test/Get-AzWindowsIotServicesDevice.Recording.json
similarity index 100%
rename from src/WindowsIotServices/test/Get-AzWindowsIotServicesDevice.Recording.json
rename to src/WindowsIotServices/WindowsIotServices.Autorest/test/Get-AzWindowsIotServicesDevice.Recording.json
diff --git a/src/WindowsIotServices/test/Get-AzWindowsIotServicesDevice.Tests.ps1 b/src/WindowsIotServices/WindowsIotServices.Autorest/test/Get-AzWindowsIotServicesDevice.Tests.ps1
similarity index 100%
rename from src/WindowsIotServices/test/Get-AzWindowsIotServicesDevice.Tests.ps1
rename to src/WindowsIotServices/WindowsIotServices.Autorest/test/Get-AzWindowsIotServicesDevice.Tests.ps1
diff --git a/src/WindowsIotServices/test/New-AzWindowsIotServicesDevice.Recording.json b/src/WindowsIotServices/WindowsIotServices.Autorest/test/New-AzWindowsIotServicesDevice.Recording.json
similarity index 100%
rename from src/WindowsIotServices/test/New-AzWindowsIotServicesDevice.Recording.json
rename to src/WindowsIotServices/WindowsIotServices.Autorest/test/New-AzWindowsIotServicesDevice.Recording.json
diff --git a/src/WindowsIotServices/test/New-AzWindowsIotServicesDevice.Tests.ps1 b/src/WindowsIotServices/WindowsIotServices.Autorest/test/New-AzWindowsIotServicesDevice.Tests.ps1
similarity index 100%
rename from src/WindowsIotServices/test/New-AzWindowsIotServicesDevice.Tests.ps1
rename to src/WindowsIotServices/WindowsIotServices.Autorest/test/New-AzWindowsIotServicesDevice.Tests.ps1
diff --git a/src/WindowsIotServices/test/README.md b/src/WindowsIotServices/WindowsIotServices.Autorest/test/README.md
similarity index 100%
rename from src/WindowsIotServices/test/README.md
rename to src/WindowsIotServices/WindowsIotServices.Autorest/test/README.md
diff --git a/src/WindowsIotServices/test/Remove-AzWindowsIotServicesDevice.Recording.json b/src/WindowsIotServices/WindowsIotServices.Autorest/test/Remove-AzWindowsIotServicesDevice.Recording.json
similarity index 100%
rename from src/WindowsIotServices/test/Remove-AzWindowsIotServicesDevice.Recording.json
rename to src/WindowsIotServices/WindowsIotServices.Autorest/test/Remove-AzWindowsIotServicesDevice.Recording.json
diff --git a/src/WindowsIotServices/test/Remove-AzWindowsIotServicesDevice.Tests.ps1 b/src/WindowsIotServices/WindowsIotServices.Autorest/test/Remove-AzWindowsIotServicesDevice.Tests.ps1
similarity index 100%
rename from src/WindowsIotServices/test/Remove-AzWindowsIotServicesDevice.Tests.ps1
rename to src/WindowsIotServices/WindowsIotServices.Autorest/test/Remove-AzWindowsIotServicesDevice.Tests.ps1
diff --git a/src/WindowsIotServices/test/Update-AzWindowsIotServicesDevice.Recording.json b/src/WindowsIotServices/WindowsIotServices.Autorest/test/Update-AzWindowsIotServicesDevice.Recording.json
similarity index 100%
rename from src/WindowsIotServices/test/Update-AzWindowsIotServicesDevice.Recording.json
rename to src/WindowsIotServices/WindowsIotServices.Autorest/test/Update-AzWindowsIotServicesDevice.Recording.json
diff --git a/src/WindowsIotServices/test/Update-AzWindowsIotServicesDevice.Tests.ps1 b/src/WindowsIotServices/WindowsIotServices.Autorest/test/Update-AzWindowsIotServicesDevice.Tests.ps1
similarity index 100%
rename from src/WindowsIotServices/test/Update-AzWindowsIotServicesDevice.Tests.ps1
rename to src/WindowsIotServices/WindowsIotServices.Autorest/test/Update-AzWindowsIotServicesDevice.Tests.ps1
diff --git a/src/WindowsIotServices/test/env.json b/src/WindowsIotServices/WindowsIotServices.Autorest/test/env.json
similarity index 100%
rename from src/WindowsIotServices/test/env.json
rename to src/WindowsIotServices/WindowsIotServices.Autorest/test/env.json
diff --git a/src/WindowsIotServices/test/loadEnv.ps1 b/src/WindowsIotServices/WindowsIotServices.Autorest/test/loadEnv.ps1
similarity index 100%
rename from src/WindowsIotServices/test/loadEnv.ps1
rename to src/WindowsIotServices/WindowsIotServices.Autorest/test/loadEnv.ps1
diff --git a/src/WindowsIotServices/test/utils.ps1 b/src/WindowsIotServices/WindowsIotServices.Autorest/test/utils.ps1
similarity index 100%
rename from src/WindowsIotServices/test/utils.ps1
rename to src/WindowsIotServices/WindowsIotServices.Autorest/test/utils.ps1
diff --git a/src/WindowsIotServices/utils/Unprotect-SecureString.ps1 b/src/WindowsIotServices/WindowsIotServices.Autorest/utils/Unprotect-SecureString.ps1
similarity index 100%
rename from src/WindowsIotServices/utils/Unprotect-SecureString.ps1
rename to src/WindowsIotServices/WindowsIotServices.Autorest/utils/Unprotect-SecureString.ps1
diff --git a/src/Workloads/.gitattributes b/src/Workloads/Workloads.Autorest/.gitattributes
similarity index 100%
rename from src/Workloads/.gitattributes
rename to src/Workloads/Workloads.Autorest/.gitattributes
diff --git a/src/Workloads/.gitignore b/src/Workloads/Workloads.Autorest/.gitignore
similarity index 100%
rename from src/Workloads/.gitignore
rename to src/Workloads/Workloads.Autorest/.gitignore
diff --git a/src/Workloads/Az.Workloads.psd1 b/src/Workloads/Workloads.Autorest/Az.Workloads.psd1
similarity index 100%
rename from src/Workloads/Az.Workloads.psd1
rename to src/Workloads/Workloads.Autorest/Az.Workloads.psd1
diff --git a/src/Workloads/README.md b/src/Workloads/Workloads.Autorest/README.md
similarity index 100%
rename from src/Workloads/README.md
rename to src/Workloads/Workloads.Autorest/README.md
diff --git a/src/Workloads/UX/Microsoft.Workloads/monitors-providerInstances.json b/src/Workloads/Workloads.Autorest/UX/Microsoft.Workloads/monitors-providerInstances.json
similarity index 100%
rename from src/Workloads/UX/Microsoft.Workloads/monitors-providerInstances.json
rename to src/Workloads/Workloads.Autorest/UX/Microsoft.Workloads/monitors-providerInstances.json
diff --git a/src/Workloads/UX/Microsoft.Workloads/monitors.json b/src/Workloads/Workloads.Autorest/UX/Microsoft.Workloads/monitors.json
similarity index 100%
rename from src/Workloads/UX/Microsoft.Workloads/monitors.json
rename to src/Workloads/Workloads.Autorest/UX/Microsoft.Workloads/monitors.json
diff --git a/src/Workloads/UX/Microsoft.Workloads/sapVirtualInstances-applicationInstances.json b/src/Workloads/Workloads.Autorest/UX/Microsoft.Workloads/sapVirtualInstances-applicationInstances.json
similarity index 100%
rename from src/Workloads/UX/Microsoft.Workloads/sapVirtualInstances-applicationInstances.json
rename to src/Workloads/Workloads.Autorest/UX/Microsoft.Workloads/sapVirtualInstances-applicationInstances.json
diff --git a/src/Workloads/UX/Microsoft.Workloads/sapVirtualInstances-centralInstances.json b/src/Workloads/Workloads.Autorest/UX/Microsoft.Workloads/sapVirtualInstances-centralInstances.json
similarity index 100%
rename from src/Workloads/UX/Microsoft.Workloads/sapVirtualInstances-centralInstances.json
rename to src/Workloads/Workloads.Autorest/UX/Microsoft.Workloads/sapVirtualInstances-centralInstances.json
diff --git a/src/Workloads/UX/Microsoft.Workloads/sapVirtualInstances-databaseInstances.json b/src/Workloads/Workloads.Autorest/UX/Microsoft.Workloads/sapVirtualInstances-databaseInstances.json
similarity index 100%
rename from src/Workloads/UX/Microsoft.Workloads/sapVirtualInstances-databaseInstances.json
rename to src/Workloads/Workloads.Autorest/UX/Microsoft.Workloads/sapVirtualInstances-databaseInstances.json
diff --git a/src/Workloads/UX/Microsoft.Workloads/sapVirtualInstances.json b/src/Workloads/Workloads.Autorest/UX/Microsoft.Workloads/sapVirtualInstances.json
similarity index 100%
rename from src/Workloads/UX/Microsoft.Workloads/sapVirtualInstances.json
rename to src/Workloads/Workloads.Autorest/UX/Microsoft.Workloads/sapVirtualInstances.json
diff --git a/src/Workloads/custom/InvokeAzWorkloadsSapSizingRecommendation_SapExpanded.cs b/src/Workloads/Workloads.Autorest/custom/InvokeAzWorkloadsSapSizingRecommendation_SapExpanded.cs
similarity index 100%
rename from src/Workloads/custom/InvokeAzWorkloadsSapSizingRecommendation_SapExpanded.cs
rename to src/Workloads/Workloads.Autorest/custom/InvokeAzWorkloadsSapSizingRecommendation_SapExpanded.cs
diff --git a/src/Workloads/custom/InvokeAzWorkloadsSapSizingRecommendation_SapViaIdentityExpanded.cs b/src/Workloads/Workloads.Autorest/custom/InvokeAzWorkloadsSapSizingRecommendation_SapViaIdentityExpanded.cs
similarity index 100%
rename from src/Workloads/custom/InvokeAzWorkloadsSapSizingRecommendation_SapViaIdentityExpanded.cs
rename to src/Workloads/Workloads.Autorest/custom/InvokeAzWorkloadsSapSizingRecommendation_SapViaIdentityExpanded.cs
diff --git a/src/Workloads/custom/New-AzWorkloadsProviderDB2InstanceObject.ps1 b/src/Workloads/Workloads.Autorest/custom/New-AzWorkloadsProviderDB2InstanceObject.ps1
similarity index 100%
rename from src/Workloads/custom/New-AzWorkloadsProviderDB2InstanceObject.ps1
rename to src/Workloads/Workloads.Autorest/custom/New-AzWorkloadsProviderDB2InstanceObject.ps1
diff --git a/src/Workloads/custom/New-AzWorkloadsProviderHanaDbInstanceObject.ps1 b/src/Workloads/Workloads.Autorest/custom/New-AzWorkloadsProviderHanaDbInstanceObject.ps1
similarity index 100%
rename from src/Workloads/custom/New-AzWorkloadsProviderHanaDbInstanceObject.ps1
rename to src/Workloads/Workloads.Autorest/custom/New-AzWorkloadsProviderHanaDbInstanceObject.ps1
diff --git a/src/Workloads/custom/New-AzWorkloadsProviderPrometheusHaClusterInstanceObject.ps1 b/src/Workloads/Workloads.Autorest/custom/New-AzWorkloadsProviderPrometheusHaClusterInstanceObject.ps1
similarity index 100%
rename from src/Workloads/custom/New-AzWorkloadsProviderPrometheusHaClusterInstanceObject.ps1
rename to src/Workloads/Workloads.Autorest/custom/New-AzWorkloadsProviderPrometheusHaClusterInstanceObject.ps1
diff --git a/src/Workloads/custom/New-AzWorkloadsProviderPrometheusOSInstanceObject.ps1 b/src/Workloads/Workloads.Autorest/custom/New-AzWorkloadsProviderPrometheusOSInstanceObject.ps1
similarity index 100%
rename from src/Workloads/custom/New-AzWorkloadsProviderPrometheusOSInstanceObject.ps1
rename to src/Workloads/Workloads.Autorest/custom/New-AzWorkloadsProviderPrometheusOSInstanceObject.ps1
diff --git a/src/Workloads/custom/New-AzWorkloadsProviderSapNetWeaverInstanceObject.ps1 b/src/Workloads/Workloads.Autorest/custom/New-AzWorkloadsProviderSapNetWeaverInstanceObject.ps1
similarity index 100%
rename from src/Workloads/custom/New-AzWorkloadsProviderSapNetWeaverInstanceObject.ps1
rename to src/Workloads/Workloads.Autorest/custom/New-AzWorkloadsProviderSapNetWeaverInstanceObject.ps1
diff --git a/src/Workloads/custom/New-AzWorkloadsProviderSqlServerInstanceObject.ps1 b/src/Workloads/Workloads.Autorest/custom/New-AzWorkloadsProviderSqlServerInstanceObject.ps1
similarity index 100%
rename from src/Workloads/custom/New-AzWorkloadsProviderSqlServerInstanceObject.ps1
rename to src/Workloads/Workloads.Autorest/custom/New-AzWorkloadsProviderSqlServerInstanceObject.ps1
diff --git a/src/Workloads/custom/New-AzWorkloadsSapVirtualInstance/New-AzWorkloadsSapVirtualInstance_CreateWithDiscovery.ps1 b/src/Workloads/Workloads.Autorest/custom/New-AzWorkloadsSapVirtualInstance/New-AzWorkloadsSapVirtualInstance_CreateWithDiscovery.ps1
similarity index 100%
rename from src/Workloads/custom/New-AzWorkloadsSapVirtualInstance/New-AzWorkloadsSapVirtualInstance_CreateWithDiscovery.ps1
rename to src/Workloads/Workloads.Autorest/custom/New-AzWorkloadsSapVirtualInstance/New-AzWorkloadsSapVirtualInstance_CreateWithDiscovery.ps1
diff --git a/src/Workloads/custom/New-AzWorkloadsSapVirtualInstance/New-AzWorkloadsSapVirtualInstance_CreateWithJsonString.cs b/src/Workloads/Workloads.Autorest/custom/New-AzWorkloadsSapVirtualInstance/New-AzWorkloadsSapVirtualInstance_CreateWithJsonString.cs
similarity index 100%
rename from src/Workloads/custom/New-AzWorkloadsSapVirtualInstance/New-AzWorkloadsSapVirtualInstance_CreateWithJsonString.cs
rename to src/Workloads/Workloads.Autorest/custom/New-AzWorkloadsSapVirtualInstance/New-AzWorkloadsSapVirtualInstance_CreateWithJsonString.cs
diff --git a/src/Workloads/custom/New-AzWorkloadsSapVirtualInstance/New-AzWorkloadsSapVirtualInstance_CreateWithJsonTemplatePath.ps1 b/src/Workloads/Workloads.Autorest/custom/New-AzWorkloadsSapVirtualInstance/New-AzWorkloadsSapVirtualInstance_CreateWithJsonTemplatePath.ps1
similarity index 100%
rename from src/Workloads/custom/New-AzWorkloadsSapVirtualInstance/New-AzWorkloadsSapVirtualInstance_CreateWithJsonTemplatePath.ps1
rename to src/Workloads/Workloads.Autorest/custom/New-AzWorkloadsSapVirtualInstance/New-AzWorkloadsSapVirtualInstance_CreateWithJsonTemplatePath.ps1
diff --git a/src/Workloads/custom/New-AzWorkloadsSapVirtualInstance/WorkloadsClient.cs b/src/Workloads/Workloads.Autorest/custom/New-AzWorkloadsSapVirtualInstance/WorkloadsClient.cs
similarity index 100%
rename from src/Workloads/custom/New-AzWorkloadsSapVirtualInstance/WorkloadsClient.cs
rename to src/Workloads/Workloads.Autorest/custom/New-AzWorkloadsSapVirtualInstance/WorkloadsClient.cs
diff --git a/src/Workloads/custom/README.md b/src/Workloads/Workloads.Autorest/custom/README.md
similarity index 100%
rename from src/Workloads/custom/README.md
rename to src/Workloads/Workloads.Autorest/custom/README.md
diff --git a/src/Workloads/docs/Az.Workloads.md b/src/Workloads/Workloads.Autorest/docs/Az.Workloads.md
similarity index 100%
rename from src/Workloads/docs/Az.Workloads.md
rename to src/Workloads/Workloads.Autorest/docs/Az.Workloads.md
diff --git a/src/Workloads/docs/Get-AzWorkloadsMonitor.md b/src/Workloads/Workloads.Autorest/docs/Get-AzWorkloadsMonitor.md
similarity index 100%
rename from src/Workloads/docs/Get-AzWorkloadsMonitor.md
rename to src/Workloads/Workloads.Autorest/docs/Get-AzWorkloadsMonitor.md
diff --git a/src/Workloads/docs/Get-AzWorkloadsProviderInstance.md b/src/Workloads/Workloads.Autorest/docs/Get-AzWorkloadsProviderInstance.md
similarity index 100%
rename from src/Workloads/docs/Get-AzWorkloadsProviderInstance.md
rename to src/Workloads/Workloads.Autorest/docs/Get-AzWorkloadsProviderInstance.md
diff --git a/src/Workloads/docs/Get-AzWorkloadsSapApplicationInstance.md b/src/Workloads/Workloads.Autorest/docs/Get-AzWorkloadsSapApplicationInstance.md
similarity index 100%
rename from src/Workloads/docs/Get-AzWorkloadsSapApplicationInstance.md
rename to src/Workloads/Workloads.Autorest/docs/Get-AzWorkloadsSapApplicationInstance.md
diff --git a/src/Workloads/docs/Get-AzWorkloadsSapCentralInstance.md b/src/Workloads/Workloads.Autorest/docs/Get-AzWorkloadsSapCentralInstance.md
similarity index 100%
rename from src/Workloads/docs/Get-AzWorkloadsSapCentralInstance.md
rename to src/Workloads/Workloads.Autorest/docs/Get-AzWorkloadsSapCentralInstance.md
diff --git a/src/Workloads/docs/Get-AzWorkloadsSapDatabaseInstance.md b/src/Workloads/Workloads.Autorest/docs/Get-AzWorkloadsSapDatabaseInstance.md
similarity index 100%
rename from src/Workloads/docs/Get-AzWorkloadsSapDatabaseInstance.md
rename to src/Workloads/Workloads.Autorest/docs/Get-AzWorkloadsSapDatabaseInstance.md
diff --git a/src/Workloads/docs/Get-AzWorkloadsSapLandscapeMonitor.md b/src/Workloads/Workloads.Autorest/docs/Get-AzWorkloadsSapLandscapeMonitor.md
similarity index 100%
rename from src/Workloads/docs/Get-AzWorkloadsSapLandscapeMonitor.md
rename to src/Workloads/Workloads.Autorest/docs/Get-AzWorkloadsSapLandscapeMonitor.md
diff --git a/src/Workloads/docs/Get-AzWorkloadsSapVirtualInstance.md b/src/Workloads/Workloads.Autorest/docs/Get-AzWorkloadsSapVirtualInstance.md
similarity index 100%
rename from src/Workloads/docs/Get-AzWorkloadsSapVirtualInstance.md
rename to src/Workloads/Workloads.Autorest/docs/Get-AzWorkloadsSapVirtualInstance.md
diff --git a/src/Workloads/docs/Invoke-AzWorkloadsSapDiskConfiguration.md b/src/Workloads/Workloads.Autorest/docs/Invoke-AzWorkloadsSapDiskConfiguration.md
similarity index 100%
rename from src/Workloads/docs/Invoke-AzWorkloadsSapDiskConfiguration.md
rename to src/Workloads/Workloads.Autorest/docs/Invoke-AzWorkloadsSapDiskConfiguration.md
diff --git a/src/Workloads/docs/Invoke-AzWorkloadsSapSizingRecommendation.md b/src/Workloads/Workloads.Autorest/docs/Invoke-AzWorkloadsSapSizingRecommendation.md
similarity index 100%
rename from src/Workloads/docs/Invoke-AzWorkloadsSapSizingRecommendation.md
rename to src/Workloads/Workloads.Autorest/docs/Invoke-AzWorkloadsSapSizingRecommendation.md
diff --git a/src/Workloads/docs/Invoke-AzWorkloadsSapSupportedSku.md b/src/Workloads/Workloads.Autorest/docs/Invoke-AzWorkloadsSapSupportedSku.md
similarity index 100%
rename from src/Workloads/docs/Invoke-AzWorkloadsSapSupportedSku.md
rename to src/Workloads/Workloads.Autorest/docs/Invoke-AzWorkloadsSapSupportedSku.md
diff --git a/src/Workloads/docs/New-AzWorkloadsMonitor.md b/src/Workloads/Workloads.Autorest/docs/New-AzWorkloadsMonitor.md
similarity index 100%
rename from src/Workloads/docs/New-AzWorkloadsMonitor.md
rename to src/Workloads/Workloads.Autorest/docs/New-AzWorkloadsMonitor.md
diff --git a/src/Workloads/docs/New-AzWorkloadsProviderDB2InstanceObject.md b/src/Workloads/Workloads.Autorest/docs/New-AzWorkloadsProviderDB2InstanceObject.md
similarity index 100%
rename from src/Workloads/docs/New-AzWorkloadsProviderDB2InstanceObject.md
rename to src/Workloads/Workloads.Autorest/docs/New-AzWorkloadsProviderDB2InstanceObject.md
diff --git a/src/Workloads/docs/New-AzWorkloadsProviderHanaDbInstanceObject.md b/src/Workloads/Workloads.Autorest/docs/New-AzWorkloadsProviderHanaDbInstanceObject.md
similarity index 100%
rename from src/Workloads/docs/New-AzWorkloadsProviderHanaDbInstanceObject.md
rename to src/Workloads/Workloads.Autorest/docs/New-AzWorkloadsProviderHanaDbInstanceObject.md
diff --git a/src/Workloads/docs/New-AzWorkloadsProviderInstance.md b/src/Workloads/Workloads.Autorest/docs/New-AzWorkloadsProviderInstance.md
similarity index 100%
rename from src/Workloads/docs/New-AzWorkloadsProviderInstance.md
rename to src/Workloads/Workloads.Autorest/docs/New-AzWorkloadsProviderInstance.md
diff --git a/src/Workloads/docs/New-AzWorkloadsProviderPrometheusHaClusterInstanceObject.md b/src/Workloads/Workloads.Autorest/docs/New-AzWorkloadsProviderPrometheusHaClusterInstanceObject.md
similarity index 100%
rename from src/Workloads/docs/New-AzWorkloadsProviderPrometheusHaClusterInstanceObject.md
rename to src/Workloads/Workloads.Autorest/docs/New-AzWorkloadsProviderPrometheusHaClusterInstanceObject.md
diff --git a/src/Workloads/docs/New-AzWorkloadsProviderPrometheusOSInstanceObject.md b/src/Workloads/Workloads.Autorest/docs/New-AzWorkloadsProviderPrometheusOSInstanceObject.md
similarity index 100%
rename from src/Workloads/docs/New-AzWorkloadsProviderPrometheusOSInstanceObject.md
rename to src/Workloads/Workloads.Autorest/docs/New-AzWorkloadsProviderPrometheusOSInstanceObject.md
diff --git a/src/Workloads/docs/New-AzWorkloadsProviderSapNetWeaverInstanceObject.md b/src/Workloads/Workloads.Autorest/docs/New-AzWorkloadsProviderSapNetWeaverInstanceObject.md
similarity index 100%
rename from src/Workloads/docs/New-AzWorkloadsProviderSapNetWeaverInstanceObject.md
rename to src/Workloads/Workloads.Autorest/docs/New-AzWorkloadsProviderSapNetWeaverInstanceObject.md
diff --git a/src/Workloads/docs/New-AzWorkloadsProviderSqlServerInstanceObject.md b/src/Workloads/Workloads.Autorest/docs/New-AzWorkloadsProviderSqlServerInstanceObject.md
similarity index 100%
rename from src/Workloads/docs/New-AzWorkloadsProviderSqlServerInstanceObject.md
rename to src/Workloads/Workloads.Autorest/docs/New-AzWorkloadsProviderSqlServerInstanceObject.md
diff --git a/src/Workloads/docs/New-AzWorkloadsSapLandscapeMonitor.md b/src/Workloads/Workloads.Autorest/docs/New-AzWorkloadsSapLandscapeMonitor.md
similarity index 100%
rename from src/Workloads/docs/New-AzWorkloadsSapLandscapeMonitor.md
rename to src/Workloads/Workloads.Autorest/docs/New-AzWorkloadsSapLandscapeMonitor.md
diff --git a/src/Workloads/docs/New-AzWorkloadsSapLandscapeMonitorMetricThresholdsObject.md b/src/Workloads/Workloads.Autorest/docs/New-AzWorkloadsSapLandscapeMonitorMetricThresholdsObject.md
similarity index 100%
rename from src/Workloads/docs/New-AzWorkloadsSapLandscapeMonitorMetricThresholdsObject.md
rename to src/Workloads/Workloads.Autorest/docs/New-AzWorkloadsSapLandscapeMonitorMetricThresholdsObject.md
diff --git a/src/Workloads/docs/New-AzWorkloadsSapLandscapeMonitorSidMappingObject.md b/src/Workloads/Workloads.Autorest/docs/New-AzWorkloadsSapLandscapeMonitorSidMappingObject.md
similarity index 100%
rename from src/Workloads/docs/New-AzWorkloadsSapLandscapeMonitorSidMappingObject.md
rename to src/Workloads/Workloads.Autorest/docs/New-AzWorkloadsSapLandscapeMonitorSidMappingObject.md
diff --git a/src/Workloads/docs/New-AzWorkloadsSapVirtualInstance.md b/src/Workloads/Workloads.Autorest/docs/New-AzWorkloadsSapVirtualInstance.md
similarity index 100%
rename from src/Workloads/docs/New-AzWorkloadsSapVirtualInstance.md
rename to src/Workloads/Workloads.Autorest/docs/New-AzWorkloadsSapVirtualInstance.md
diff --git a/src/Workloads/docs/README.md b/src/Workloads/Workloads.Autorest/docs/README.md
similarity index 100%
rename from src/Workloads/docs/README.md
rename to src/Workloads/Workloads.Autorest/docs/README.md
diff --git a/src/Workloads/docs/Remove-AzWorkloadsMonitor.md b/src/Workloads/Workloads.Autorest/docs/Remove-AzWorkloadsMonitor.md
similarity index 100%
rename from src/Workloads/docs/Remove-AzWorkloadsMonitor.md
rename to src/Workloads/Workloads.Autorest/docs/Remove-AzWorkloadsMonitor.md
diff --git a/src/Workloads/docs/Remove-AzWorkloadsProviderInstance.md b/src/Workloads/Workloads.Autorest/docs/Remove-AzWorkloadsProviderInstance.md
similarity index 100%
rename from src/Workloads/docs/Remove-AzWorkloadsProviderInstance.md
rename to src/Workloads/Workloads.Autorest/docs/Remove-AzWorkloadsProviderInstance.md
diff --git a/src/Workloads/docs/Remove-AzWorkloadsSapLandscapeMonitor.md b/src/Workloads/Workloads.Autorest/docs/Remove-AzWorkloadsSapLandscapeMonitor.md
similarity index 100%
rename from src/Workloads/docs/Remove-AzWorkloadsSapLandscapeMonitor.md
rename to src/Workloads/Workloads.Autorest/docs/Remove-AzWorkloadsSapLandscapeMonitor.md
diff --git a/src/Workloads/docs/Remove-AzWorkloadsSapVirtualInstance.md b/src/Workloads/Workloads.Autorest/docs/Remove-AzWorkloadsSapVirtualInstance.md
similarity index 100%
rename from src/Workloads/docs/Remove-AzWorkloadsSapVirtualInstance.md
rename to src/Workloads/Workloads.Autorest/docs/Remove-AzWorkloadsSapVirtualInstance.md
diff --git a/src/Workloads/docs/Start-AzWorkloadsSapApplicationInstance.md b/src/Workloads/Workloads.Autorest/docs/Start-AzWorkloadsSapApplicationInstance.md
similarity index 100%
rename from src/Workloads/docs/Start-AzWorkloadsSapApplicationInstance.md
rename to src/Workloads/Workloads.Autorest/docs/Start-AzWorkloadsSapApplicationInstance.md
diff --git a/src/Workloads/docs/Start-AzWorkloadsSapCentralInstance.md b/src/Workloads/Workloads.Autorest/docs/Start-AzWorkloadsSapCentralInstance.md
similarity index 100%
rename from src/Workloads/docs/Start-AzWorkloadsSapCentralInstance.md
rename to src/Workloads/Workloads.Autorest/docs/Start-AzWorkloadsSapCentralInstance.md
diff --git a/src/Workloads/docs/Start-AzWorkloadsSapDatabaseInstance.md b/src/Workloads/Workloads.Autorest/docs/Start-AzWorkloadsSapDatabaseInstance.md
similarity index 100%
rename from src/Workloads/docs/Start-AzWorkloadsSapDatabaseInstance.md
rename to src/Workloads/Workloads.Autorest/docs/Start-AzWorkloadsSapDatabaseInstance.md
diff --git a/src/Workloads/docs/Start-AzWorkloadsSapVirtualInstance.md b/src/Workloads/Workloads.Autorest/docs/Start-AzWorkloadsSapVirtualInstance.md
similarity index 100%
rename from src/Workloads/docs/Start-AzWorkloadsSapVirtualInstance.md
rename to src/Workloads/Workloads.Autorest/docs/Start-AzWorkloadsSapVirtualInstance.md
diff --git a/src/Workloads/docs/Stop-AzWorkloadsSapApplicationInstance.md b/src/Workloads/Workloads.Autorest/docs/Stop-AzWorkloadsSapApplicationInstance.md
similarity index 100%
rename from src/Workloads/docs/Stop-AzWorkloadsSapApplicationInstance.md
rename to src/Workloads/Workloads.Autorest/docs/Stop-AzWorkloadsSapApplicationInstance.md
diff --git a/src/Workloads/docs/Stop-AzWorkloadsSapCentralInstance.md b/src/Workloads/Workloads.Autorest/docs/Stop-AzWorkloadsSapCentralInstance.md
similarity index 100%
rename from src/Workloads/docs/Stop-AzWorkloadsSapCentralInstance.md
rename to src/Workloads/Workloads.Autorest/docs/Stop-AzWorkloadsSapCentralInstance.md
diff --git a/src/Workloads/docs/Stop-AzWorkloadsSapDatabaseInstance.md b/src/Workloads/Workloads.Autorest/docs/Stop-AzWorkloadsSapDatabaseInstance.md
similarity index 100%
rename from src/Workloads/docs/Stop-AzWorkloadsSapDatabaseInstance.md
rename to src/Workloads/Workloads.Autorest/docs/Stop-AzWorkloadsSapDatabaseInstance.md
diff --git a/src/Workloads/docs/Stop-AzWorkloadsSapVirtualInstance.md b/src/Workloads/Workloads.Autorest/docs/Stop-AzWorkloadsSapVirtualInstance.md
similarity index 100%
rename from src/Workloads/docs/Stop-AzWorkloadsSapVirtualInstance.md
rename to src/Workloads/Workloads.Autorest/docs/Stop-AzWorkloadsSapVirtualInstance.md
diff --git a/src/Workloads/docs/Update-AzWorkloadsMonitor.md b/src/Workloads/Workloads.Autorest/docs/Update-AzWorkloadsMonitor.md
similarity index 100%
rename from src/Workloads/docs/Update-AzWorkloadsMonitor.md
rename to src/Workloads/Workloads.Autorest/docs/Update-AzWorkloadsMonitor.md
diff --git a/src/Workloads/docs/Update-AzWorkloadsSapApplicationInstance.md b/src/Workloads/Workloads.Autorest/docs/Update-AzWorkloadsSapApplicationInstance.md
similarity index 100%
rename from src/Workloads/docs/Update-AzWorkloadsSapApplicationInstance.md
rename to src/Workloads/Workloads.Autorest/docs/Update-AzWorkloadsSapApplicationInstance.md
diff --git a/src/Workloads/docs/Update-AzWorkloadsSapCentralInstance.md b/src/Workloads/Workloads.Autorest/docs/Update-AzWorkloadsSapCentralInstance.md
similarity index 100%
rename from src/Workloads/docs/Update-AzWorkloadsSapCentralInstance.md
rename to src/Workloads/Workloads.Autorest/docs/Update-AzWorkloadsSapCentralInstance.md
diff --git a/src/Workloads/docs/Update-AzWorkloadsSapDatabaseInstance.md b/src/Workloads/Workloads.Autorest/docs/Update-AzWorkloadsSapDatabaseInstance.md
similarity index 100%
rename from src/Workloads/docs/Update-AzWorkloadsSapDatabaseInstance.md
rename to src/Workloads/Workloads.Autorest/docs/Update-AzWorkloadsSapDatabaseInstance.md
diff --git a/src/Workloads/docs/Update-AzWorkloadsSapLandscapeMonitor.md b/src/Workloads/Workloads.Autorest/docs/Update-AzWorkloadsSapLandscapeMonitor.md
similarity index 100%
rename from src/Workloads/docs/Update-AzWorkloadsSapLandscapeMonitor.md
rename to src/Workloads/Workloads.Autorest/docs/Update-AzWorkloadsSapLandscapeMonitor.md
diff --git a/src/Workloads/docs/Update-AzWorkloadsSapVirtualInstance.md b/src/Workloads/Workloads.Autorest/docs/Update-AzWorkloadsSapVirtualInstance.md
similarity index 100%
rename from src/Workloads/docs/Update-AzWorkloadsSapVirtualInstance.md
rename to src/Workloads/Workloads.Autorest/docs/Update-AzWorkloadsSapVirtualInstance.md
diff --git a/src/Workloads/examples/Get-AzWorkloadsMonitor.md b/src/Workloads/Workloads.Autorest/examples/Get-AzWorkloadsMonitor.md
similarity index 100%
rename from src/Workloads/examples/Get-AzWorkloadsMonitor.md
rename to src/Workloads/Workloads.Autorest/examples/Get-AzWorkloadsMonitor.md
diff --git a/src/Workloads/examples/Get-AzWorkloadsProviderInstance.md b/src/Workloads/Workloads.Autorest/examples/Get-AzWorkloadsProviderInstance.md
similarity index 100%
rename from src/Workloads/examples/Get-AzWorkloadsProviderInstance.md
rename to src/Workloads/Workloads.Autorest/examples/Get-AzWorkloadsProviderInstance.md
diff --git a/src/Workloads/examples/Get-AzWorkloadsSapApplicationInstance.md b/src/Workloads/Workloads.Autorest/examples/Get-AzWorkloadsSapApplicationInstance.md
similarity index 100%
rename from src/Workloads/examples/Get-AzWorkloadsSapApplicationInstance.md
rename to src/Workloads/Workloads.Autorest/examples/Get-AzWorkloadsSapApplicationInstance.md
diff --git a/src/Workloads/examples/Get-AzWorkloadsSapCentralInstance.md b/src/Workloads/Workloads.Autorest/examples/Get-AzWorkloadsSapCentralInstance.md
similarity index 100%
rename from src/Workloads/examples/Get-AzWorkloadsSapCentralInstance.md
rename to src/Workloads/Workloads.Autorest/examples/Get-AzWorkloadsSapCentralInstance.md
diff --git a/src/Workloads/examples/Get-AzWorkloadsSapDatabaseInstance.md b/src/Workloads/Workloads.Autorest/examples/Get-AzWorkloadsSapDatabaseInstance.md
similarity index 100%
rename from src/Workloads/examples/Get-AzWorkloadsSapDatabaseInstance.md
rename to src/Workloads/Workloads.Autorest/examples/Get-AzWorkloadsSapDatabaseInstance.md
diff --git a/src/Workloads/examples/Get-AzWorkloadsSapLandscapeMonitor.md b/src/Workloads/Workloads.Autorest/examples/Get-AzWorkloadsSapLandscapeMonitor.md
similarity index 100%
rename from src/Workloads/examples/Get-AzWorkloadsSapLandscapeMonitor.md
rename to src/Workloads/Workloads.Autorest/examples/Get-AzWorkloadsSapLandscapeMonitor.md
diff --git a/src/Workloads/examples/Get-AzWorkloadsSapVirtualInstance.md b/src/Workloads/Workloads.Autorest/examples/Get-AzWorkloadsSapVirtualInstance.md
similarity index 100%
rename from src/Workloads/examples/Get-AzWorkloadsSapVirtualInstance.md
rename to src/Workloads/Workloads.Autorest/examples/Get-AzWorkloadsSapVirtualInstance.md
diff --git a/src/Workloads/examples/Invoke-AzWorkloadsSapDiskConfiguration.md b/src/Workloads/Workloads.Autorest/examples/Invoke-AzWorkloadsSapDiskConfiguration.md
similarity index 100%
rename from src/Workloads/examples/Invoke-AzWorkloadsSapDiskConfiguration.md
rename to src/Workloads/Workloads.Autorest/examples/Invoke-AzWorkloadsSapDiskConfiguration.md
diff --git a/src/Workloads/examples/Invoke-AzWorkloadsSapSizingRecommendation.md b/src/Workloads/Workloads.Autorest/examples/Invoke-AzWorkloadsSapSizingRecommendation.md
similarity index 100%
rename from src/Workloads/examples/Invoke-AzWorkloadsSapSizingRecommendation.md
rename to src/Workloads/Workloads.Autorest/examples/Invoke-AzWorkloadsSapSizingRecommendation.md
diff --git a/src/Workloads/examples/Invoke-AzWorkloadsSapSupportedSku.md b/src/Workloads/Workloads.Autorest/examples/Invoke-AzWorkloadsSapSupportedSku.md
similarity index 100%
rename from src/Workloads/examples/Invoke-AzWorkloadsSapSupportedSku.md
rename to src/Workloads/Workloads.Autorest/examples/Invoke-AzWorkloadsSapSupportedSku.md
diff --git a/src/Workloads/examples/New-AzWorkloadsMonitor.md b/src/Workloads/Workloads.Autorest/examples/New-AzWorkloadsMonitor.md
similarity index 100%
rename from src/Workloads/examples/New-AzWorkloadsMonitor.md
rename to src/Workloads/Workloads.Autorest/examples/New-AzWorkloadsMonitor.md
diff --git a/src/Workloads/examples/New-AzWorkloadsProviderDB2InstanceObject.md b/src/Workloads/Workloads.Autorest/examples/New-AzWorkloadsProviderDB2InstanceObject.md
similarity index 100%
rename from src/Workloads/examples/New-AzWorkloadsProviderDB2InstanceObject.md
rename to src/Workloads/Workloads.Autorest/examples/New-AzWorkloadsProviderDB2InstanceObject.md
diff --git a/src/Workloads/examples/New-AzWorkloadsProviderHanaDbInstanceObject.md b/src/Workloads/Workloads.Autorest/examples/New-AzWorkloadsProviderHanaDbInstanceObject.md
similarity index 100%
rename from src/Workloads/examples/New-AzWorkloadsProviderHanaDbInstanceObject.md
rename to src/Workloads/Workloads.Autorest/examples/New-AzWorkloadsProviderHanaDbInstanceObject.md
diff --git a/src/Workloads/examples/New-AzWorkloadsProviderInstance.md b/src/Workloads/Workloads.Autorest/examples/New-AzWorkloadsProviderInstance.md
similarity index 100%
rename from src/Workloads/examples/New-AzWorkloadsProviderInstance.md
rename to src/Workloads/Workloads.Autorest/examples/New-AzWorkloadsProviderInstance.md
diff --git a/src/Workloads/examples/New-AzWorkloadsProviderPrometheusHaClusterInstanceObject.md b/src/Workloads/Workloads.Autorest/examples/New-AzWorkloadsProviderPrometheusHaClusterInstanceObject.md
similarity index 100%
rename from src/Workloads/examples/New-AzWorkloadsProviderPrometheusHaClusterInstanceObject.md
rename to src/Workloads/Workloads.Autorest/examples/New-AzWorkloadsProviderPrometheusHaClusterInstanceObject.md
diff --git a/src/Workloads/examples/New-AzWorkloadsProviderPrometheusOSInstanceObject.md b/src/Workloads/Workloads.Autorest/examples/New-AzWorkloadsProviderPrometheusOSInstanceObject.md
similarity index 100%
rename from src/Workloads/examples/New-AzWorkloadsProviderPrometheusOSInstanceObject.md
rename to src/Workloads/Workloads.Autorest/examples/New-AzWorkloadsProviderPrometheusOSInstanceObject.md
diff --git a/src/Workloads/examples/New-AzWorkloadsProviderSapNetWeaverInstanceObject.md b/src/Workloads/Workloads.Autorest/examples/New-AzWorkloadsProviderSapNetWeaverInstanceObject.md
similarity index 100%
rename from src/Workloads/examples/New-AzWorkloadsProviderSapNetWeaverInstanceObject.md
rename to src/Workloads/Workloads.Autorest/examples/New-AzWorkloadsProviderSapNetWeaverInstanceObject.md
diff --git a/src/Workloads/examples/New-AzWorkloadsProviderSqlServerInstanceObject.md b/src/Workloads/Workloads.Autorest/examples/New-AzWorkloadsProviderSqlServerInstanceObject.md
similarity index 100%
rename from src/Workloads/examples/New-AzWorkloadsProviderSqlServerInstanceObject.md
rename to src/Workloads/Workloads.Autorest/examples/New-AzWorkloadsProviderSqlServerInstanceObject.md
diff --git a/src/Workloads/examples/New-AzWorkloadsSapLandscapeMonitor.md b/src/Workloads/Workloads.Autorest/examples/New-AzWorkloadsSapLandscapeMonitor.md
similarity index 100%
rename from src/Workloads/examples/New-AzWorkloadsSapLandscapeMonitor.md
rename to src/Workloads/Workloads.Autorest/examples/New-AzWorkloadsSapLandscapeMonitor.md
diff --git a/src/Workloads/examples/New-AzWorkloadsSapLandscapeMonitorMetricThresholdsObject.md b/src/Workloads/Workloads.Autorest/examples/New-AzWorkloadsSapLandscapeMonitorMetricThresholdsObject.md
similarity index 100%
rename from src/Workloads/examples/New-AzWorkloadsSapLandscapeMonitorMetricThresholdsObject.md
rename to src/Workloads/Workloads.Autorest/examples/New-AzWorkloadsSapLandscapeMonitorMetricThresholdsObject.md
diff --git a/src/Workloads/examples/New-AzWorkloadsSapLandscapeMonitorSidMappingObject.md b/src/Workloads/Workloads.Autorest/examples/New-AzWorkloadsSapLandscapeMonitorSidMappingObject.md
similarity index 100%
rename from src/Workloads/examples/New-AzWorkloadsSapLandscapeMonitorSidMappingObject.md
rename to src/Workloads/Workloads.Autorest/examples/New-AzWorkloadsSapLandscapeMonitorSidMappingObject.md
diff --git a/src/Workloads/examples/New-AzWorkloadsSapVirtualInstance.md b/src/Workloads/Workloads.Autorest/examples/New-AzWorkloadsSapVirtualInstance.md
similarity index 100%
rename from src/Workloads/examples/New-AzWorkloadsSapVirtualInstance.md
rename to src/Workloads/Workloads.Autorest/examples/New-AzWorkloadsSapVirtualInstance.md
diff --git a/src/Workloads/examples/Remove-AzWorkloadsMonitor.md b/src/Workloads/Workloads.Autorest/examples/Remove-AzWorkloadsMonitor.md
similarity index 100%
rename from src/Workloads/examples/Remove-AzWorkloadsMonitor.md
rename to src/Workloads/Workloads.Autorest/examples/Remove-AzWorkloadsMonitor.md
diff --git a/src/Workloads/examples/Remove-AzWorkloadsProviderInstance.md b/src/Workloads/Workloads.Autorest/examples/Remove-AzWorkloadsProviderInstance.md
similarity index 100%
rename from src/Workloads/examples/Remove-AzWorkloadsProviderInstance.md
rename to src/Workloads/Workloads.Autorest/examples/Remove-AzWorkloadsProviderInstance.md
diff --git a/src/Workloads/examples/Remove-AzWorkloadsSapLandscapeMonitor.md b/src/Workloads/Workloads.Autorest/examples/Remove-AzWorkloadsSapLandscapeMonitor.md
similarity index 100%
rename from src/Workloads/examples/Remove-AzWorkloadsSapLandscapeMonitor.md
rename to src/Workloads/Workloads.Autorest/examples/Remove-AzWorkloadsSapLandscapeMonitor.md
diff --git a/src/Workloads/examples/Remove-AzWorkloadsSapVirtualInstance.md b/src/Workloads/Workloads.Autorest/examples/Remove-AzWorkloadsSapVirtualInstance.md
similarity index 100%
rename from src/Workloads/examples/Remove-AzWorkloadsSapVirtualInstance.md
rename to src/Workloads/Workloads.Autorest/examples/Remove-AzWorkloadsSapVirtualInstance.md
diff --git a/src/Workloads/examples/Start-AzWorkloadsSapApplicationInstance.md b/src/Workloads/Workloads.Autorest/examples/Start-AzWorkloadsSapApplicationInstance.md
similarity index 100%
rename from src/Workloads/examples/Start-AzWorkloadsSapApplicationInstance.md
rename to src/Workloads/Workloads.Autorest/examples/Start-AzWorkloadsSapApplicationInstance.md
diff --git a/src/Workloads/examples/Start-AzWorkloadsSapCentralInstance.md b/src/Workloads/Workloads.Autorest/examples/Start-AzWorkloadsSapCentralInstance.md
similarity index 100%
rename from src/Workloads/examples/Start-AzWorkloadsSapCentralInstance.md
rename to src/Workloads/Workloads.Autorest/examples/Start-AzWorkloadsSapCentralInstance.md
diff --git a/src/Workloads/examples/Start-AzWorkloadsSapDatabaseInstance.md b/src/Workloads/Workloads.Autorest/examples/Start-AzWorkloadsSapDatabaseInstance.md
similarity index 100%
rename from src/Workloads/examples/Start-AzWorkloadsSapDatabaseInstance.md
rename to src/Workloads/Workloads.Autorest/examples/Start-AzWorkloadsSapDatabaseInstance.md
diff --git a/src/Workloads/examples/Start-AzWorkloadsSapVirtualInstance.md b/src/Workloads/Workloads.Autorest/examples/Start-AzWorkloadsSapVirtualInstance.md
similarity index 100%
rename from src/Workloads/examples/Start-AzWorkloadsSapVirtualInstance.md
rename to src/Workloads/Workloads.Autorest/examples/Start-AzWorkloadsSapVirtualInstance.md
diff --git a/src/Workloads/examples/Stop-AzWorkloadsSapApplicationInstance.md b/src/Workloads/Workloads.Autorest/examples/Stop-AzWorkloadsSapApplicationInstance.md
similarity index 100%
rename from src/Workloads/examples/Stop-AzWorkloadsSapApplicationInstance.md
rename to src/Workloads/Workloads.Autorest/examples/Stop-AzWorkloadsSapApplicationInstance.md
diff --git a/src/Workloads/examples/Stop-AzWorkloadsSapCentralInstance.md b/src/Workloads/Workloads.Autorest/examples/Stop-AzWorkloadsSapCentralInstance.md
similarity index 100%
rename from src/Workloads/examples/Stop-AzWorkloadsSapCentralInstance.md
rename to src/Workloads/Workloads.Autorest/examples/Stop-AzWorkloadsSapCentralInstance.md
diff --git a/src/Workloads/examples/Stop-AzWorkloadsSapDatabaseInstance.md b/src/Workloads/Workloads.Autorest/examples/Stop-AzWorkloadsSapDatabaseInstance.md
similarity index 100%
rename from src/Workloads/examples/Stop-AzWorkloadsSapDatabaseInstance.md
rename to src/Workloads/Workloads.Autorest/examples/Stop-AzWorkloadsSapDatabaseInstance.md
diff --git a/src/Workloads/examples/Stop-AzWorkloadsSapVirtualInstance.md b/src/Workloads/Workloads.Autorest/examples/Stop-AzWorkloadsSapVirtualInstance.md
similarity index 100%
rename from src/Workloads/examples/Stop-AzWorkloadsSapVirtualInstance.md
rename to src/Workloads/Workloads.Autorest/examples/Stop-AzWorkloadsSapVirtualInstance.md
diff --git a/src/Workloads/examples/Update-AzWorkloadsMonitor.md b/src/Workloads/Workloads.Autorest/examples/Update-AzWorkloadsMonitor.md
similarity index 100%
rename from src/Workloads/examples/Update-AzWorkloadsMonitor.md
rename to src/Workloads/Workloads.Autorest/examples/Update-AzWorkloadsMonitor.md
diff --git a/src/Workloads/examples/Update-AzWorkloadsSapApplicationInstance.md b/src/Workloads/Workloads.Autorest/examples/Update-AzWorkloadsSapApplicationInstance.md
similarity index 100%
rename from src/Workloads/examples/Update-AzWorkloadsSapApplicationInstance.md
rename to src/Workloads/Workloads.Autorest/examples/Update-AzWorkloadsSapApplicationInstance.md
diff --git a/src/Workloads/examples/Update-AzWorkloadsSapCentralInstance.md b/src/Workloads/Workloads.Autorest/examples/Update-AzWorkloadsSapCentralInstance.md
similarity index 100%
rename from src/Workloads/examples/Update-AzWorkloadsSapCentralInstance.md
rename to src/Workloads/Workloads.Autorest/examples/Update-AzWorkloadsSapCentralInstance.md
diff --git a/src/Workloads/examples/Update-AzWorkloadsSapDatabaseInstance.md b/src/Workloads/Workloads.Autorest/examples/Update-AzWorkloadsSapDatabaseInstance.md
similarity index 100%
rename from src/Workloads/examples/Update-AzWorkloadsSapDatabaseInstance.md
rename to src/Workloads/Workloads.Autorest/examples/Update-AzWorkloadsSapDatabaseInstance.md
diff --git a/src/Workloads/examples/Update-AzWorkloadsSapLandscapeMonitor.md b/src/Workloads/Workloads.Autorest/examples/Update-AzWorkloadsSapLandscapeMonitor.md
similarity index 100%
rename from src/Workloads/examples/Update-AzWorkloadsSapLandscapeMonitor.md
rename to src/Workloads/Workloads.Autorest/examples/Update-AzWorkloadsSapLandscapeMonitor.md
diff --git a/src/Workloads/examples/Update-AzWorkloadsSapVirtualInstance.md b/src/Workloads/Workloads.Autorest/examples/Update-AzWorkloadsSapVirtualInstance.md
similarity index 100%
rename from src/Workloads/examples/Update-AzWorkloadsSapVirtualInstance.md
rename to src/Workloads/Workloads.Autorest/examples/Update-AzWorkloadsSapVirtualInstance.md
diff --git a/src/Workloads/how-to.md b/src/Workloads/Workloads.Autorest/how-to.md
similarity index 100%
rename from src/Workloads/how-to.md
rename to src/Workloads/Workloads.Autorest/how-to.md
diff --git a/src/Workloads/license.txt b/src/Workloads/Workloads.Autorest/license.txt
similarity index 100%
rename from src/Workloads/license.txt
rename to src/Workloads/Workloads.Autorest/license.txt
diff --git a/src/Workloads/resources/README.md b/src/Workloads/Workloads.Autorest/resources/README.md
similarity index 100%
rename from src/Workloads/resources/README.md
rename to src/Workloads/Workloads.Autorest/resources/README.md
diff --git a/src/Workloads/test/CreateSVIConfig.json b/src/Workloads/Workloads.Autorest/test/CreateSVIConfig.json
similarity index 100%
rename from src/Workloads/test/CreateSVIConfig.json
rename to src/Workloads/Workloads.Autorest/test/CreateSVIConfig.json
diff --git a/src/Workloads/test/Get-AzWorkloadsMonitor.Recording.json b/src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsMonitor.Recording.json
similarity index 100%
rename from src/Workloads/test/Get-AzWorkloadsMonitor.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsMonitor.Recording.json
diff --git a/src/Workloads/test/Get-AzWorkloadsMonitor.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsMonitor.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Get-AzWorkloadsMonitor.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsMonitor.Tests.ps1
diff --git a/src/Workloads/test/Get-AzWorkloadsProviderInstance.Recording.json b/src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsProviderInstance.Recording.json
similarity index 100%
rename from src/Workloads/test/Get-AzWorkloadsProviderInstance.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsProviderInstance.Recording.json
diff --git a/src/Workloads/test/Get-AzWorkloadsProviderInstance.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsProviderInstance.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Get-AzWorkloadsProviderInstance.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsProviderInstance.Tests.ps1
diff --git a/src/Workloads/test/Get-AzWorkloadsSapApplicationInstance.Recording.json b/src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsSapApplicationInstance.Recording.json
similarity index 100%
rename from src/Workloads/test/Get-AzWorkloadsSapApplicationInstance.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsSapApplicationInstance.Recording.json
diff --git a/src/Workloads/test/Get-AzWorkloadsSapApplicationInstance.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsSapApplicationInstance.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Get-AzWorkloadsSapApplicationInstance.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsSapApplicationInstance.Tests.ps1
diff --git a/src/Workloads/test/Get-AzWorkloadsSapCentralInstance.Recording.json b/src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsSapCentralInstance.Recording.json
similarity index 100%
rename from src/Workloads/test/Get-AzWorkloadsSapCentralInstance.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsSapCentralInstance.Recording.json
diff --git a/src/Workloads/test/Get-AzWorkloadsSapCentralInstance.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsSapCentralInstance.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Get-AzWorkloadsSapCentralInstance.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsSapCentralInstance.Tests.ps1
diff --git a/src/Workloads/test/Get-AzWorkloadsSapDatabaseInstance.Recording.json b/src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsSapDatabaseInstance.Recording.json
similarity index 100%
rename from src/Workloads/test/Get-AzWorkloadsSapDatabaseInstance.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsSapDatabaseInstance.Recording.json
diff --git a/src/Workloads/test/Get-AzWorkloadsSapDatabaseInstance.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsSapDatabaseInstance.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Get-AzWorkloadsSapDatabaseInstance.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsSapDatabaseInstance.Tests.ps1
diff --git a/src/Workloads/test/Get-AzWorkloadsSapLandscapeMonitor.Recording.json b/src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsSapLandscapeMonitor.Recording.json
similarity index 100%
rename from src/Workloads/test/Get-AzWorkloadsSapLandscapeMonitor.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsSapLandscapeMonitor.Recording.json
diff --git a/src/Workloads/test/Get-AzWorkloadsSapLandscapeMonitor.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsSapLandscapeMonitor.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Get-AzWorkloadsSapLandscapeMonitor.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsSapLandscapeMonitor.Tests.ps1
diff --git a/src/Workloads/test/Get-AzWorkloadsSapVirtualInstance.Recording.json b/src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsSapVirtualInstance.Recording.json
similarity index 100%
rename from src/Workloads/test/Get-AzWorkloadsSapVirtualInstance.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsSapVirtualInstance.Recording.json
diff --git a/src/Workloads/test/Get-AzWorkloadsSapVirtualInstance.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsSapVirtualInstance.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Get-AzWorkloadsSapVirtualInstance.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Get-AzWorkloadsSapVirtualInstance.Tests.ps1
diff --git a/src/Workloads/test/Invoke-AzWorkloadsSapDiskConfiguration.Recording.json b/src/Workloads/Workloads.Autorest/test/Invoke-AzWorkloadsSapDiskConfiguration.Recording.json
similarity index 100%
rename from src/Workloads/test/Invoke-AzWorkloadsSapDiskConfiguration.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Invoke-AzWorkloadsSapDiskConfiguration.Recording.json
diff --git a/src/Workloads/test/Invoke-AzWorkloadsSapDiskConfiguration.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Invoke-AzWorkloadsSapDiskConfiguration.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Invoke-AzWorkloadsSapDiskConfiguration.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Invoke-AzWorkloadsSapDiskConfiguration.Tests.ps1
diff --git a/src/Workloads/test/Invoke-AzWorkloadsSapSizingRecommendation.Recording.json b/src/Workloads/Workloads.Autorest/test/Invoke-AzWorkloadsSapSizingRecommendation.Recording.json
similarity index 100%
rename from src/Workloads/test/Invoke-AzWorkloadsSapSizingRecommendation.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Invoke-AzWorkloadsSapSizingRecommendation.Recording.json
diff --git a/src/Workloads/test/Invoke-AzWorkloadsSapSizingRecommendation.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Invoke-AzWorkloadsSapSizingRecommendation.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Invoke-AzWorkloadsSapSizingRecommendation.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Invoke-AzWorkloadsSapSizingRecommendation.Tests.ps1
diff --git a/src/Workloads/test/Invoke-AzWorkloadsSapSupportedSku.Recording.json b/src/Workloads/Workloads.Autorest/test/Invoke-AzWorkloadsSapSupportedSku.Recording.json
similarity index 100%
rename from src/Workloads/test/Invoke-AzWorkloadsSapSupportedSku.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Invoke-AzWorkloadsSapSupportedSku.Recording.json
diff --git a/src/Workloads/test/Invoke-AzWorkloadsSapSupportedSku.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Invoke-AzWorkloadsSapSupportedSku.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Invoke-AzWorkloadsSapSupportedSku.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Invoke-AzWorkloadsSapSupportedSku.Tests.ps1
diff --git a/src/Workloads/test/New-AzWorkloadsMonitor.Recording.json b/src/Workloads/Workloads.Autorest/test/New-AzWorkloadsMonitor.Recording.json
similarity index 100%
rename from src/Workloads/test/New-AzWorkloadsMonitor.Recording.json
rename to src/Workloads/Workloads.Autorest/test/New-AzWorkloadsMonitor.Recording.json
diff --git a/src/Workloads/test/New-AzWorkloadsMonitor.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/New-AzWorkloadsMonitor.Tests.ps1
similarity index 100%
rename from src/Workloads/test/New-AzWorkloadsMonitor.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/New-AzWorkloadsMonitor.Tests.ps1
diff --git a/src/Workloads/test/New-AzWorkloadsProviderDB2InstanceObject.Recording.json b/src/Workloads/Workloads.Autorest/test/New-AzWorkloadsProviderDB2InstanceObject.Recording.json
similarity index 100%
rename from src/Workloads/test/New-AzWorkloadsProviderDB2InstanceObject.Recording.json
rename to src/Workloads/Workloads.Autorest/test/New-AzWorkloadsProviderDB2InstanceObject.Recording.json
diff --git a/src/Workloads/test/New-AzWorkloadsProviderDB2InstanceObject.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/New-AzWorkloadsProviderDB2InstanceObject.Tests.ps1
similarity index 100%
rename from src/Workloads/test/New-AzWorkloadsProviderDB2InstanceObject.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/New-AzWorkloadsProviderDB2InstanceObject.Tests.ps1
diff --git a/src/Workloads/test/New-AzWorkloadsProviderHanaDbInstanceObject.Recording.json b/src/Workloads/Workloads.Autorest/test/New-AzWorkloadsProviderHanaDbInstanceObject.Recording.json
similarity index 100%
rename from src/Workloads/test/New-AzWorkloadsProviderHanaDbInstanceObject.Recording.json
rename to src/Workloads/Workloads.Autorest/test/New-AzWorkloadsProviderHanaDbInstanceObject.Recording.json
diff --git a/src/Workloads/test/New-AzWorkloadsProviderHanaDbInstanceObject.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/New-AzWorkloadsProviderHanaDbInstanceObject.Tests.ps1
similarity index 100%
rename from src/Workloads/test/New-AzWorkloadsProviderHanaDbInstanceObject.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/New-AzWorkloadsProviderHanaDbInstanceObject.Tests.ps1
diff --git a/src/Workloads/test/New-AzWorkloadsProviderInstance.Recording.json b/src/Workloads/Workloads.Autorest/test/New-AzWorkloadsProviderInstance.Recording.json
similarity index 100%
rename from src/Workloads/test/New-AzWorkloadsProviderInstance.Recording.json
rename to src/Workloads/Workloads.Autorest/test/New-AzWorkloadsProviderInstance.Recording.json
diff --git a/src/Workloads/test/New-AzWorkloadsProviderInstance.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/New-AzWorkloadsProviderInstance.Tests.ps1
similarity index 100%
rename from src/Workloads/test/New-AzWorkloadsProviderInstance.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/New-AzWorkloadsProviderInstance.Tests.ps1
diff --git a/src/Workloads/test/New-AzWorkloadsProviderPrometheusHaClusterInstanceObject.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/New-AzWorkloadsProviderPrometheusHaClusterInstanceObject.Tests.ps1
similarity index 100%
rename from src/Workloads/test/New-AzWorkloadsProviderPrometheusHaClusterInstanceObject.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/New-AzWorkloadsProviderPrometheusHaClusterInstanceObject.Tests.ps1
diff --git a/src/Workloads/test/New-AzWorkloadsProviderPrometheusOSInstanceObject.Recording.json b/src/Workloads/Workloads.Autorest/test/New-AzWorkloadsProviderPrometheusOSInstanceObject.Recording.json
similarity index 100%
rename from src/Workloads/test/New-AzWorkloadsProviderPrometheusOSInstanceObject.Recording.json
rename to src/Workloads/Workloads.Autorest/test/New-AzWorkloadsProviderPrometheusOSInstanceObject.Recording.json
diff --git a/src/Workloads/test/New-AzWorkloadsProviderPrometheusOSInstanceObject.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/New-AzWorkloadsProviderPrometheusOSInstanceObject.Tests.ps1
similarity index 100%
rename from src/Workloads/test/New-AzWorkloadsProviderPrometheusOSInstanceObject.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/New-AzWorkloadsProviderPrometheusOSInstanceObject.Tests.ps1
diff --git a/src/Workloads/test/New-AzWorkloadsProviderSapNetWeaverInstanceObject.Recording.json b/src/Workloads/Workloads.Autorest/test/New-AzWorkloadsProviderSapNetWeaverInstanceObject.Recording.json
similarity index 100%
rename from src/Workloads/test/New-AzWorkloadsProviderSapNetWeaverInstanceObject.Recording.json
rename to src/Workloads/Workloads.Autorest/test/New-AzWorkloadsProviderSapNetWeaverInstanceObject.Recording.json
diff --git a/src/Workloads/test/New-AzWorkloadsProviderSapNetWeaverInstanceObject.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/New-AzWorkloadsProviderSapNetWeaverInstanceObject.Tests.ps1
similarity index 100%
rename from src/Workloads/test/New-AzWorkloadsProviderSapNetWeaverInstanceObject.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/New-AzWorkloadsProviderSapNetWeaverInstanceObject.Tests.ps1
diff --git a/src/Workloads/test/New-AzWorkloadsProviderSqlServerInstanceObject.Recording.json b/src/Workloads/Workloads.Autorest/test/New-AzWorkloadsProviderSqlServerInstanceObject.Recording.json
similarity index 100%
rename from src/Workloads/test/New-AzWorkloadsProviderSqlServerInstanceObject.Recording.json
rename to src/Workloads/Workloads.Autorest/test/New-AzWorkloadsProviderSqlServerInstanceObject.Recording.json
diff --git a/src/Workloads/test/New-AzWorkloadsProviderSqlServerInstanceObject.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/New-AzWorkloadsProviderSqlServerInstanceObject.Tests.ps1
similarity index 100%
rename from src/Workloads/test/New-AzWorkloadsProviderSqlServerInstanceObject.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/New-AzWorkloadsProviderSqlServerInstanceObject.Tests.ps1
diff --git a/src/Workloads/test/New-AzWorkloadsSapLandscapeMonitor.Recording.json b/src/Workloads/Workloads.Autorest/test/New-AzWorkloadsSapLandscapeMonitor.Recording.json
similarity index 100%
rename from src/Workloads/test/New-AzWorkloadsSapLandscapeMonitor.Recording.json
rename to src/Workloads/Workloads.Autorest/test/New-AzWorkloadsSapLandscapeMonitor.Recording.json
diff --git a/src/Workloads/test/New-AzWorkloadsSapLandscapeMonitor.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/New-AzWorkloadsSapLandscapeMonitor.Tests.ps1
similarity index 100%
rename from src/Workloads/test/New-AzWorkloadsSapLandscapeMonitor.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/New-AzWorkloadsSapLandscapeMonitor.Tests.ps1
diff --git a/src/Workloads/test/New-AzWorkloadsSapLandscapeMonitorMetricThresholdsObject.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/New-AzWorkloadsSapLandscapeMonitorMetricThresholdsObject.Tests.ps1
similarity index 100%
rename from src/Workloads/test/New-AzWorkloadsSapLandscapeMonitorMetricThresholdsObject.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/New-AzWorkloadsSapLandscapeMonitorMetricThresholdsObject.Tests.ps1
diff --git a/src/Workloads/test/New-AzWorkloadsSapLandscapeMonitorSidMappingObject.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/New-AzWorkloadsSapLandscapeMonitorSidMappingObject.Tests.ps1
similarity index 100%
rename from src/Workloads/test/New-AzWorkloadsSapLandscapeMonitorSidMappingObject.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/New-AzWorkloadsSapLandscapeMonitorSidMappingObject.Tests.ps1
diff --git a/src/Workloads/test/New-AzWorkloadsSapVirtualInstance.Recording.json b/src/Workloads/Workloads.Autorest/test/New-AzWorkloadsSapVirtualInstance.Recording.json
similarity index 100%
rename from src/Workloads/test/New-AzWorkloadsSapVirtualInstance.Recording.json
rename to src/Workloads/Workloads.Autorest/test/New-AzWorkloadsSapVirtualInstance.Recording.json
diff --git a/src/Workloads/test/New-AzWorkloadsSapVirtualInstance.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/New-AzWorkloadsSapVirtualInstance.Tests.ps1
similarity index 100%
rename from src/Workloads/test/New-AzWorkloadsSapVirtualInstance.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/New-AzWorkloadsSapVirtualInstance.Tests.ps1
diff --git a/src/Workloads/test/Remove-AzWorkloadsMonitor.Recording.json b/src/Workloads/Workloads.Autorest/test/Remove-AzWorkloadsMonitor.Recording.json
similarity index 100%
rename from src/Workloads/test/Remove-AzWorkloadsMonitor.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Remove-AzWorkloadsMonitor.Recording.json
diff --git a/src/Workloads/test/Remove-AzWorkloadsMonitor.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Remove-AzWorkloadsMonitor.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Remove-AzWorkloadsMonitor.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Remove-AzWorkloadsMonitor.Tests.ps1
diff --git a/src/Workloads/test/Remove-AzWorkloadsProviderInstance.Recording.json b/src/Workloads/Workloads.Autorest/test/Remove-AzWorkloadsProviderInstance.Recording.json
similarity index 100%
rename from src/Workloads/test/Remove-AzWorkloadsProviderInstance.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Remove-AzWorkloadsProviderInstance.Recording.json
diff --git a/src/Workloads/test/Remove-AzWorkloadsProviderInstance.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Remove-AzWorkloadsProviderInstance.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Remove-AzWorkloadsProviderInstance.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Remove-AzWorkloadsProviderInstance.Tests.ps1
diff --git a/src/Workloads/test/Remove-AzWorkloadsSapLandscapeMonitor.Recording.json b/src/Workloads/Workloads.Autorest/test/Remove-AzWorkloadsSapLandscapeMonitor.Recording.json
similarity index 100%
rename from src/Workloads/test/Remove-AzWorkloadsSapLandscapeMonitor.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Remove-AzWorkloadsSapLandscapeMonitor.Recording.json
diff --git a/src/Workloads/test/Remove-AzWorkloadsSapLandscapeMonitor.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Remove-AzWorkloadsSapLandscapeMonitor.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Remove-AzWorkloadsSapLandscapeMonitor.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Remove-AzWorkloadsSapLandscapeMonitor.Tests.ps1
diff --git a/src/Workloads/test/Remove-AzWorkloadsSapVirtualInstance.Recording.json b/src/Workloads/Workloads.Autorest/test/Remove-AzWorkloadsSapVirtualInstance.Recording.json
similarity index 100%
rename from src/Workloads/test/Remove-AzWorkloadsSapVirtualInstance.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Remove-AzWorkloadsSapVirtualInstance.Recording.json
diff --git a/src/Workloads/test/Remove-AzWorkloadsSapVirtualInstance.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Remove-AzWorkloadsSapVirtualInstance.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Remove-AzWorkloadsSapVirtualInstance.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Remove-AzWorkloadsSapVirtualInstance.Tests.ps1
diff --git a/src/Workloads/test/Start-AzWorkloadsSapApplicationInstance.Recording.json b/src/Workloads/Workloads.Autorest/test/Start-AzWorkloadsSapApplicationInstance.Recording.json
similarity index 100%
rename from src/Workloads/test/Start-AzWorkloadsSapApplicationInstance.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Start-AzWorkloadsSapApplicationInstance.Recording.json
diff --git a/src/Workloads/test/Start-AzWorkloadsSapApplicationInstance.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Start-AzWorkloadsSapApplicationInstance.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Start-AzWorkloadsSapApplicationInstance.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Start-AzWorkloadsSapApplicationInstance.Tests.ps1
diff --git a/src/Workloads/test/Start-AzWorkloadsSapCentralInstance.Recording.json b/src/Workloads/Workloads.Autorest/test/Start-AzWorkloadsSapCentralInstance.Recording.json
similarity index 100%
rename from src/Workloads/test/Start-AzWorkloadsSapCentralInstance.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Start-AzWorkloadsSapCentralInstance.Recording.json
diff --git a/src/Workloads/test/Start-AzWorkloadsSapCentralInstance.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Start-AzWorkloadsSapCentralInstance.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Start-AzWorkloadsSapCentralInstance.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Start-AzWorkloadsSapCentralInstance.Tests.ps1
diff --git a/src/Workloads/test/Start-AzWorkloadsSapDatabaseInstance.Recording.json b/src/Workloads/Workloads.Autorest/test/Start-AzWorkloadsSapDatabaseInstance.Recording.json
similarity index 100%
rename from src/Workloads/test/Start-AzWorkloadsSapDatabaseInstance.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Start-AzWorkloadsSapDatabaseInstance.Recording.json
diff --git a/src/Workloads/test/Start-AzWorkloadsSapDatabaseInstance.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Start-AzWorkloadsSapDatabaseInstance.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Start-AzWorkloadsSapDatabaseInstance.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Start-AzWorkloadsSapDatabaseInstance.Tests.ps1
diff --git a/src/Workloads/test/Start-AzWorkloadsSapVirtualInstance.Recording.json b/src/Workloads/Workloads.Autorest/test/Start-AzWorkloadsSapVirtualInstance.Recording.json
similarity index 100%
rename from src/Workloads/test/Start-AzWorkloadsSapVirtualInstance.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Start-AzWorkloadsSapVirtualInstance.Recording.json
diff --git a/src/Workloads/test/Start-AzWorkloadsSapVirtualInstance.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Start-AzWorkloadsSapVirtualInstance.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Start-AzWorkloadsSapVirtualInstance.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Start-AzWorkloadsSapVirtualInstance.Tests.ps1
diff --git a/src/Workloads/test/Stop-AzWorkloadsSapApplicationInstance.Recording.json b/src/Workloads/Workloads.Autorest/test/Stop-AzWorkloadsSapApplicationInstance.Recording.json
similarity index 100%
rename from src/Workloads/test/Stop-AzWorkloadsSapApplicationInstance.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Stop-AzWorkloadsSapApplicationInstance.Recording.json
diff --git a/src/Workloads/test/Stop-AzWorkloadsSapApplicationInstance.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Stop-AzWorkloadsSapApplicationInstance.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Stop-AzWorkloadsSapApplicationInstance.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Stop-AzWorkloadsSapApplicationInstance.Tests.ps1
diff --git a/src/Workloads/test/Stop-AzWorkloadsSapCentralInstance.Recording.json b/src/Workloads/Workloads.Autorest/test/Stop-AzWorkloadsSapCentralInstance.Recording.json
similarity index 100%
rename from src/Workloads/test/Stop-AzWorkloadsSapCentralInstance.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Stop-AzWorkloadsSapCentralInstance.Recording.json
diff --git a/src/Workloads/test/Stop-AzWorkloadsSapCentralInstance.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Stop-AzWorkloadsSapCentralInstance.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Stop-AzWorkloadsSapCentralInstance.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Stop-AzWorkloadsSapCentralInstance.Tests.ps1
diff --git a/src/Workloads/test/Stop-AzWorkloadsSapDatabaseInstance.Recording.json b/src/Workloads/Workloads.Autorest/test/Stop-AzWorkloadsSapDatabaseInstance.Recording.json
similarity index 100%
rename from src/Workloads/test/Stop-AzWorkloadsSapDatabaseInstance.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Stop-AzWorkloadsSapDatabaseInstance.Recording.json
diff --git a/src/Workloads/test/Stop-AzWorkloadsSapDatabaseInstance.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Stop-AzWorkloadsSapDatabaseInstance.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Stop-AzWorkloadsSapDatabaseInstance.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Stop-AzWorkloadsSapDatabaseInstance.Tests.ps1
diff --git a/src/Workloads/test/Stop-AzWorkloadsSapVirtualInstance.Recording.json b/src/Workloads/Workloads.Autorest/test/Stop-AzWorkloadsSapVirtualInstance.Recording.json
similarity index 100%
rename from src/Workloads/test/Stop-AzWorkloadsSapVirtualInstance.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Stop-AzWorkloadsSapVirtualInstance.Recording.json
diff --git a/src/Workloads/test/Stop-AzWorkloadsSapVirtualInstance.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Stop-AzWorkloadsSapVirtualInstance.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Stop-AzWorkloadsSapVirtualInstance.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Stop-AzWorkloadsSapVirtualInstance.Tests.ps1
diff --git a/src/Workloads/test/Update-AzWorkloadsMonitor.Recording.json b/src/Workloads/Workloads.Autorest/test/Update-AzWorkloadsMonitor.Recording.json
similarity index 100%
rename from src/Workloads/test/Update-AzWorkloadsMonitor.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Update-AzWorkloadsMonitor.Recording.json
diff --git a/src/Workloads/test/Update-AzWorkloadsMonitor.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Update-AzWorkloadsMonitor.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Update-AzWorkloadsMonitor.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Update-AzWorkloadsMonitor.Tests.ps1
diff --git a/src/Workloads/test/Update-AzWorkloadsSapApplicationInstance.Recording.json b/src/Workloads/Workloads.Autorest/test/Update-AzWorkloadsSapApplicationInstance.Recording.json
similarity index 100%
rename from src/Workloads/test/Update-AzWorkloadsSapApplicationInstance.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Update-AzWorkloadsSapApplicationInstance.Recording.json
diff --git a/src/Workloads/test/Update-AzWorkloadsSapApplicationInstance.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Update-AzWorkloadsSapApplicationInstance.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Update-AzWorkloadsSapApplicationInstance.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Update-AzWorkloadsSapApplicationInstance.Tests.ps1
diff --git a/src/Workloads/test/Update-AzWorkloadsSapCentralInstance.Recording.json b/src/Workloads/Workloads.Autorest/test/Update-AzWorkloadsSapCentralInstance.Recording.json
similarity index 100%
rename from src/Workloads/test/Update-AzWorkloadsSapCentralInstance.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Update-AzWorkloadsSapCentralInstance.Recording.json
diff --git a/src/Workloads/test/Update-AzWorkloadsSapCentralInstance.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Update-AzWorkloadsSapCentralInstance.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Update-AzWorkloadsSapCentralInstance.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Update-AzWorkloadsSapCentralInstance.Tests.ps1
diff --git a/src/Workloads/test/Update-AzWorkloadsSapDatabaseInstance.Recording.json b/src/Workloads/Workloads.Autorest/test/Update-AzWorkloadsSapDatabaseInstance.Recording.json
similarity index 100%
rename from src/Workloads/test/Update-AzWorkloadsSapDatabaseInstance.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Update-AzWorkloadsSapDatabaseInstance.Recording.json
diff --git a/src/Workloads/test/Update-AzWorkloadsSapDatabaseInstance.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Update-AzWorkloadsSapDatabaseInstance.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Update-AzWorkloadsSapDatabaseInstance.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Update-AzWorkloadsSapDatabaseInstance.Tests.ps1
diff --git a/src/Workloads/test/Update-AzWorkloadsSapLandscapeMonitor.Recording.json b/src/Workloads/Workloads.Autorest/test/Update-AzWorkloadsSapLandscapeMonitor.Recording.json
similarity index 100%
rename from src/Workloads/test/Update-AzWorkloadsSapLandscapeMonitor.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Update-AzWorkloadsSapLandscapeMonitor.Recording.json
diff --git a/src/Workloads/test/Update-AzWorkloadsSapLandscapeMonitor.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Update-AzWorkloadsSapLandscapeMonitor.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Update-AzWorkloadsSapLandscapeMonitor.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Update-AzWorkloadsSapLandscapeMonitor.Tests.ps1
diff --git a/src/Workloads/test/Update-AzWorkloadsSapVirtualInstance.Recording.json b/src/Workloads/Workloads.Autorest/test/Update-AzWorkloadsSapVirtualInstance.Recording.json
similarity index 100%
rename from src/Workloads/test/Update-AzWorkloadsSapVirtualInstance.Recording.json
rename to src/Workloads/Workloads.Autorest/test/Update-AzWorkloadsSapVirtualInstance.Recording.json
diff --git a/src/Workloads/test/Update-AzWorkloadsSapVirtualInstance.Tests.ps1 b/src/Workloads/Workloads.Autorest/test/Update-AzWorkloadsSapVirtualInstance.Tests.ps1
similarity index 100%
rename from src/Workloads/test/Update-AzWorkloadsSapVirtualInstance.Tests.ps1
rename to src/Workloads/Workloads.Autorest/test/Update-AzWorkloadsSapVirtualInstance.Tests.ps1
diff --git a/src/Workloads/test/configuration.json b/src/Workloads/Workloads.Autorest/test/configuration.json
similarity index 100%
rename from src/Workloads/test/configuration.json
rename to src/Workloads/Workloads.Autorest/test/configuration.json
diff --git a/src/Workloads/test/env.json b/src/Workloads/Workloads.Autorest/test/env.json
similarity index 100%
rename from src/Workloads/test/env.json
rename to src/Workloads/Workloads.Autorest/test/env.json
diff --git a/src/Workloads/test/loadEnv.ps1 b/src/Workloads/Workloads.Autorest/test/loadEnv.ps1
similarity index 100%
rename from src/Workloads/test/loadEnv.ps1
rename to src/Workloads/Workloads.Autorest/test/loadEnv.ps1
diff --git a/src/Workloads/test/manual-test.md b/src/Workloads/Workloads.Autorest/test/manual-test.md
similarity index 100%
rename from src/Workloads/test/manual-test.md
rename to src/Workloads/Workloads.Autorest/test/manual-test.md
diff --git a/src/Workloads/test/readme.md b/src/Workloads/Workloads.Autorest/test/readme.md
similarity index 100%
rename from src/Workloads/test/readme.md
rename to src/Workloads/Workloads.Autorest/test/readme.md
diff --git a/src/Workloads/test/utils.ps1 b/src/Workloads/Workloads.Autorest/test/utils.ps1
similarity index 100%
rename from src/Workloads/test/utils.ps1
rename to src/Workloads/Workloads.Autorest/test/utils.ps1
diff --git a/src/Workloads/utils/Unprotect-SecureString.ps1 b/src/Workloads/Workloads.Autorest/utils/Unprotect-SecureString.ps1
similarity index 100%
rename from src/Workloads/utils/Unprotect-SecureString.ps1
rename to src/Workloads/Workloads.Autorest/utils/Unprotect-SecureString.ps1
diff --git a/src/Workloads/test/README.md b/src/Workloads/test/README.md
deleted file mode 100644
index 7c752b4c8c43..000000000000
--- a/src/Workloads/test/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Test
-This directory contains the [Pester](https://www.powershellgallery.com/packages/Pester) tests to run for the module. We use Pester as it is the unofficial standard for PowerShell unit testing. Test stubs for custom cmdlets (created in `..\custom`) will be generated into this folder when `build-module.ps1` is ran. These test stubs will fail automatically, to indicate that tests should be written for custom cmdlets.
-
-## Info
-- Modifiable: yes
-- Generated: partial
-- Committed: yes
-- Packaged: no
-
-## Details
-We allow three testing modes: *live*, *record*, and *playback*. These can be selected using the `-Live`, `-Record`, and `-Playback` switches respectively on the `test-module.ps1` script. This script will run through any `.Tests.ps1` scripts in the `test` folder. If you choose the *record* mode, it will create a `.Recording.json` file of the REST calls between the client and server. Then, when you choose *playback* mode, it will use the `.Recording.json` file to mock the communication between server and client. The *live* mode runs the same as the *record* mode; however, it doesn't create the `.Recording.json` file.
-
-## Purpose
-Custom cmdlets generally encompass additional functionality not described in the REST specification, or combines functionality generated from the REST spec. To validate this functionality continues to operate as intended, creating tests that can be ran and re-ran against custom cmdlets is part of the framework.
-
-## Usage
-To execute tests, run the `test-module.ps1`. To write tests, [this example](https://github.com/pester/Pester/blob/8b9cf4248315e44f1ac6673be149f7e0d7f10466/Examples/Planets/Get-Planet.Tests.ps1#L1) from the Pester repository is very useful for getting started.
\ No newline at end of file