diff --git a/samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceCheckKeyValueHeaders.cs b/samples/AppConfiguration/AppConfiguration/Generated/ServiceCheckKeyValueHeaders.cs similarity index 100% rename from samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceCheckKeyValueHeaders.cs rename to samples/AppConfiguration/AppConfiguration/Generated/ServiceCheckKeyValueHeaders.cs diff --git a/samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceCheckKeyValuesHeaders.cs b/samples/AppConfiguration/AppConfiguration/Generated/ServiceCheckKeyValuesHeaders.cs similarity index 100% rename from samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceCheckKeyValuesHeaders.cs rename to samples/AppConfiguration/AppConfiguration/Generated/ServiceCheckKeyValuesHeaders.cs diff --git a/samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceCheckKeysHeaders.cs b/samples/AppConfiguration/AppConfiguration/Generated/ServiceCheckKeysHeaders.cs similarity index 100% rename from samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceCheckKeysHeaders.cs rename to samples/AppConfiguration/AppConfiguration/Generated/ServiceCheckKeysHeaders.cs diff --git a/samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceCheckLabelsHeaders.cs b/samples/AppConfiguration/AppConfiguration/Generated/ServiceCheckLabelsHeaders.cs similarity index 100% rename from samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceCheckLabelsHeaders.cs rename to samples/AppConfiguration/AppConfiguration/Generated/ServiceCheckLabelsHeaders.cs diff --git a/samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceCheckRevisionsHeaders.cs b/samples/AppConfiguration/AppConfiguration/Generated/ServiceCheckRevisionsHeaders.cs similarity index 100% rename from samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceCheckRevisionsHeaders.cs rename to samples/AppConfiguration/AppConfiguration/Generated/ServiceCheckRevisionsHeaders.cs diff --git a/samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceClient.cs b/samples/AppConfiguration/AppConfiguration/Generated/ServiceClient.cs similarity index 100% rename from samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceClient.cs rename to samples/AppConfiguration/AppConfiguration/Generated/ServiceClient.cs diff --git a/samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceDeleteKeyValueHeaders.cs b/samples/AppConfiguration/AppConfiguration/Generated/ServiceDeleteKeyValueHeaders.cs similarity index 100% rename from samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceDeleteKeyValueHeaders.cs rename to samples/AppConfiguration/AppConfiguration/Generated/ServiceDeleteKeyValueHeaders.cs diff --git a/samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceDeleteLockHeaders.cs b/samples/AppConfiguration/AppConfiguration/Generated/ServiceDeleteLockHeaders.cs similarity index 100% rename from samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceDeleteLockHeaders.cs rename to samples/AppConfiguration/AppConfiguration/Generated/ServiceDeleteLockHeaders.cs diff --git a/samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceGetKeyValueHeaders.cs b/samples/AppConfiguration/AppConfiguration/Generated/ServiceGetKeyValueHeaders.cs similarity index 100% rename from samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceGetKeyValueHeaders.cs rename to samples/AppConfiguration/AppConfiguration/Generated/ServiceGetKeyValueHeaders.cs diff --git a/samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceGetKeyValuesHeaders.cs b/samples/AppConfiguration/AppConfiguration/Generated/ServiceGetKeyValuesHeaders.cs similarity index 100% rename from samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceGetKeyValuesHeaders.cs rename to samples/AppConfiguration/AppConfiguration/Generated/ServiceGetKeyValuesHeaders.cs diff --git a/samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceGetKeysHeaders.cs b/samples/AppConfiguration/AppConfiguration/Generated/ServiceGetKeysHeaders.cs similarity index 100% rename from samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceGetKeysHeaders.cs rename to samples/AppConfiguration/AppConfiguration/Generated/ServiceGetKeysHeaders.cs diff --git a/samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceGetLabelsHeaders.cs b/samples/AppConfiguration/AppConfiguration/Generated/ServiceGetLabelsHeaders.cs similarity index 100% rename from samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceGetLabelsHeaders.cs rename to samples/AppConfiguration/AppConfiguration/Generated/ServiceGetLabelsHeaders.cs diff --git a/samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceGetRevisionsHeaders.cs b/samples/AppConfiguration/AppConfiguration/Generated/ServiceGetRevisionsHeaders.cs similarity index 100% rename from samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceGetRevisionsHeaders.cs rename to samples/AppConfiguration/AppConfiguration/Generated/ServiceGetRevisionsHeaders.cs diff --git a/samples/AppConfiguration/AppConfiguration/Generated/Operations/ServicePutKeyValueHeaders.cs b/samples/AppConfiguration/AppConfiguration/Generated/ServicePutKeyValueHeaders.cs similarity index 100% rename from samples/AppConfiguration/AppConfiguration/Generated/Operations/ServicePutKeyValueHeaders.cs rename to samples/AppConfiguration/AppConfiguration/Generated/ServicePutKeyValueHeaders.cs diff --git a/samples/AppConfiguration/AppConfiguration/Generated/Operations/ServicePutLockHeaders.cs b/samples/AppConfiguration/AppConfiguration/Generated/ServicePutLockHeaders.cs similarity index 100% rename from samples/AppConfiguration/AppConfiguration/Generated/Operations/ServicePutLockHeaders.cs rename to samples/AppConfiguration/AppConfiguration/Generated/ServicePutLockHeaders.cs diff --git a/samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceRestClient.cs b/samples/AppConfiguration/AppConfiguration/Generated/ServiceRestClient.cs similarity index 100% rename from samples/AppConfiguration/AppConfiguration/Generated/Operations/ServiceRestClient.cs rename to samples/AppConfiguration/AppConfiguration/Generated/ServiceRestClient.cs diff --git a/samples/Azure.AI.FormRecognizer/Azure.AI.FormRecognizer/Generated/Operations/ServiceClient.cs b/samples/Azure.AI.FormRecognizer/Azure.AI.FormRecognizer/Generated/ServiceClient.cs similarity index 100% rename from samples/Azure.AI.FormRecognizer/Azure.AI.FormRecognizer/Generated/Operations/ServiceClient.cs rename to samples/Azure.AI.FormRecognizer/Azure.AI.FormRecognizer/Generated/ServiceClient.cs diff --git a/samples/Azure.AI.FormRecognizer/Azure.AI.FormRecognizer/Generated/Operations/ServiceRestClient.cs b/samples/Azure.AI.FormRecognizer/Azure.AI.FormRecognizer/Generated/ServiceRestClient.cs similarity index 100% rename from samples/Azure.AI.FormRecognizer/Azure.AI.FormRecognizer/Generated/Operations/ServiceRestClient.cs rename to samples/Azure.AI.FormRecognizer/Azure.AI.FormRecognizer/Generated/ServiceRestClient.cs diff --git a/samples/Azure.AI.FormRecognizer/Azure.AI.FormRecognizer/Generated/Operations/ServiceTrainCustomModelAsyncHeaders.cs b/samples/Azure.AI.FormRecognizer/Azure.AI.FormRecognizer/Generated/ServiceTrainCustomModelAsyncHeaders.cs similarity index 100% rename from samples/Azure.AI.FormRecognizer/Azure.AI.FormRecognizer/Generated/Operations/ServiceTrainCustomModelAsyncHeaders.cs rename to samples/Azure.AI.FormRecognizer/Azure.AI.FormRecognizer/Generated/ServiceTrainCustomModelAsyncHeaders.cs diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/BlobContainersClient.cs b/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/BlobContainersClient.cs similarity index 100% rename from samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/BlobContainersClient.cs rename to samples/Azure.Management.Storage/Azure.Management.Storage/Generated/BlobContainersClient.cs diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/BlobContainersRestClient.cs b/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/BlobContainersRestClient.cs similarity index 100% rename from samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/BlobContainersRestClient.cs rename to samples/Azure.Management.Storage/Azure.Management.Storage/Generated/BlobContainersRestClient.cs diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/BlobServicesClient.cs b/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/BlobServicesClient.cs similarity index 100% rename from samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/BlobServicesClient.cs rename to samples/Azure.Management.Storage/Azure.Management.Storage/Generated/BlobServicesClient.cs diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/BlobServicesRestClient.cs b/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/BlobServicesRestClient.cs similarity index 100% rename from samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/BlobServicesRestClient.cs rename to samples/Azure.Management.Storage/Azure.Management.Storage/Generated/BlobServicesRestClient.cs diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/EncryptionScopesClient.cs b/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/EncryptionScopesClient.cs similarity index 100% rename from samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/EncryptionScopesClient.cs rename to samples/Azure.Management.Storage/Azure.Management.Storage/Generated/EncryptionScopesClient.cs diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/EncryptionScopesRestClient.cs b/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/EncryptionScopesRestClient.cs similarity index 100% rename from samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/EncryptionScopesRestClient.cs rename to samples/Azure.Management.Storage/Azure.Management.Storage/Generated/EncryptionScopesRestClient.cs diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/FileServicesClient.cs b/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/FileServicesClient.cs similarity index 100% rename from samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/FileServicesClient.cs rename to samples/Azure.Management.Storage/Azure.Management.Storage/Generated/FileServicesClient.cs diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/FileServicesRestClient.cs b/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/FileServicesRestClient.cs similarity index 100% rename from samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/FileServicesRestClient.cs rename to samples/Azure.Management.Storage/Azure.Management.Storage/Generated/FileServicesRestClient.cs diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/FileSharesClient.cs b/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/FileSharesClient.cs similarity index 100% rename from samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/FileSharesClient.cs rename to samples/Azure.Management.Storage/Azure.Management.Storage/Generated/FileSharesClient.cs diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/FileSharesRestClient.cs b/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/FileSharesRestClient.cs similarity index 100% rename from samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/FileSharesRestClient.cs rename to samples/Azure.Management.Storage/Azure.Management.Storage/Generated/FileSharesRestClient.cs diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/ManagementPoliciesClient.cs b/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/ManagementPoliciesClient.cs similarity index 100% rename from samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/ManagementPoliciesClient.cs rename to samples/Azure.Management.Storage/Azure.Management.Storage/Generated/ManagementPoliciesClient.cs diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/ManagementPoliciesRestClient.cs b/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/ManagementPoliciesRestClient.cs similarity index 100% rename from samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/ManagementPoliciesRestClient.cs rename to samples/Azure.Management.Storage/Azure.Management.Storage/Generated/ManagementPoliciesRestClient.cs diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/OperationsClient.cs b/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/OperationsClient.cs similarity index 100% rename from samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/OperationsClient.cs rename to samples/Azure.Management.Storage/Azure.Management.Storage/Generated/OperationsClient.cs diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/OperationsRestClient.cs b/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/OperationsRestClient.cs similarity index 100% rename from samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/OperationsRestClient.cs rename to samples/Azure.Management.Storage/Azure.Management.Storage/Generated/OperationsRestClient.cs diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/PrivateEndpointConnectionsClient.cs b/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/PrivateEndpointConnectionsClient.cs similarity index 100% rename from samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/PrivateEndpointConnectionsClient.cs rename to samples/Azure.Management.Storage/Azure.Management.Storage/Generated/PrivateEndpointConnectionsClient.cs diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/PrivateEndpointConnectionsRestClient.cs b/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/PrivateEndpointConnectionsRestClient.cs similarity index 100% rename from samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/PrivateEndpointConnectionsRestClient.cs rename to samples/Azure.Management.Storage/Azure.Management.Storage/Generated/PrivateEndpointConnectionsRestClient.cs diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/PrivateLinkResourcesClient.cs b/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/PrivateLinkResourcesClient.cs similarity index 100% rename from samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/PrivateLinkResourcesClient.cs rename to samples/Azure.Management.Storage/Azure.Management.Storage/Generated/PrivateLinkResourcesClient.cs diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/PrivateLinkResourcesRestClient.cs b/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/PrivateLinkResourcesRestClient.cs similarity index 100% rename from samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/PrivateLinkResourcesRestClient.cs rename to samples/Azure.Management.Storage/Azure.Management.Storage/Generated/PrivateLinkResourcesRestClient.cs diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/SkusClient.cs b/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/SkusClient.cs similarity index 100% rename from samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/SkusClient.cs rename to samples/Azure.Management.Storage/Azure.Management.Storage/Generated/SkusClient.cs diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/SkusRestClient.cs b/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/SkusRestClient.cs similarity index 100% rename from samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/SkusRestClient.cs rename to samples/Azure.Management.Storage/Azure.Management.Storage/Generated/SkusRestClient.cs diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/StorageAccountsClient.cs b/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/StorageAccountsClient.cs similarity index 100% rename from samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/StorageAccountsClient.cs rename to samples/Azure.Management.Storage/Azure.Management.Storage/Generated/StorageAccountsClient.cs diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/StorageAccountsRestClient.cs b/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/StorageAccountsRestClient.cs similarity index 100% rename from samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/StorageAccountsRestClient.cs rename to samples/Azure.Management.Storage/Azure.Management.Storage/Generated/StorageAccountsRestClient.cs diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/StorageManagementClient.cs b/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/StorageManagementClient.cs similarity index 100% rename from samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/StorageManagementClient.cs rename to samples/Azure.Management.Storage/Azure.Management.Storage/Generated/StorageManagementClient.cs diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/StorageManagementClientOptions.cs b/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/StorageManagementClientOptions.cs similarity index 100% rename from samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/StorageManagementClientOptions.cs rename to samples/Azure.Management.Storage/Azure.Management.Storage/Generated/StorageManagementClientOptions.cs diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/UsagesClient.cs b/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/UsagesClient.cs similarity index 100% rename from samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/UsagesClient.cs rename to samples/Azure.Management.Storage/Azure.Management.Storage/Generated/UsagesClient.cs diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/UsagesRestClient.cs b/samples/Azure.Management.Storage/Azure.Management.Storage/Generated/UsagesRestClient.cs similarity index 100% rename from samples/Azure.Management.Storage/Azure.Management.Storage/Generated/Operations/UsagesRestClient.cs rename to samples/Azure.Management.Storage/Azure.Management.Storage/Generated/UsagesRestClient.cs diff --git a/samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/Operations/NetworkInterfaceIPConfigurationsClient.cs b/samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/NetworkInterfaceIPConfigurationsClient.cs similarity index 100% rename from samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/Operations/NetworkInterfaceIPConfigurationsClient.cs rename to samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/NetworkInterfaceIPConfigurationsClient.cs diff --git a/samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/Operations/NetworkInterfaceIPConfigurationsRestClient.cs b/samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/NetworkInterfaceIPConfigurationsRestClient.cs similarity index 100% rename from samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/Operations/NetworkInterfaceIPConfigurationsRestClient.cs rename to samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/NetworkInterfaceIPConfigurationsRestClient.cs diff --git a/samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/Operations/NetworkInterfaceLoadBalancersClient.cs b/samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/NetworkInterfaceLoadBalancersClient.cs similarity index 100% rename from samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/Operations/NetworkInterfaceLoadBalancersClient.cs rename to samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/NetworkInterfaceLoadBalancersClient.cs diff --git a/samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/Operations/NetworkInterfaceLoadBalancersRestClient.cs b/samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/NetworkInterfaceLoadBalancersRestClient.cs similarity index 100% rename from samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/Operations/NetworkInterfaceLoadBalancersRestClient.cs rename to samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/NetworkInterfaceLoadBalancersRestClient.cs diff --git a/samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/Operations/NetworkInterfaceTapConfigurationsClient.cs b/samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/NetworkInterfaceTapConfigurationsClient.cs similarity index 100% rename from samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/Operations/NetworkInterfaceTapConfigurationsClient.cs rename to samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/NetworkInterfaceTapConfigurationsClient.cs diff --git a/samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/Operations/NetworkInterfaceTapConfigurationsRestClient.cs b/samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/NetworkInterfaceTapConfigurationsRestClient.cs similarity index 100% rename from samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/Operations/NetworkInterfaceTapConfigurationsRestClient.cs rename to samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/NetworkInterfaceTapConfigurationsRestClient.cs diff --git a/samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/Operations/NetworkInterfacesClient.cs b/samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/NetworkInterfacesClient.cs similarity index 100% rename from samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/Operations/NetworkInterfacesClient.cs rename to samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/NetworkInterfacesClient.cs diff --git a/samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/Operations/NetworkInterfacesRestClient.cs b/samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/NetworkInterfacesRestClient.cs similarity index 100% rename from samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/Operations/NetworkInterfacesRestClient.cs rename to samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface/Generated/NetworkInterfacesRestClient.cs diff --git a/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/ServiceClient.cs b/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/ServiceClient.cs similarity index 100% rename from samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/ServiceClient.cs rename to samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/ServiceClient.cs diff --git a/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/ServiceGetPropertiesHeaders.cs b/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/ServiceGetPropertiesHeaders.cs similarity index 100% rename from samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/ServiceGetPropertiesHeaders.cs rename to samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/ServiceGetPropertiesHeaders.cs diff --git a/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/ServiceGetStatisticsHeaders.cs b/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/ServiceGetStatisticsHeaders.cs similarity index 100% rename from samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/ServiceGetStatisticsHeaders.cs rename to samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/ServiceGetStatisticsHeaders.cs diff --git a/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/ServiceRestClient.cs b/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/ServiceRestClient.cs similarity index 100% rename from samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/ServiceRestClient.cs rename to samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/ServiceRestClient.cs diff --git a/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/ServiceSetPropertiesHeaders.cs b/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/ServiceSetPropertiesHeaders.cs similarity index 100% rename from samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/ServiceSetPropertiesHeaders.cs rename to samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/ServiceSetPropertiesHeaders.cs diff --git a/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/TableInternalClient.cs b/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/TableInternalClient.cs similarity index 100% rename from samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/TableInternalClient.cs rename to samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/TableInternalClient.cs diff --git a/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/TableInternalCreateHeaders.cs b/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/TableInternalCreateHeaders.cs similarity index 100% rename from samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/TableInternalCreateHeaders.cs rename to samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/TableInternalCreateHeaders.cs diff --git a/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/TableInternalDeleteEntityHeaders.cs b/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/TableInternalDeleteEntityHeaders.cs similarity index 100% rename from samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/TableInternalDeleteEntityHeaders.cs rename to samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/TableInternalDeleteEntityHeaders.cs diff --git a/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/TableInternalDeleteHeaders.cs b/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/TableInternalDeleteHeaders.cs similarity index 100% rename from samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/TableInternalDeleteHeaders.cs rename to samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/TableInternalDeleteHeaders.cs diff --git a/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/TableInternalGetAccessPolicyHeaders.cs b/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/TableInternalGetAccessPolicyHeaders.cs similarity index 100% rename from samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/TableInternalGetAccessPolicyHeaders.cs rename to samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/TableInternalGetAccessPolicyHeaders.cs diff --git a/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/TableInternalInsertEntityHeaders.cs b/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/TableInternalInsertEntityHeaders.cs similarity index 100% rename from samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/TableInternalInsertEntityHeaders.cs rename to samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/TableInternalInsertEntityHeaders.cs diff --git a/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/TableInternalQueryEntitiesHeaders.cs b/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/TableInternalQueryEntitiesHeaders.cs similarity index 100% rename from samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/TableInternalQueryEntitiesHeaders.cs rename to samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/TableInternalQueryEntitiesHeaders.cs diff --git a/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/TableInternalQueryEntitiesWithPartitionAndRowKeyHeaders.cs b/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/TableInternalQueryEntitiesWithPartitionAndRowKeyHeaders.cs similarity index 100% rename from samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/TableInternalQueryEntitiesWithPartitionAndRowKeyHeaders.cs rename to samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/TableInternalQueryEntitiesWithPartitionAndRowKeyHeaders.cs diff --git a/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/TableInternalQueryHeaders.cs b/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/TableInternalQueryHeaders.cs similarity index 100% rename from samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/TableInternalQueryHeaders.cs rename to samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/TableInternalQueryHeaders.cs diff --git a/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/TableInternalRestClient.cs b/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/TableInternalRestClient.cs similarity index 100% rename from samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/TableInternalRestClient.cs rename to samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/TableInternalRestClient.cs diff --git a/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/TableInternalSetAccessPolicyHeaders.cs b/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/TableInternalSetAccessPolicyHeaders.cs similarity index 100% rename from samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/TableInternalSetAccessPolicyHeaders.cs rename to samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/TableInternalSetAccessPolicyHeaders.cs diff --git a/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/TableInternalUpdateEntityHeaders.cs b/samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/TableInternalUpdateEntityHeaders.cs similarity index 100% rename from samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/Operations/TableInternalUpdateEntityHeaders.cs rename to samples/Azure.Storage.Tables/Azure.Storage.Tables/Generated/TableInternalUpdateEntityHeaders.cs diff --git a/samples/CognitiveSearch/CognitiveSearch/Generated/Operations/DataSourcesClient.cs b/samples/CognitiveSearch/CognitiveSearch/Generated/DataSourcesClient.cs similarity index 100% rename from samples/CognitiveSearch/CognitiveSearch/Generated/Operations/DataSourcesClient.cs rename to samples/CognitiveSearch/CognitiveSearch/Generated/DataSourcesClient.cs diff --git a/samples/CognitiveSearch/CognitiveSearch/Generated/Operations/DataSourcesRestClient.cs b/samples/CognitiveSearch/CognitiveSearch/Generated/DataSourcesRestClient.cs similarity index 100% rename from samples/CognitiveSearch/CognitiveSearch/Generated/Operations/DataSourcesRestClient.cs rename to samples/CognitiveSearch/CognitiveSearch/Generated/DataSourcesRestClient.cs diff --git a/samples/CognitiveSearch/CognitiveSearch/Generated/Operations/DocumentsClient.cs b/samples/CognitiveSearch/CognitiveSearch/Generated/DocumentsClient.cs similarity index 100% rename from samples/CognitiveSearch/CognitiveSearch/Generated/Operations/DocumentsClient.cs rename to samples/CognitiveSearch/CognitiveSearch/Generated/DocumentsClient.cs diff --git a/samples/CognitiveSearch/CognitiveSearch/Generated/Operations/DocumentsRestClient.cs b/samples/CognitiveSearch/CognitiveSearch/Generated/DocumentsRestClient.cs similarity index 100% rename from samples/CognitiveSearch/CognitiveSearch/Generated/Operations/DocumentsRestClient.cs rename to samples/CognitiveSearch/CognitiveSearch/Generated/DocumentsRestClient.cs diff --git a/samples/CognitiveSearch/CognitiveSearch/Generated/Operations/IndexersClient.cs b/samples/CognitiveSearch/CognitiveSearch/Generated/IndexersClient.cs similarity index 100% rename from samples/CognitiveSearch/CognitiveSearch/Generated/Operations/IndexersClient.cs rename to samples/CognitiveSearch/CognitiveSearch/Generated/IndexersClient.cs diff --git a/samples/CognitiveSearch/CognitiveSearch/Generated/Operations/IndexersRestClient.cs b/samples/CognitiveSearch/CognitiveSearch/Generated/IndexersRestClient.cs similarity index 100% rename from samples/CognitiveSearch/CognitiveSearch/Generated/Operations/IndexersRestClient.cs rename to samples/CognitiveSearch/CognitiveSearch/Generated/IndexersRestClient.cs diff --git a/samples/CognitiveSearch/CognitiveSearch/Generated/Operations/IndexesClient.cs b/samples/CognitiveSearch/CognitiveSearch/Generated/IndexesClient.cs similarity index 100% rename from samples/CognitiveSearch/CognitiveSearch/Generated/Operations/IndexesClient.cs rename to samples/CognitiveSearch/CognitiveSearch/Generated/IndexesClient.cs diff --git a/samples/CognitiveSearch/CognitiveSearch/Generated/Operations/IndexesRestClient.cs b/samples/CognitiveSearch/CognitiveSearch/Generated/IndexesRestClient.cs similarity index 100% rename from samples/CognitiveSearch/CognitiveSearch/Generated/Operations/IndexesRestClient.cs rename to samples/CognitiveSearch/CognitiveSearch/Generated/IndexesRestClient.cs diff --git a/samples/CognitiveSearch/CognitiveSearch/Generated/Operations/ServiceClient.cs b/samples/CognitiveSearch/CognitiveSearch/Generated/ServiceClient.cs similarity index 100% rename from samples/CognitiveSearch/CognitiveSearch/Generated/Operations/ServiceClient.cs rename to samples/CognitiveSearch/CognitiveSearch/Generated/ServiceClient.cs diff --git a/samples/CognitiveSearch/CognitiveSearch/Generated/Operations/ServiceRestClient.cs b/samples/CognitiveSearch/CognitiveSearch/Generated/ServiceRestClient.cs similarity index 100% rename from samples/CognitiveSearch/CognitiveSearch/Generated/Operations/ServiceRestClient.cs rename to samples/CognitiveSearch/CognitiveSearch/Generated/ServiceRestClient.cs diff --git a/samples/CognitiveSearch/CognitiveSearch/Generated/Operations/SkillsetsClient.cs b/samples/CognitiveSearch/CognitiveSearch/Generated/SkillsetsClient.cs similarity index 100% rename from samples/CognitiveSearch/CognitiveSearch/Generated/Operations/SkillsetsClient.cs rename to samples/CognitiveSearch/CognitiveSearch/Generated/SkillsetsClient.cs diff --git a/samples/CognitiveSearch/CognitiveSearch/Generated/Operations/SkillsetsRestClient.cs b/samples/CognitiveSearch/CognitiveSearch/Generated/SkillsetsRestClient.cs similarity index 100% rename from samples/CognitiveSearch/CognitiveSearch/Generated/Operations/SkillsetsRestClient.cs rename to samples/CognitiveSearch/CognitiveSearch/Generated/SkillsetsRestClient.cs diff --git a/samples/CognitiveSearch/CognitiveSearch/Generated/Operations/SynonymMapsClient.cs b/samples/CognitiveSearch/CognitiveSearch/Generated/SynonymMapsClient.cs similarity index 100% rename from samples/CognitiveSearch/CognitiveSearch/Generated/Operations/SynonymMapsClient.cs rename to samples/CognitiveSearch/CognitiveSearch/Generated/SynonymMapsClient.cs diff --git a/samples/CognitiveSearch/CognitiveSearch/Generated/Operations/SynonymMapsRestClient.cs b/samples/CognitiveSearch/CognitiveSearch/Generated/SynonymMapsRestClient.cs similarity index 100% rename from samples/CognitiveSearch/CognitiveSearch/Generated/Operations/SynonymMapsRestClient.cs rename to samples/CognitiveSearch/CognitiveSearch/Generated/SynonymMapsRestClient.cs diff --git a/samples/CognitiveServices.TextAnalytics/CognitiveServices.TextAnalytics/Generated/Operations/ServiceClient.cs b/samples/CognitiveServices.TextAnalytics/CognitiveServices.TextAnalytics/Generated/ServiceClient.cs similarity index 100% rename from samples/CognitiveServices.TextAnalytics/CognitiveServices.TextAnalytics/Generated/Operations/ServiceClient.cs rename to samples/CognitiveServices.TextAnalytics/CognitiveServices.TextAnalytics/Generated/ServiceClient.cs diff --git a/samples/CognitiveServices.TextAnalytics/CognitiveServices.TextAnalytics/Generated/Operations/ServiceRestClient.cs b/samples/CognitiveServices.TextAnalytics/CognitiveServices.TextAnalytics/Generated/ServiceRestClient.cs similarity index 100% rename from samples/CognitiveServices.TextAnalytics/CognitiveServices.TextAnalytics/Generated/Operations/ServiceRestClient.cs rename to samples/CognitiveServices.TextAnalytics/CognitiveServices.TextAnalytics/Generated/ServiceRestClient.cs diff --git a/samples/SignalR/SignalR/Generated/Operations/ServiceClient.cs b/samples/SignalR/SignalR/Generated/ServiceClient.cs similarity index 100% rename from samples/SignalR/SignalR/Generated/Operations/ServiceClient.cs rename to samples/SignalR/SignalR/Generated/ServiceClient.cs diff --git a/samples/SignalR/SignalR/Generated/Operations/ServiceRestClient.cs b/samples/SignalR/SignalR/Generated/ServiceRestClient.cs similarity index 100% rename from samples/SignalR/SignalR/Generated/Operations/ServiceRestClient.cs rename to samples/SignalR/SignalR/Generated/ServiceRestClient.cs diff --git a/src/AutoRest.CSharp.V3/AutoRest/Plugins/CSharpGen.cs b/src/AutoRest.CSharp.V3/AutoRest/Plugins/CSharpGen.cs index 06dc4442..0bed2331 100644 --- a/src/AutoRest.CSharp.V3/AutoRest/Plugins/CSharpGen.cs +++ b/src/AutoRest.CSharp.V3/AutoRest/Plugins/CSharpGen.cs @@ -60,7 +60,7 @@ namespace AutoRest.CSharp.V3.AutoRest.Plugins var restCodeWriter = new CodeWriter(); restClientWriter.WriteClient(restCodeWriter, client); - project.AddGeneratedFile($"Operations/{client.Type.Name}.cs", restCodeWriter.ToString()); + project.AddGeneratedFile($"{client.Type.Name}.cs", restCodeWriter.ToString()); var headerModels = client.Methods.Select(m => m.HeaderModel).OfType().Distinct(); foreach (ResponseHeaderGroupType responseHeaderModel in headerModels) @@ -68,7 +68,7 @@ namespace AutoRest.CSharp.V3.AutoRest.Plugins var headerModelCodeWriter = new CodeWriter(); headerModelModelWriter.WriteHeaderModel(headerModelCodeWriter, responseHeaderModel); - project.AddGeneratedFile($"Operations/{responseHeaderModel.Type.Name}.cs", headerModelCodeWriter.ToString()); + project.AddGeneratedFile($"{responseHeaderModel.Type.Name}.cs", headerModelCodeWriter.ToString()); } } @@ -77,18 +77,18 @@ namespace AutoRest.CSharp.V3.AutoRest.Plugins var codeWriter = new CodeWriter(); clientWriter.WriteClient(codeWriter, client, context.Configuration); - project.AddGeneratedFile($"Operations/{client.Type.Name}.cs", codeWriter.ToString()); + project.AddGeneratedFile($"{client.Type.Name}.cs", codeWriter.ToString()); } if (context.Configuration.AzureArm) { var codeWriter = new CodeWriter(); ManagementClientWriter.WriteClientOptions(codeWriter, context); - project.AddGeneratedFile($"Operations/{context.Configuration.LibraryName}ManagementClientOptions.cs", codeWriter.ToString()); + project.AddGeneratedFile($"{context.Configuration.LibraryName}ManagementClientOptions.cs", codeWriter.ToString()); var clientCodeWriter = new CodeWriter(); ManagementClientWriter.WriteAggregateClient(clientCodeWriter, context); - project.AddGeneratedFile($"Operations/{context.Configuration.LibraryName}ManagementClient.cs", clientCodeWriter.ToString()); + project.AddGeneratedFile($"{context.Configuration.LibraryName}ManagementClient.cs", clientCodeWriter.ToString()); } diff --git a/test/TestProjects/AdditionalPropertiesEx/Generated/Operations/APClient.cs b/test/TestProjects/AdditionalPropertiesEx/Generated/APClient.cs similarity index 100% rename from test/TestProjects/AdditionalPropertiesEx/Generated/Operations/APClient.cs rename to test/TestProjects/AdditionalPropertiesEx/Generated/APClient.cs diff --git a/test/TestProjects/AdditionalPropertiesEx/Generated/Operations/APRestClient.cs b/test/TestProjects/AdditionalPropertiesEx/Generated/APRestClient.cs similarity index 100% rename from test/TestProjects/AdditionalPropertiesEx/Generated/Operations/APRestClient.cs rename to test/TestProjects/AdditionalPropertiesEx/Generated/APRestClient.cs diff --git a/test/TestProjects/ExtensionClientName/Generated/Operations/ServiceClient.cs b/test/TestProjects/ExtensionClientName/Generated/ServiceClient.cs similarity index 100% rename from test/TestProjects/ExtensionClientName/Generated/Operations/ServiceClient.cs rename to test/TestProjects/ExtensionClientName/Generated/ServiceClient.cs diff --git a/test/TestProjects/ExtensionClientName/Generated/Operations/ServiceRenamedOperationHeaders.cs b/test/TestProjects/ExtensionClientName/Generated/ServiceRenamedOperationHeaders.cs similarity index 100% rename from test/TestProjects/ExtensionClientName/Generated/Operations/ServiceRenamedOperationHeaders.cs rename to test/TestProjects/ExtensionClientName/Generated/ServiceRenamedOperationHeaders.cs diff --git a/test/TestProjects/ExtensionClientName/Generated/Operations/ServiceRestClient.cs b/test/TestProjects/ExtensionClientName/Generated/ServiceRestClient.cs similarity index 100% rename from test/TestProjects/ExtensionClientName/Generated/Operations/ServiceRestClient.cs rename to test/TestProjects/ExtensionClientName/Generated/ServiceRestClient.cs diff --git a/test/TestProjects/ModelShapes/Generated/Operations/ServiceClient.cs b/test/TestProjects/ModelShapes/Generated/ServiceClient.cs similarity index 100% rename from test/TestProjects/ModelShapes/Generated/Operations/ServiceClient.cs rename to test/TestProjects/ModelShapes/Generated/ServiceClient.cs diff --git a/test/TestProjects/ModelShapes/Generated/Operations/ServiceRestClient.cs b/test/TestProjects/ModelShapes/Generated/ServiceRestClient.cs similarity index 100% rename from test/TestProjects/ModelShapes/Generated/Operations/ServiceRestClient.cs rename to test/TestProjects/ModelShapes/Generated/ServiceRestClient.cs diff --git a/test/TestProjects/NameConflicts/Generated/Operations/ServiceClient.cs b/test/TestProjects/NameConflicts/Generated/ServiceClient.cs similarity index 100% rename from test/TestProjects/NameConflicts/Generated/Operations/ServiceClient.cs rename to test/TestProjects/NameConflicts/Generated/ServiceClient.cs diff --git a/test/TestProjects/NameConflicts/Generated/Operations/ServiceRestClient.cs b/test/TestProjects/NameConflicts/Generated/ServiceRestClient.cs similarity index 100% rename from test/TestProjects/NameConflicts/Generated/Operations/ServiceRestClient.cs rename to test/TestProjects/NameConflicts/Generated/ServiceRestClient.cs diff --git a/test/TestProjects/SerializationCustomization/Generated/Operations/ServiceClient.cs b/test/TestProjects/SerializationCustomization/Generated/ServiceClient.cs similarity index 100% rename from test/TestProjects/SerializationCustomization/Generated/Operations/ServiceClient.cs rename to test/TestProjects/SerializationCustomization/Generated/ServiceClient.cs diff --git a/test/TestProjects/SerializationCustomization/Generated/Operations/ServiceRestClient.cs b/test/TestProjects/SerializationCustomization/Generated/ServiceRestClient.cs similarity index 100% rename from test/TestProjects/SerializationCustomization/Generated/Operations/ServiceRestClient.cs rename to test/TestProjects/SerializationCustomization/Generated/ServiceRestClient.cs diff --git a/test/TestProjects/TypeSchemaMapping/Generated/Operations/MainClient.cs b/test/TestProjects/TypeSchemaMapping/Generated/MainClient.cs similarity index 100% rename from test/TestProjects/TypeSchemaMapping/Generated/Operations/MainClient.cs rename to test/TestProjects/TypeSchemaMapping/Generated/MainClient.cs diff --git a/test/TestProjects/TypeSchemaMapping/Generated/Operations/MainRestClient.cs b/test/TestProjects/TypeSchemaMapping/Generated/MainRestClient.cs similarity index 100% rename from test/TestProjects/TypeSchemaMapping/Generated/Operations/MainRestClient.cs rename to test/TestProjects/TypeSchemaMapping/Generated/MainRestClient.cs diff --git a/test/TestServerProjects/additionalProperties/Generated/Operations/PetsClient.cs b/test/TestServerProjects/additionalProperties/Generated/PetsClient.cs similarity index 100% rename from test/TestServerProjects/additionalProperties/Generated/Operations/PetsClient.cs rename to test/TestServerProjects/additionalProperties/Generated/PetsClient.cs diff --git a/test/TestServerProjects/additionalProperties/Generated/Operations/PetsRestClient.cs b/test/TestServerProjects/additionalProperties/Generated/PetsRestClient.cs similarity index 100% rename from test/TestServerProjects/additionalProperties/Generated/Operations/PetsRestClient.cs rename to test/TestServerProjects/additionalProperties/Generated/PetsRestClient.cs diff --git a/test/TestServerProjects/azure-parameter-grouping/Generated/Operations/ParameterGroupingClient.cs b/test/TestServerProjects/azure-parameter-grouping/Generated/ParameterGroupingClient.cs similarity index 100% rename from test/TestServerProjects/azure-parameter-grouping/Generated/Operations/ParameterGroupingClient.cs rename to test/TestServerProjects/azure-parameter-grouping/Generated/ParameterGroupingClient.cs diff --git a/test/TestServerProjects/azure-parameter-grouping/Generated/Operations/ParameterGroupingRestClient.cs b/test/TestServerProjects/azure-parameter-grouping/Generated/ParameterGroupingRestClient.cs similarity index 100% rename from test/TestServerProjects/azure-parameter-grouping/Generated/Operations/ParameterGroupingRestClient.cs rename to test/TestServerProjects/azure-parameter-grouping/Generated/ParameterGroupingRestClient.cs diff --git a/test/TestServerProjects/azure-special-properties/Generated/Operations/ApiVersionDefaultClient.cs b/test/TestServerProjects/azure-special-properties/Generated/ApiVersionDefaultClient.cs similarity index 100% rename from test/TestServerProjects/azure-special-properties/Generated/Operations/ApiVersionDefaultClient.cs rename to test/TestServerProjects/azure-special-properties/Generated/ApiVersionDefaultClient.cs diff --git a/test/TestServerProjects/azure-special-properties/Generated/Operations/ApiVersionDefaultRestClient.cs b/test/TestServerProjects/azure-special-properties/Generated/ApiVersionDefaultRestClient.cs similarity index 100% rename from test/TestServerProjects/azure-special-properties/Generated/Operations/ApiVersionDefaultRestClient.cs rename to test/TestServerProjects/azure-special-properties/Generated/ApiVersionDefaultRestClient.cs diff --git a/test/TestServerProjects/azure-special-properties/Generated/Operations/ApiVersionLocalClient.cs b/test/TestServerProjects/azure-special-properties/Generated/ApiVersionLocalClient.cs similarity index 100% rename from test/TestServerProjects/azure-special-properties/Generated/Operations/ApiVersionLocalClient.cs rename to test/TestServerProjects/azure-special-properties/Generated/ApiVersionLocalClient.cs diff --git a/test/TestServerProjects/azure-special-properties/Generated/Operations/ApiVersionLocalRestClient.cs b/test/TestServerProjects/azure-special-properties/Generated/ApiVersionLocalRestClient.cs similarity index 100% rename from test/TestServerProjects/azure-special-properties/Generated/Operations/ApiVersionLocalRestClient.cs rename to test/TestServerProjects/azure-special-properties/Generated/ApiVersionLocalRestClient.cs diff --git a/test/TestServerProjects/azure-special-properties/Generated/Operations/HeaderClient.cs b/test/TestServerProjects/azure-special-properties/Generated/HeaderClient.cs similarity index 100% rename from test/TestServerProjects/azure-special-properties/Generated/Operations/HeaderClient.cs rename to test/TestServerProjects/azure-special-properties/Generated/HeaderClient.cs diff --git a/test/TestServerProjects/azure-special-properties/Generated/Operations/HeaderCustomNamedRequestIdHeadHeaders.cs b/test/TestServerProjects/azure-special-properties/Generated/HeaderCustomNamedRequestIdHeadHeaders.cs similarity index 100% rename from test/TestServerProjects/azure-special-properties/Generated/Operations/HeaderCustomNamedRequestIdHeadHeaders.cs rename to test/TestServerProjects/azure-special-properties/Generated/HeaderCustomNamedRequestIdHeadHeaders.cs diff --git a/test/TestServerProjects/azure-special-properties/Generated/Operations/HeaderCustomNamedRequestIdHeaders.cs b/test/TestServerProjects/azure-special-properties/Generated/HeaderCustomNamedRequestIdHeaders.cs similarity index 100% rename from test/TestServerProjects/azure-special-properties/Generated/Operations/HeaderCustomNamedRequestIdHeaders.cs rename to test/TestServerProjects/azure-special-properties/Generated/HeaderCustomNamedRequestIdHeaders.cs diff --git a/test/TestServerProjects/azure-special-properties/Generated/Operations/HeaderCustomNamedRequestIdParamGroupingHeaders.cs b/test/TestServerProjects/azure-special-properties/Generated/HeaderCustomNamedRequestIdParamGroupingHeaders.cs similarity index 100% rename from test/TestServerProjects/azure-special-properties/Generated/Operations/HeaderCustomNamedRequestIdParamGroupingHeaders.cs rename to test/TestServerProjects/azure-special-properties/Generated/HeaderCustomNamedRequestIdParamGroupingHeaders.cs diff --git a/test/TestServerProjects/azure-special-properties/Generated/Operations/HeaderRestClient.cs b/test/TestServerProjects/azure-special-properties/Generated/HeaderRestClient.cs similarity index 100% rename from test/TestServerProjects/azure-special-properties/Generated/Operations/HeaderRestClient.cs rename to test/TestServerProjects/azure-special-properties/Generated/HeaderRestClient.cs diff --git a/test/TestServerProjects/azure-special-properties/Generated/Operations/OdataClient.cs b/test/TestServerProjects/azure-special-properties/Generated/OdataClient.cs similarity index 100% rename from test/TestServerProjects/azure-special-properties/Generated/Operations/OdataClient.cs rename to test/TestServerProjects/azure-special-properties/Generated/OdataClient.cs diff --git a/test/TestServerProjects/azure-special-properties/Generated/Operations/OdataRestClient.cs b/test/TestServerProjects/azure-special-properties/Generated/OdataRestClient.cs similarity index 100% rename from test/TestServerProjects/azure-special-properties/Generated/Operations/OdataRestClient.cs rename to test/TestServerProjects/azure-special-properties/Generated/OdataRestClient.cs diff --git a/test/TestServerProjects/azure-special-properties/Generated/Operations/SkipUrlEncodingClient.cs b/test/TestServerProjects/azure-special-properties/Generated/SkipUrlEncodingClient.cs similarity index 100% rename from test/TestServerProjects/azure-special-properties/Generated/Operations/SkipUrlEncodingClient.cs rename to test/TestServerProjects/azure-special-properties/Generated/SkipUrlEncodingClient.cs diff --git a/test/TestServerProjects/azure-special-properties/Generated/Operations/SkipUrlEncodingRestClient.cs b/test/TestServerProjects/azure-special-properties/Generated/SkipUrlEncodingRestClient.cs similarity index 100% rename from test/TestServerProjects/azure-special-properties/Generated/Operations/SkipUrlEncodingRestClient.cs rename to test/TestServerProjects/azure-special-properties/Generated/SkipUrlEncodingRestClient.cs diff --git a/test/TestServerProjects/azure-special-properties/Generated/Operations/SubscriptionInCredentialsClient.cs b/test/TestServerProjects/azure-special-properties/Generated/SubscriptionInCredentialsClient.cs similarity index 100% rename from test/TestServerProjects/azure-special-properties/Generated/Operations/SubscriptionInCredentialsClient.cs rename to test/TestServerProjects/azure-special-properties/Generated/SubscriptionInCredentialsClient.cs diff --git a/test/TestServerProjects/azure-special-properties/Generated/Operations/SubscriptionInCredentialsRestClient.cs b/test/TestServerProjects/azure-special-properties/Generated/SubscriptionInCredentialsRestClient.cs similarity index 100% rename from test/TestServerProjects/azure-special-properties/Generated/Operations/SubscriptionInCredentialsRestClient.cs rename to test/TestServerProjects/azure-special-properties/Generated/SubscriptionInCredentialsRestClient.cs diff --git a/test/TestServerProjects/azure-special-properties/Generated/Operations/SubscriptionInMethodClient.cs b/test/TestServerProjects/azure-special-properties/Generated/SubscriptionInMethodClient.cs similarity index 100% rename from test/TestServerProjects/azure-special-properties/Generated/Operations/SubscriptionInMethodClient.cs rename to test/TestServerProjects/azure-special-properties/Generated/SubscriptionInMethodClient.cs diff --git a/test/TestServerProjects/azure-special-properties/Generated/Operations/SubscriptionInMethodRestClient.cs b/test/TestServerProjects/azure-special-properties/Generated/SubscriptionInMethodRestClient.cs similarity index 100% rename from test/TestServerProjects/azure-special-properties/Generated/Operations/SubscriptionInMethodRestClient.cs rename to test/TestServerProjects/azure-special-properties/Generated/SubscriptionInMethodRestClient.cs diff --git a/test/TestServerProjects/azure-special-properties/Generated/Operations/XMsClientRequestIdClient.cs b/test/TestServerProjects/azure-special-properties/Generated/XMsClientRequestIdClient.cs similarity index 100% rename from test/TestServerProjects/azure-special-properties/Generated/Operations/XMsClientRequestIdClient.cs rename to test/TestServerProjects/azure-special-properties/Generated/XMsClientRequestIdClient.cs diff --git a/test/TestServerProjects/azure-special-properties/Generated/Operations/XMsClientRequestIdRestClient.cs b/test/TestServerProjects/azure-special-properties/Generated/XMsClientRequestIdRestClient.cs similarity index 100% rename from test/TestServerProjects/azure-special-properties/Generated/Operations/XMsClientRequestIdRestClient.cs rename to test/TestServerProjects/azure-special-properties/Generated/XMsClientRequestIdRestClient.cs diff --git a/test/TestServerProjects/body-array/Generated/Operations/ArrayClient.cs b/test/TestServerProjects/body-array/Generated/ArrayClient.cs similarity index 100% rename from test/TestServerProjects/body-array/Generated/Operations/ArrayClient.cs rename to test/TestServerProjects/body-array/Generated/ArrayClient.cs diff --git a/test/TestServerProjects/body-array/Generated/Operations/ArrayRestClient.cs b/test/TestServerProjects/body-array/Generated/ArrayRestClient.cs similarity index 100% rename from test/TestServerProjects/body-array/Generated/Operations/ArrayRestClient.cs rename to test/TestServerProjects/body-array/Generated/ArrayRestClient.cs diff --git a/test/TestServerProjects/body-boolean/Generated/Operations/BoolClient.cs b/test/TestServerProjects/body-boolean/Generated/BoolClient.cs similarity index 100% rename from test/TestServerProjects/body-boolean/Generated/Operations/BoolClient.cs rename to test/TestServerProjects/body-boolean/Generated/BoolClient.cs diff --git a/test/TestServerProjects/body-boolean/Generated/Operations/BoolRestClient.cs b/test/TestServerProjects/body-boolean/Generated/BoolRestClient.cs similarity index 100% rename from test/TestServerProjects/body-boolean/Generated/Operations/BoolRestClient.cs rename to test/TestServerProjects/body-boolean/Generated/BoolRestClient.cs diff --git a/test/TestServerProjects/body-byte/Generated/Operations/ByteClient.cs b/test/TestServerProjects/body-byte/Generated/ByteClient.cs similarity index 100% rename from test/TestServerProjects/body-byte/Generated/Operations/ByteClient.cs rename to test/TestServerProjects/body-byte/Generated/ByteClient.cs diff --git a/test/TestServerProjects/body-byte/Generated/Operations/ByteRestClient.cs b/test/TestServerProjects/body-byte/Generated/ByteRestClient.cs similarity index 100% rename from test/TestServerProjects/body-byte/Generated/Operations/ByteRestClient.cs rename to test/TestServerProjects/body-byte/Generated/ByteRestClient.cs diff --git a/test/TestServerProjects/body-complex/Generated/Operations/ArrayClient.cs b/test/TestServerProjects/body-complex/Generated/ArrayClient.cs similarity index 100% rename from test/TestServerProjects/body-complex/Generated/Operations/ArrayClient.cs rename to test/TestServerProjects/body-complex/Generated/ArrayClient.cs diff --git a/test/TestServerProjects/body-complex/Generated/Operations/ArrayRestClient.cs b/test/TestServerProjects/body-complex/Generated/ArrayRestClient.cs similarity index 100% rename from test/TestServerProjects/body-complex/Generated/Operations/ArrayRestClient.cs rename to test/TestServerProjects/body-complex/Generated/ArrayRestClient.cs diff --git a/test/TestServerProjects/body-complex/Generated/Operations/BasicClient.cs b/test/TestServerProjects/body-complex/Generated/BasicClient.cs similarity index 100% rename from test/TestServerProjects/body-complex/Generated/Operations/BasicClient.cs rename to test/TestServerProjects/body-complex/Generated/BasicClient.cs diff --git a/test/TestServerProjects/body-complex/Generated/Operations/BasicRestClient.cs b/test/TestServerProjects/body-complex/Generated/BasicRestClient.cs similarity index 100% rename from test/TestServerProjects/body-complex/Generated/Operations/BasicRestClient.cs rename to test/TestServerProjects/body-complex/Generated/BasicRestClient.cs diff --git a/test/TestServerProjects/body-complex/Generated/Operations/DictionaryClient.cs b/test/TestServerProjects/body-complex/Generated/DictionaryClient.cs similarity index 100% rename from test/TestServerProjects/body-complex/Generated/Operations/DictionaryClient.cs rename to test/TestServerProjects/body-complex/Generated/DictionaryClient.cs diff --git a/test/TestServerProjects/body-complex/Generated/Operations/DictionaryRestClient.cs b/test/TestServerProjects/body-complex/Generated/DictionaryRestClient.cs similarity index 100% rename from test/TestServerProjects/body-complex/Generated/Operations/DictionaryRestClient.cs rename to test/TestServerProjects/body-complex/Generated/DictionaryRestClient.cs diff --git a/test/TestServerProjects/body-complex/Generated/Operations/FlattencomplexClient.cs b/test/TestServerProjects/body-complex/Generated/FlattencomplexClient.cs similarity index 100% rename from test/TestServerProjects/body-complex/Generated/Operations/FlattencomplexClient.cs rename to test/TestServerProjects/body-complex/Generated/FlattencomplexClient.cs diff --git a/test/TestServerProjects/body-complex/Generated/Operations/FlattencomplexRestClient.cs b/test/TestServerProjects/body-complex/Generated/FlattencomplexRestClient.cs similarity index 100% rename from test/TestServerProjects/body-complex/Generated/Operations/FlattencomplexRestClient.cs rename to test/TestServerProjects/body-complex/Generated/FlattencomplexRestClient.cs diff --git a/test/TestServerProjects/body-complex/Generated/Operations/InheritanceClient.cs b/test/TestServerProjects/body-complex/Generated/InheritanceClient.cs similarity index 100% rename from test/TestServerProjects/body-complex/Generated/Operations/InheritanceClient.cs rename to test/TestServerProjects/body-complex/Generated/InheritanceClient.cs diff --git a/test/TestServerProjects/body-complex/Generated/Operations/InheritanceRestClient.cs b/test/TestServerProjects/body-complex/Generated/InheritanceRestClient.cs similarity index 100% rename from test/TestServerProjects/body-complex/Generated/Operations/InheritanceRestClient.cs rename to test/TestServerProjects/body-complex/Generated/InheritanceRestClient.cs diff --git a/test/TestServerProjects/body-complex/Generated/Operations/PolymorphicrecursiveClient.cs b/test/TestServerProjects/body-complex/Generated/PolymorphicrecursiveClient.cs similarity index 100% rename from test/TestServerProjects/body-complex/Generated/Operations/PolymorphicrecursiveClient.cs rename to test/TestServerProjects/body-complex/Generated/PolymorphicrecursiveClient.cs diff --git a/test/TestServerProjects/body-complex/Generated/Operations/PolymorphicrecursiveRestClient.cs b/test/TestServerProjects/body-complex/Generated/PolymorphicrecursiveRestClient.cs similarity index 100% rename from test/TestServerProjects/body-complex/Generated/Operations/PolymorphicrecursiveRestClient.cs rename to test/TestServerProjects/body-complex/Generated/PolymorphicrecursiveRestClient.cs diff --git a/test/TestServerProjects/body-complex/Generated/Operations/PolymorphismClient.cs b/test/TestServerProjects/body-complex/Generated/PolymorphismClient.cs similarity index 100% rename from test/TestServerProjects/body-complex/Generated/Operations/PolymorphismClient.cs rename to test/TestServerProjects/body-complex/Generated/PolymorphismClient.cs diff --git a/test/TestServerProjects/body-complex/Generated/Operations/PolymorphismRestClient.cs b/test/TestServerProjects/body-complex/Generated/PolymorphismRestClient.cs similarity index 100% rename from test/TestServerProjects/body-complex/Generated/Operations/PolymorphismRestClient.cs rename to test/TestServerProjects/body-complex/Generated/PolymorphismRestClient.cs diff --git a/test/TestServerProjects/body-complex/Generated/Operations/PrimitiveClient.cs b/test/TestServerProjects/body-complex/Generated/PrimitiveClient.cs similarity index 100% rename from test/TestServerProjects/body-complex/Generated/Operations/PrimitiveClient.cs rename to test/TestServerProjects/body-complex/Generated/PrimitiveClient.cs diff --git a/test/TestServerProjects/body-complex/Generated/Operations/PrimitiveRestClient.cs b/test/TestServerProjects/body-complex/Generated/PrimitiveRestClient.cs similarity index 100% rename from test/TestServerProjects/body-complex/Generated/Operations/PrimitiveRestClient.cs rename to test/TestServerProjects/body-complex/Generated/PrimitiveRestClient.cs diff --git a/test/TestServerProjects/body-complex/Generated/Operations/ReadonlypropertyClient.cs b/test/TestServerProjects/body-complex/Generated/ReadonlypropertyClient.cs similarity index 100% rename from test/TestServerProjects/body-complex/Generated/Operations/ReadonlypropertyClient.cs rename to test/TestServerProjects/body-complex/Generated/ReadonlypropertyClient.cs diff --git a/test/TestServerProjects/body-complex/Generated/Operations/ReadonlypropertyRestClient.cs b/test/TestServerProjects/body-complex/Generated/ReadonlypropertyRestClient.cs similarity index 100% rename from test/TestServerProjects/body-complex/Generated/Operations/ReadonlypropertyRestClient.cs rename to test/TestServerProjects/body-complex/Generated/ReadonlypropertyRestClient.cs diff --git a/test/TestServerProjects/body-date/Generated/Operations/DateClient.cs b/test/TestServerProjects/body-date/Generated/DateClient.cs similarity index 100% rename from test/TestServerProjects/body-date/Generated/Operations/DateClient.cs rename to test/TestServerProjects/body-date/Generated/DateClient.cs diff --git a/test/TestServerProjects/body-date/Generated/Operations/DateRestClient.cs b/test/TestServerProjects/body-date/Generated/DateRestClient.cs similarity index 100% rename from test/TestServerProjects/body-date/Generated/Operations/DateRestClient.cs rename to test/TestServerProjects/body-date/Generated/DateRestClient.cs diff --git a/test/TestServerProjects/body-datetime-rfc1123/Generated/Operations/Datetimerfc1123Client.cs b/test/TestServerProjects/body-datetime-rfc1123/Generated/Datetimerfc1123Client.cs similarity index 100% rename from test/TestServerProjects/body-datetime-rfc1123/Generated/Operations/Datetimerfc1123Client.cs rename to test/TestServerProjects/body-datetime-rfc1123/Generated/Datetimerfc1123Client.cs diff --git a/test/TestServerProjects/body-datetime-rfc1123/Generated/Operations/Datetimerfc1123RestClient.cs b/test/TestServerProjects/body-datetime-rfc1123/Generated/Datetimerfc1123RestClient.cs similarity index 100% rename from test/TestServerProjects/body-datetime-rfc1123/Generated/Operations/Datetimerfc1123RestClient.cs rename to test/TestServerProjects/body-datetime-rfc1123/Generated/Datetimerfc1123RestClient.cs diff --git a/test/TestServerProjects/body-datetime/Generated/Operations/DatetimeClient.cs b/test/TestServerProjects/body-datetime/Generated/DatetimeClient.cs similarity index 100% rename from test/TestServerProjects/body-datetime/Generated/Operations/DatetimeClient.cs rename to test/TestServerProjects/body-datetime/Generated/DatetimeClient.cs diff --git a/test/TestServerProjects/body-datetime/Generated/Operations/DatetimeRestClient.cs b/test/TestServerProjects/body-datetime/Generated/DatetimeRestClient.cs similarity index 100% rename from test/TestServerProjects/body-datetime/Generated/Operations/DatetimeRestClient.cs rename to test/TestServerProjects/body-datetime/Generated/DatetimeRestClient.cs diff --git a/test/TestServerProjects/body-dictionary/Generated/Operations/DictionaryClient.cs b/test/TestServerProjects/body-dictionary/Generated/DictionaryClient.cs similarity index 100% rename from test/TestServerProjects/body-dictionary/Generated/Operations/DictionaryClient.cs rename to test/TestServerProjects/body-dictionary/Generated/DictionaryClient.cs diff --git a/test/TestServerProjects/body-dictionary/Generated/Operations/DictionaryRestClient.cs b/test/TestServerProjects/body-dictionary/Generated/DictionaryRestClient.cs similarity index 100% rename from test/TestServerProjects/body-dictionary/Generated/Operations/DictionaryRestClient.cs rename to test/TestServerProjects/body-dictionary/Generated/DictionaryRestClient.cs diff --git a/test/TestServerProjects/body-duration/Generated/Operations/DurationClient.cs b/test/TestServerProjects/body-duration/Generated/DurationClient.cs similarity index 100% rename from test/TestServerProjects/body-duration/Generated/Operations/DurationClient.cs rename to test/TestServerProjects/body-duration/Generated/DurationClient.cs diff --git a/test/TestServerProjects/body-duration/Generated/Operations/DurationRestClient.cs b/test/TestServerProjects/body-duration/Generated/DurationRestClient.cs similarity index 100% rename from test/TestServerProjects/body-duration/Generated/Operations/DurationRestClient.cs rename to test/TestServerProjects/body-duration/Generated/DurationRestClient.cs diff --git a/test/TestServerProjects/body-file/Generated/Operations/FilesClient.cs b/test/TestServerProjects/body-file/Generated/FilesClient.cs similarity index 100% rename from test/TestServerProjects/body-file/Generated/Operations/FilesClient.cs rename to test/TestServerProjects/body-file/Generated/FilesClient.cs diff --git a/test/TestServerProjects/body-file/Generated/Operations/FilesRestClient.cs b/test/TestServerProjects/body-file/Generated/FilesRestClient.cs similarity index 100% rename from test/TestServerProjects/body-file/Generated/Operations/FilesRestClient.cs rename to test/TestServerProjects/body-file/Generated/FilesRestClient.cs diff --git a/test/TestServerProjects/body-integer/Generated/Operations/IntClient.cs b/test/TestServerProjects/body-integer/Generated/IntClient.cs similarity index 100% rename from test/TestServerProjects/body-integer/Generated/Operations/IntClient.cs rename to test/TestServerProjects/body-integer/Generated/IntClient.cs diff --git a/test/TestServerProjects/body-integer/Generated/Operations/IntRestClient.cs b/test/TestServerProjects/body-integer/Generated/IntRestClient.cs similarity index 100% rename from test/TestServerProjects/body-integer/Generated/Operations/IntRestClient.cs rename to test/TestServerProjects/body-integer/Generated/IntRestClient.cs diff --git a/test/TestServerProjects/body-number/Generated/Operations/NumberClient.cs b/test/TestServerProjects/body-number/Generated/NumberClient.cs similarity index 100% rename from test/TestServerProjects/body-number/Generated/Operations/NumberClient.cs rename to test/TestServerProjects/body-number/Generated/NumberClient.cs diff --git a/test/TestServerProjects/body-number/Generated/Operations/NumberRestClient.cs b/test/TestServerProjects/body-number/Generated/NumberRestClient.cs similarity index 100% rename from test/TestServerProjects/body-number/Generated/Operations/NumberRestClient.cs rename to test/TestServerProjects/body-number/Generated/NumberRestClient.cs diff --git a/test/TestServerProjects/body-string/Generated/Operations/EnumClient.cs b/test/TestServerProjects/body-string/Generated/EnumClient.cs similarity index 100% rename from test/TestServerProjects/body-string/Generated/Operations/EnumClient.cs rename to test/TestServerProjects/body-string/Generated/EnumClient.cs diff --git a/test/TestServerProjects/body-string/Generated/Operations/EnumRestClient.cs b/test/TestServerProjects/body-string/Generated/EnumRestClient.cs similarity index 100% rename from test/TestServerProjects/body-string/Generated/Operations/EnumRestClient.cs rename to test/TestServerProjects/body-string/Generated/EnumRestClient.cs diff --git a/test/TestServerProjects/body-string/Generated/Operations/StringClient.cs b/test/TestServerProjects/body-string/Generated/StringClient.cs similarity index 100% rename from test/TestServerProjects/body-string/Generated/Operations/StringClient.cs rename to test/TestServerProjects/body-string/Generated/StringClient.cs diff --git a/test/TestServerProjects/body-string/Generated/Operations/StringRestClient.cs b/test/TestServerProjects/body-string/Generated/StringRestClient.cs similarity index 100% rename from test/TestServerProjects/body-string/Generated/Operations/StringRestClient.cs rename to test/TestServerProjects/body-string/Generated/StringRestClient.cs diff --git a/test/TestServerProjects/body-time/Generated/Operations/TimeClient.cs b/test/TestServerProjects/body-time/Generated/TimeClient.cs similarity index 100% rename from test/TestServerProjects/body-time/Generated/Operations/TimeClient.cs rename to test/TestServerProjects/body-time/Generated/TimeClient.cs diff --git a/test/TestServerProjects/body-time/Generated/Operations/TimeRestClient.cs b/test/TestServerProjects/body-time/Generated/TimeRestClient.cs similarity index 100% rename from test/TestServerProjects/body-time/Generated/Operations/TimeRestClient.cs rename to test/TestServerProjects/body-time/Generated/TimeRestClient.cs diff --git a/test/TestServerProjects/custom-baseUrl-more-options/Generated/Operations/PathsClient.cs b/test/TestServerProjects/custom-baseUrl-more-options/Generated/PathsClient.cs similarity index 100% rename from test/TestServerProjects/custom-baseUrl-more-options/Generated/Operations/PathsClient.cs rename to test/TestServerProjects/custom-baseUrl-more-options/Generated/PathsClient.cs diff --git a/test/TestServerProjects/custom-baseUrl-more-options/Generated/Operations/PathsRestClient.cs b/test/TestServerProjects/custom-baseUrl-more-options/Generated/PathsRestClient.cs similarity index 100% rename from test/TestServerProjects/custom-baseUrl-more-options/Generated/Operations/PathsRestClient.cs rename to test/TestServerProjects/custom-baseUrl-more-options/Generated/PathsRestClient.cs diff --git a/test/TestServerProjects/custom-baseUrl-paging/Generated/Operations/PagingClient.cs b/test/TestServerProjects/custom-baseUrl-paging/Generated/PagingClient.cs similarity index 100% rename from test/TestServerProjects/custom-baseUrl-paging/Generated/Operations/PagingClient.cs rename to test/TestServerProjects/custom-baseUrl-paging/Generated/PagingClient.cs diff --git a/test/TestServerProjects/custom-baseUrl-paging/Generated/Operations/PagingRestClient.cs b/test/TestServerProjects/custom-baseUrl-paging/Generated/PagingRestClient.cs similarity index 100% rename from test/TestServerProjects/custom-baseUrl-paging/Generated/Operations/PagingRestClient.cs rename to test/TestServerProjects/custom-baseUrl-paging/Generated/PagingRestClient.cs diff --git a/test/TestServerProjects/custom-baseUrl/Generated/Operations/PathsClient.cs b/test/TestServerProjects/custom-baseUrl/Generated/PathsClient.cs similarity index 100% rename from test/TestServerProjects/custom-baseUrl/Generated/Operations/PathsClient.cs rename to test/TestServerProjects/custom-baseUrl/Generated/PathsClient.cs diff --git a/test/TestServerProjects/custom-baseUrl/Generated/Operations/PathsRestClient.cs b/test/TestServerProjects/custom-baseUrl/Generated/PathsRestClient.cs similarity index 100% rename from test/TestServerProjects/custom-baseUrl/Generated/Operations/PathsRestClient.cs rename to test/TestServerProjects/custom-baseUrl/Generated/PathsRestClient.cs diff --git a/test/TestServerProjects/extensible-enums-swagger/Generated/Operations/PetClient.cs b/test/TestServerProjects/extensible-enums-swagger/Generated/PetClient.cs similarity index 100% rename from test/TestServerProjects/extensible-enums-swagger/Generated/Operations/PetClient.cs rename to test/TestServerProjects/extensible-enums-swagger/Generated/PetClient.cs diff --git a/test/TestServerProjects/extensible-enums-swagger/Generated/Operations/PetRestClient.cs b/test/TestServerProjects/extensible-enums-swagger/Generated/PetRestClient.cs similarity index 100% rename from test/TestServerProjects/extensible-enums-swagger/Generated/Operations/PetRestClient.cs rename to test/TestServerProjects/extensible-enums-swagger/Generated/PetRestClient.cs diff --git a/test/TestServerProjects/header/Generated/Operations/HeaderClient.cs b/test/TestServerProjects/header/Generated/HeaderClient.cs similarity index 100% rename from test/TestServerProjects/header/Generated/Operations/HeaderClient.cs rename to test/TestServerProjects/header/Generated/HeaderClient.cs diff --git a/test/TestServerProjects/header/Generated/Operations/HeaderResponseBoolHeaders.cs b/test/TestServerProjects/header/Generated/HeaderResponseBoolHeaders.cs similarity index 100% rename from test/TestServerProjects/header/Generated/Operations/HeaderResponseBoolHeaders.cs rename to test/TestServerProjects/header/Generated/HeaderResponseBoolHeaders.cs diff --git a/test/TestServerProjects/header/Generated/Operations/HeaderResponseByteHeaders.cs b/test/TestServerProjects/header/Generated/HeaderResponseByteHeaders.cs similarity index 100% rename from test/TestServerProjects/header/Generated/Operations/HeaderResponseByteHeaders.cs rename to test/TestServerProjects/header/Generated/HeaderResponseByteHeaders.cs diff --git a/test/TestServerProjects/header/Generated/Operations/HeaderResponseDateHeaders.cs b/test/TestServerProjects/header/Generated/HeaderResponseDateHeaders.cs similarity index 100% rename from test/TestServerProjects/header/Generated/Operations/HeaderResponseDateHeaders.cs rename to test/TestServerProjects/header/Generated/HeaderResponseDateHeaders.cs diff --git a/test/TestServerProjects/header/Generated/Operations/HeaderResponseDatetimeHeaders.cs b/test/TestServerProjects/header/Generated/HeaderResponseDatetimeHeaders.cs similarity index 100% rename from test/TestServerProjects/header/Generated/Operations/HeaderResponseDatetimeHeaders.cs rename to test/TestServerProjects/header/Generated/HeaderResponseDatetimeHeaders.cs diff --git a/test/TestServerProjects/header/Generated/Operations/HeaderResponseDatetimeRfc1123Headers.cs b/test/TestServerProjects/header/Generated/HeaderResponseDatetimeRfc1123Headers.cs similarity index 100% rename from test/TestServerProjects/header/Generated/Operations/HeaderResponseDatetimeRfc1123Headers.cs rename to test/TestServerProjects/header/Generated/HeaderResponseDatetimeRfc1123Headers.cs diff --git a/test/TestServerProjects/header/Generated/Operations/HeaderResponseDoubleHeaders.cs b/test/TestServerProjects/header/Generated/HeaderResponseDoubleHeaders.cs similarity index 100% rename from test/TestServerProjects/header/Generated/Operations/HeaderResponseDoubleHeaders.cs rename to test/TestServerProjects/header/Generated/HeaderResponseDoubleHeaders.cs diff --git a/test/TestServerProjects/header/Generated/Operations/HeaderResponseDurationHeaders.cs b/test/TestServerProjects/header/Generated/HeaderResponseDurationHeaders.cs similarity index 100% rename from test/TestServerProjects/header/Generated/Operations/HeaderResponseDurationHeaders.cs rename to test/TestServerProjects/header/Generated/HeaderResponseDurationHeaders.cs diff --git a/test/TestServerProjects/header/Generated/Operations/HeaderResponseEnumHeaders.cs b/test/TestServerProjects/header/Generated/HeaderResponseEnumHeaders.cs similarity index 100% rename from test/TestServerProjects/header/Generated/Operations/HeaderResponseEnumHeaders.cs rename to test/TestServerProjects/header/Generated/HeaderResponseEnumHeaders.cs diff --git a/test/TestServerProjects/header/Generated/Operations/HeaderResponseExistingKeyHeaders.cs b/test/TestServerProjects/header/Generated/HeaderResponseExistingKeyHeaders.cs similarity index 100% rename from test/TestServerProjects/header/Generated/Operations/HeaderResponseExistingKeyHeaders.cs rename to test/TestServerProjects/header/Generated/HeaderResponseExistingKeyHeaders.cs diff --git a/test/TestServerProjects/header/Generated/Operations/HeaderResponseFloatHeaders.cs b/test/TestServerProjects/header/Generated/HeaderResponseFloatHeaders.cs similarity index 100% rename from test/TestServerProjects/header/Generated/Operations/HeaderResponseFloatHeaders.cs rename to test/TestServerProjects/header/Generated/HeaderResponseFloatHeaders.cs diff --git a/test/TestServerProjects/header/Generated/Operations/HeaderResponseIntegerHeaders.cs b/test/TestServerProjects/header/Generated/HeaderResponseIntegerHeaders.cs similarity index 100% rename from test/TestServerProjects/header/Generated/Operations/HeaderResponseIntegerHeaders.cs rename to test/TestServerProjects/header/Generated/HeaderResponseIntegerHeaders.cs diff --git a/test/TestServerProjects/header/Generated/Operations/HeaderResponseLongHeaders.cs b/test/TestServerProjects/header/Generated/HeaderResponseLongHeaders.cs similarity index 100% rename from test/TestServerProjects/header/Generated/Operations/HeaderResponseLongHeaders.cs rename to test/TestServerProjects/header/Generated/HeaderResponseLongHeaders.cs diff --git a/test/TestServerProjects/header/Generated/Operations/HeaderResponseProtectedKeyHeaders.cs b/test/TestServerProjects/header/Generated/HeaderResponseProtectedKeyHeaders.cs similarity index 100% rename from test/TestServerProjects/header/Generated/Operations/HeaderResponseProtectedKeyHeaders.cs rename to test/TestServerProjects/header/Generated/HeaderResponseProtectedKeyHeaders.cs diff --git a/test/TestServerProjects/header/Generated/Operations/HeaderResponseStringHeaders.cs b/test/TestServerProjects/header/Generated/HeaderResponseStringHeaders.cs similarity index 100% rename from test/TestServerProjects/header/Generated/Operations/HeaderResponseStringHeaders.cs rename to test/TestServerProjects/header/Generated/HeaderResponseStringHeaders.cs diff --git a/test/TestServerProjects/header/Generated/Operations/HeaderRestClient.cs b/test/TestServerProjects/header/Generated/HeaderRestClient.cs similarity index 100% rename from test/TestServerProjects/header/Generated/Operations/HeaderRestClient.cs rename to test/TestServerProjects/header/Generated/HeaderRestClient.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpClientFailureClient.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpClientFailureClient.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpClientFailureClient.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpClientFailureClient.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpClientFailureRestClient.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpClientFailureRestClient.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpClientFailureRestClient.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpClientFailureRestClient.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpFailureClient.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpFailureClient.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpFailureClient.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpFailureClient.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpFailureRestClient.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpFailureRestClient.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpFailureRestClient.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpFailureRestClient.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsClient.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsClient.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsClient.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsClient.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsDelete307Headers.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsDelete307Headers.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsDelete307Headers.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsDelete307Headers.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsGet300Headers.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsGet300Headers.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsGet300Headers.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsGet300Headers.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsGet301Headers.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsGet301Headers.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsGet301Headers.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsGet301Headers.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsGet302Headers.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsGet302Headers.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsGet302Headers.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsGet302Headers.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsGet307Headers.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsGet307Headers.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsGet307Headers.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsGet307Headers.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsHead300Headers.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsHead300Headers.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsHead300Headers.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsHead300Headers.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsHead301Headers.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsHead301Headers.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsHead301Headers.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsHead301Headers.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsHead302Headers.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsHead302Headers.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsHead302Headers.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsHead302Headers.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsHead307Headers.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsHead307Headers.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsHead307Headers.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsHead307Headers.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsOptions307Headers.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsOptions307Headers.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsOptions307Headers.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsOptions307Headers.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsPatch302Headers.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsPatch302Headers.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsPatch302Headers.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsPatch302Headers.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsPatch307Headers.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsPatch307Headers.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsPatch307Headers.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsPatch307Headers.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsPost303Headers.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsPost303Headers.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsPost303Headers.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsPost303Headers.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsPost307Headers.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsPost307Headers.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsPost307Headers.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsPost307Headers.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsPut301Headers.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsPut301Headers.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsPut301Headers.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsPut301Headers.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsPut307Headers.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsPut307Headers.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsPut307Headers.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsPut307Headers.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsRestClient.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsRestClient.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRedirectsRestClient.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpRedirectsRestClient.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRetryClient.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpRetryClient.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRetryClient.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpRetryClient.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRetryRestClient.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpRetryRestClient.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpRetryRestClient.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpRetryRestClient.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpServerFailureClient.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpServerFailureClient.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpServerFailureClient.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpServerFailureClient.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpServerFailureRestClient.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpServerFailureRestClient.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpServerFailureRestClient.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpServerFailureRestClient.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpSuccessClient.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpSuccessClient.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpSuccessClient.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpSuccessClient.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpSuccessRestClient.cs b/test/TestServerProjects/httpInfrastructure/Generated/HttpSuccessRestClient.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/HttpSuccessRestClient.cs rename to test/TestServerProjects/httpInfrastructure/Generated/HttpSuccessRestClient.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/MultipleResponsesClient.cs b/test/TestServerProjects/httpInfrastructure/Generated/MultipleResponsesClient.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/MultipleResponsesClient.cs rename to test/TestServerProjects/httpInfrastructure/Generated/MultipleResponsesClient.cs diff --git a/test/TestServerProjects/httpInfrastructure/Generated/Operations/MultipleResponsesRestClient.cs b/test/TestServerProjects/httpInfrastructure/Generated/MultipleResponsesRestClient.cs similarity index 100% rename from test/TestServerProjects/httpInfrastructure/Generated/Operations/MultipleResponsesRestClient.cs rename to test/TestServerProjects/httpInfrastructure/Generated/MultipleResponsesRestClient.cs diff --git a/test/TestServerProjects/lro/Generated/Operations/LRORetrysClient.cs b/test/TestServerProjects/lro/Generated/LRORetrysClient.cs similarity index 100% rename from test/TestServerProjects/lro/Generated/Operations/LRORetrysClient.cs rename to test/TestServerProjects/lro/Generated/LRORetrysClient.cs diff --git a/test/TestServerProjects/lro/Generated/Operations/LRORetrysRestClient.cs b/test/TestServerProjects/lro/Generated/LRORetrysRestClient.cs similarity index 100% rename from test/TestServerProjects/lro/Generated/Operations/LRORetrysRestClient.cs rename to test/TestServerProjects/lro/Generated/LRORetrysRestClient.cs diff --git a/test/TestServerProjects/lro/Generated/Operations/LROsClient.cs b/test/TestServerProjects/lro/Generated/LROsClient.cs similarity index 100% rename from test/TestServerProjects/lro/Generated/Operations/LROsClient.cs rename to test/TestServerProjects/lro/Generated/LROsClient.cs diff --git a/test/TestServerProjects/lro/Generated/Operations/LROsCustomHeaderClient.cs b/test/TestServerProjects/lro/Generated/LROsCustomHeaderClient.cs similarity index 100% rename from test/TestServerProjects/lro/Generated/Operations/LROsCustomHeaderClient.cs rename to test/TestServerProjects/lro/Generated/LROsCustomHeaderClient.cs diff --git a/test/TestServerProjects/lro/Generated/Operations/LROsCustomHeaderRestClient.cs b/test/TestServerProjects/lro/Generated/LROsCustomHeaderRestClient.cs similarity index 100% rename from test/TestServerProjects/lro/Generated/Operations/LROsCustomHeaderRestClient.cs rename to test/TestServerProjects/lro/Generated/LROsCustomHeaderRestClient.cs diff --git a/test/TestServerProjects/lro/Generated/Operations/LROsRestClient.cs b/test/TestServerProjects/lro/Generated/LROsRestClient.cs similarity index 100% rename from test/TestServerProjects/lro/Generated/Operations/LROsRestClient.cs rename to test/TestServerProjects/lro/Generated/LROsRestClient.cs diff --git a/test/TestServerProjects/lro/Generated/Operations/LrosaDsClient.cs b/test/TestServerProjects/lro/Generated/LrosaDsClient.cs similarity index 100% rename from test/TestServerProjects/lro/Generated/Operations/LrosaDsClient.cs rename to test/TestServerProjects/lro/Generated/LrosaDsClient.cs diff --git a/test/TestServerProjects/lro/Generated/Operations/LrosaDsRestClient.cs b/test/TestServerProjects/lro/Generated/LrosaDsRestClient.cs similarity index 100% rename from test/TestServerProjects/lro/Generated/Operations/LrosaDsRestClient.cs rename to test/TestServerProjects/lro/Generated/LrosaDsRestClient.cs diff --git a/test/TestServerProjects/media_types/Generated/Operations/ServiceClient.cs b/test/TestServerProjects/media_types/Generated/ServiceClient.cs similarity index 100% rename from test/TestServerProjects/media_types/Generated/Operations/ServiceClient.cs rename to test/TestServerProjects/media_types/Generated/ServiceClient.cs diff --git a/test/TestServerProjects/media_types/Generated/Operations/ServiceRestClient.cs b/test/TestServerProjects/media_types/Generated/ServiceRestClient.cs similarity index 100% rename from test/TestServerProjects/media_types/Generated/Operations/ServiceRestClient.cs rename to test/TestServerProjects/media_types/Generated/ServiceRestClient.cs diff --git a/test/TestServerProjects/model-flattening/Generated/Operations/ServiceClient.cs b/test/TestServerProjects/model-flattening/Generated/ServiceClient.cs similarity index 100% rename from test/TestServerProjects/model-flattening/Generated/Operations/ServiceClient.cs rename to test/TestServerProjects/model-flattening/Generated/ServiceClient.cs diff --git a/test/TestServerProjects/model-flattening/Generated/Operations/ServiceRestClient.cs b/test/TestServerProjects/model-flattening/Generated/ServiceRestClient.cs similarity index 100% rename from test/TestServerProjects/model-flattening/Generated/Operations/ServiceRestClient.cs rename to test/TestServerProjects/model-flattening/Generated/ServiceRestClient.cs diff --git a/test/TestServerProjects/multiple-inheritance/Generated/Operations/ServiceClient.cs b/test/TestServerProjects/multiple-inheritance/Generated/ServiceClient.cs similarity index 100% rename from test/TestServerProjects/multiple-inheritance/Generated/Operations/ServiceClient.cs rename to test/TestServerProjects/multiple-inheritance/Generated/ServiceClient.cs diff --git a/test/TestServerProjects/multiple-inheritance/Generated/Operations/ServiceRestClient.cs b/test/TestServerProjects/multiple-inheritance/Generated/ServiceRestClient.cs similarity index 100% rename from test/TestServerProjects/multiple-inheritance/Generated/Operations/ServiceRestClient.cs rename to test/TestServerProjects/multiple-inheritance/Generated/ServiceRestClient.cs diff --git a/test/TestServerProjects/non-string-enum/Generated/Operations/FloatClient.cs b/test/TestServerProjects/non-string-enum/Generated/FloatClient.cs similarity index 100% rename from test/TestServerProjects/non-string-enum/Generated/Operations/FloatClient.cs rename to test/TestServerProjects/non-string-enum/Generated/FloatClient.cs diff --git a/test/TestServerProjects/non-string-enum/Generated/Operations/FloatRestClient.cs b/test/TestServerProjects/non-string-enum/Generated/FloatRestClient.cs similarity index 100% rename from test/TestServerProjects/non-string-enum/Generated/Operations/FloatRestClient.cs rename to test/TestServerProjects/non-string-enum/Generated/FloatRestClient.cs diff --git a/test/TestServerProjects/non-string-enum/Generated/Operations/IntClient.cs b/test/TestServerProjects/non-string-enum/Generated/IntClient.cs similarity index 100% rename from test/TestServerProjects/non-string-enum/Generated/Operations/IntClient.cs rename to test/TestServerProjects/non-string-enum/Generated/IntClient.cs diff --git a/test/TestServerProjects/non-string-enum/Generated/Operations/IntRestClient.cs b/test/TestServerProjects/non-string-enum/Generated/IntRestClient.cs similarity index 100% rename from test/TestServerProjects/non-string-enum/Generated/Operations/IntRestClient.cs rename to test/TestServerProjects/non-string-enum/Generated/IntRestClient.cs diff --git a/test/TestServerProjects/object-type/Generated/Operations/ServiceClient.cs b/test/TestServerProjects/object-type/Generated/ServiceClient.cs similarity index 100% rename from test/TestServerProjects/object-type/Generated/Operations/ServiceClient.cs rename to test/TestServerProjects/object-type/Generated/ServiceClient.cs diff --git a/test/TestServerProjects/object-type/Generated/Operations/ServiceRestClient.cs b/test/TestServerProjects/object-type/Generated/ServiceRestClient.cs similarity index 100% rename from test/TestServerProjects/object-type/Generated/Operations/ServiceRestClient.cs rename to test/TestServerProjects/object-type/Generated/ServiceRestClient.cs diff --git a/test/TestServerProjects/paging/Generated/Operations/PagingClient.cs b/test/TestServerProjects/paging/Generated/PagingClient.cs similarity index 100% rename from test/TestServerProjects/paging/Generated/Operations/PagingClient.cs rename to test/TestServerProjects/paging/Generated/PagingClient.cs diff --git a/test/TestServerProjects/paging/Generated/Operations/PagingRestClient.cs b/test/TestServerProjects/paging/Generated/PagingRestClient.cs similarity index 100% rename from test/TestServerProjects/paging/Generated/Operations/PagingRestClient.cs rename to test/TestServerProjects/paging/Generated/PagingRestClient.cs diff --git a/test/TestServerProjects/required-optional/Generated/Operations/ExplicitClient.cs b/test/TestServerProjects/required-optional/Generated/ExplicitClient.cs similarity index 100% rename from test/TestServerProjects/required-optional/Generated/Operations/ExplicitClient.cs rename to test/TestServerProjects/required-optional/Generated/ExplicitClient.cs diff --git a/test/TestServerProjects/required-optional/Generated/Operations/ExplicitRestClient.cs b/test/TestServerProjects/required-optional/Generated/ExplicitRestClient.cs similarity index 100% rename from test/TestServerProjects/required-optional/Generated/Operations/ExplicitRestClient.cs rename to test/TestServerProjects/required-optional/Generated/ExplicitRestClient.cs diff --git a/test/TestServerProjects/required-optional/Generated/Operations/ImplicitClient.cs b/test/TestServerProjects/required-optional/Generated/ImplicitClient.cs similarity index 100% rename from test/TestServerProjects/required-optional/Generated/Operations/ImplicitClient.cs rename to test/TestServerProjects/required-optional/Generated/ImplicitClient.cs diff --git a/test/TestServerProjects/required-optional/Generated/Operations/ImplicitRestClient.cs b/test/TestServerProjects/required-optional/Generated/ImplicitRestClient.cs similarity index 100% rename from test/TestServerProjects/required-optional/Generated/Operations/ImplicitRestClient.cs rename to test/TestServerProjects/required-optional/Generated/ImplicitRestClient.cs diff --git a/test/TestServerProjects/subscriptionId-apiVersion/Generated/Operations/GroupClient.cs b/test/TestServerProjects/subscriptionId-apiVersion/Generated/GroupClient.cs similarity index 100% rename from test/TestServerProjects/subscriptionId-apiVersion/Generated/Operations/GroupClient.cs rename to test/TestServerProjects/subscriptionId-apiVersion/Generated/GroupClient.cs diff --git a/test/TestServerProjects/subscriptionId-apiVersion/Generated/Operations/GroupRestClient.cs b/test/TestServerProjects/subscriptionId-apiVersion/Generated/GroupRestClient.cs similarity index 100% rename from test/TestServerProjects/subscriptionId-apiVersion/Generated/Operations/GroupRestClient.cs rename to test/TestServerProjects/subscriptionId-apiVersion/Generated/GroupRestClient.cs diff --git a/test/TestServerProjects/url-multi-collectionFormat/Generated/Operations/QueriesClient.cs b/test/TestServerProjects/url-multi-collectionFormat/Generated/QueriesClient.cs similarity index 100% rename from test/TestServerProjects/url-multi-collectionFormat/Generated/Operations/QueriesClient.cs rename to test/TestServerProjects/url-multi-collectionFormat/Generated/QueriesClient.cs diff --git a/test/TestServerProjects/url-multi-collectionFormat/Generated/Operations/QueriesRestClient.cs b/test/TestServerProjects/url-multi-collectionFormat/Generated/QueriesRestClient.cs similarity index 100% rename from test/TestServerProjects/url-multi-collectionFormat/Generated/Operations/QueriesRestClient.cs rename to test/TestServerProjects/url-multi-collectionFormat/Generated/QueriesRestClient.cs diff --git a/test/TestServerProjects/url/Generated/Operations/PathItemsClient.cs b/test/TestServerProjects/url/Generated/PathItemsClient.cs similarity index 100% rename from test/TestServerProjects/url/Generated/Operations/PathItemsClient.cs rename to test/TestServerProjects/url/Generated/PathItemsClient.cs diff --git a/test/TestServerProjects/url/Generated/Operations/PathItemsRestClient.cs b/test/TestServerProjects/url/Generated/PathItemsRestClient.cs similarity index 100% rename from test/TestServerProjects/url/Generated/Operations/PathItemsRestClient.cs rename to test/TestServerProjects/url/Generated/PathItemsRestClient.cs diff --git a/test/TestServerProjects/url/Generated/Operations/PathsClient.cs b/test/TestServerProjects/url/Generated/PathsClient.cs similarity index 100% rename from test/TestServerProjects/url/Generated/Operations/PathsClient.cs rename to test/TestServerProjects/url/Generated/PathsClient.cs diff --git a/test/TestServerProjects/url/Generated/Operations/PathsRestClient.cs b/test/TestServerProjects/url/Generated/PathsRestClient.cs similarity index 100% rename from test/TestServerProjects/url/Generated/Operations/PathsRestClient.cs rename to test/TestServerProjects/url/Generated/PathsRestClient.cs diff --git a/test/TestServerProjects/url/Generated/Operations/QueriesClient.cs b/test/TestServerProjects/url/Generated/QueriesClient.cs similarity index 100% rename from test/TestServerProjects/url/Generated/Operations/QueriesClient.cs rename to test/TestServerProjects/url/Generated/QueriesClient.cs diff --git a/test/TestServerProjects/url/Generated/Operations/QueriesRestClient.cs b/test/TestServerProjects/url/Generated/QueriesRestClient.cs similarity index 100% rename from test/TestServerProjects/url/Generated/Operations/QueriesRestClient.cs rename to test/TestServerProjects/url/Generated/QueriesRestClient.cs diff --git a/test/TestServerProjects/validation/Generated/Operations/ServiceClient.cs b/test/TestServerProjects/validation/Generated/ServiceClient.cs similarity index 100% rename from test/TestServerProjects/validation/Generated/Operations/ServiceClient.cs rename to test/TestServerProjects/validation/Generated/ServiceClient.cs diff --git a/test/TestServerProjects/validation/Generated/Operations/ServiceRestClient.cs b/test/TestServerProjects/validation/Generated/ServiceRestClient.cs similarity index 100% rename from test/TestServerProjects/validation/Generated/Operations/ServiceRestClient.cs rename to test/TestServerProjects/validation/Generated/ServiceRestClient.cs diff --git a/test/TestServerProjects/xml-service/Generated/Operations/XmlClient.cs b/test/TestServerProjects/xml-service/Generated/XmlClient.cs similarity index 100% rename from test/TestServerProjects/xml-service/Generated/Operations/XmlClient.cs rename to test/TestServerProjects/xml-service/Generated/XmlClient.cs diff --git a/test/TestServerProjects/xml-service/Generated/Operations/XmlGetHeadersHeaders.cs b/test/TestServerProjects/xml-service/Generated/XmlGetHeadersHeaders.cs similarity index 100% rename from test/TestServerProjects/xml-service/Generated/Operations/XmlGetHeadersHeaders.cs rename to test/TestServerProjects/xml-service/Generated/XmlGetHeadersHeaders.cs diff --git a/test/TestServerProjects/xml-service/Generated/Operations/XmlRestClient.cs b/test/TestServerProjects/xml-service/Generated/XmlRestClient.cs similarity index 100% rename from test/TestServerProjects/xml-service/Generated/Operations/XmlRestClient.cs rename to test/TestServerProjects/xml-service/Generated/XmlRestClient.cs diff --git a/test/TestServerProjects/xms-error-responses/Generated/Operations/PetClient.cs b/test/TestServerProjects/xms-error-responses/Generated/PetClient.cs similarity index 100% rename from test/TestServerProjects/xms-error-responses/Generated/Operations/PetClient.cs rename to test/TestServerProjects/xms-error-responses/Generated/PetClient.cs diff --git a/test/TestServerProjects/xms-error-responses/Generated/Operations/PetRestClient.cs b/test/TestServerProjects/xms-error-responses/Generated/PetRestClient.cs similarity index 100% rename from test/TestServerProjects/xms-error-responses/Generated/Operations/PetRestClient.cs rename to test/TestServerProjects/xms-error-responses/Generated/PetRestClient.cs