diff --git a/CI/samples.ci/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/CI/samples.ci/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
similarity index 100%
rename from CI/samples.ci/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
rename to CI/samples.ci/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
diff --git a/CI/samples.ci/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/CI/samples.ci/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
similarity index 100%
rename from CI/samples.ci/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
rename to CI/samples.ci/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
diff --git a/appveyor.yml b/appveyor.yml
index 298ccf96844..7d62a6b9b72 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,9 +24,9 @@ install:
- ps: Start-Process -FilePath 'C:\maven\apache-maven-3.2.5\bin\mvn' -ArgumentList 'jetty:run' -WorkingDirectory "$env:appveyor_build_folder\swagger-samples\java\java-jersey-jaxrs-ci"
build_script:
- dotnet --info
- # build C# API client (refactor)
- - dotnet build samples\client\petstore\csharp-refactor\OpenAPIClient\Org.OpenAPITools.sln
- - dotnet build samples\client\petstore\csharp-refactor\OpenAPIClientCore\Org.OpenAPITools.sln
+ # build C# API client (netcore)
+ - dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient\Org.OpenAPITools.sln
+ - dotnet build samples\client\petstore\csharp-netcore\OpenAPIClientCore\Org.OpenAPITools.sln
# build C# API client
- nuget restore samples\client\petstore\csharp\OpenAPIClient\Org.OpenAPITools.sln
- msbuild samples\client\petstore\csharp\OpenAPIClient\Org.OpenAPITools.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
@@ -41,9 +41,9 @@ build_script:
test_script:
# restore test-related files
- copy /b/v/y CI\samples.ci\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
- # test c# API client (refactor)
- - dotnet test samples\client\petstore\csharp-refactor\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
- - dotnet test samples\client\petstore\csharp-refactor\OpenAPIClientCore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+ # test c# API client (netcore)
+ - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
+ - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClientCore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
# test c# API client
- nunit-console samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\bin\Debug\Org.OpenAPITools.Test.dll --result=myresults.xml;format=AppVeyor
# test c# API client (with PropertyChanged)
diff --git a/bin/csharp-refactor-petstore-all.sh b/bin/csharp-netcore-petstore-all.sh
similarity index 55%
rename from bin/csharp-refactor-petstore-all.sh
rename to bin/csharp-netcore-petstore-all.sh
index ea4afcff5e1..6db67b5e0e1 100755
--- a/bin/csharp-refactor-petstore-all.sh
+++ b/bin/csharp-netcore-petstore-all.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# C# Petstore API client .NET Standard 2.0
-./bin/csharp-refactor-petstore.sh
+./bin/csharp-netcore-petstore.sh
# C# Petstore API client .NET Core 2.0
-./bin/csharp-refactor-petstore-netcore.sh
+./bin/csharp-netcore-petstore-netcore.sh
diff --git a/bin/csharp-refactor-petstore-netcore.sh b/bin/csharp-netcore-petstore-netcore.sh
similarity index 57%
rename from bin/csharp-refactor-petstore-netcore.sh
rename to bin/csharp-netcore-petstore-netcore.sh
index fd764a6a920..3f6c6e91669 100755
--- a/bin/csharp-refactor-petstore-netcore.sh
+++ b/bin/csharp-netcore-petstore-netcore.sh
@@ -19,7 +19,7 @@ if [ ! -d "${APP_DIR}" ]; then
fi
executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
-outdir="samples/client/petstore/csharp-refactor/OpenAPIClientCore"
+outdir="samples/client/petstore/csharp-netcore/OpenAPIClientCore"
if [ ! -f "$executable" ]
then
@@ -28,11 +28,11 @@ fi
# if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/csharp-refactor/ -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g csharp-refactor -o ${outdir} --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C},useCompareNetObjects=true,targetFramework=netcoreapp2.0 $@"
+ags="generate -t modules/openapi-generator/src/main/resources/csharp-netcore/ -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g csharp-netcore -o ${outdir} --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C},useCompareNetObjects=true,targetFramework=netcoreapp2.0 $@"
java $JAVA_OPTS -jar $executable $ags
# restore csproj file
-echo "restore csproject file: CI/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj"
-cp ./CI/samples.ci/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj ./samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/
+echo "restore csproject file: CI/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj"
+cp ./CI/samples.ci/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj ./samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/
diff --git a/bin/csharp-refactor-petstore.sh b/bin/csharp-netcore-petstore.sh
similarity index 59%
rename from bin/csharp-refactor-petstore.sh
rename to bin/csharp-netcore-petstore.sh
index 6c5d0ca8b98..2c774d0a5e2 100755
--- a/bin/csharp-refactor-petstore.sh
+++ b/bin/csharp-netcore-petstore.sh
@@ -27,11 +27,11 @@ fi
# if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/csharp-refactor/ -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g csharp-refactor -o samples/client/petstore/csharp-refactor/OpenAPIClient --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C},useCompareNetObjects=true $@"
+ags="generate -t modules/openapi-generator/src/main/resources/csharp-netcore/ -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g csharp-netcore -o samples/client/petstore/csharp-netcore/OpenAPIClient --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C},useCompareNetObjects=true $@"
java $JAVA_OPTS -jar $executable $ags
# restore csproj file
-echo "restore csproject file: CI/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj"
-cp ./CI/samples.ci/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj ./samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/
+echo "restore csproject file: CI/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj"
+cp ./CI/samples.ci/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj ./samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/
diff --git a/docs/generators.md b/docs/generators.md
index c75d7310340..6fe91f19ce2 100644
--- a/docs/generators.md
+++ b/docs/generators.md
@@ -17,7 +17,7 @@ The following generators are available:
- [cpp-tizen](generators/cpp-tizen.md)
- [csharp](generators/csharp.md)
- [csharp-dotnet2](generators/csharp-dotnet2.md)
- - [csharp-refactor](generators/csharp-refactor.md)
+ - [csharp-netcore](generators/csharp-netcore.md)
- [dart](generators/dart.md)
- [dart-jaguar](generators/dart-jaguar.md)
- [eiffel](generators/eiffel.md)
diff --git a/docs/generators/csharp-netcore.md b/docs/generators/csharp-netcore.md
new file mode 100644
index 00000000000..9bc3a89a41e
--- /dev/null
+++ b/docs/generators/csharp-netcore.md
@@ -0,0 +1,29 @@
+
+---
+id: generator-opts-client-csharp-netcore
+title: Config Options for csharp-netcore
+sidebar_label: csharp-netcore
+---
+
+| Option | Description | Values | Default |
+| ------ | ----------- | ------ | ------- |
+|packageName|C# package name (convention: Title.Case).| |Org.OpenAPITools|
+|packageVersion|C# package version.| |1.0.0|
+|sourceFolder|source folder for generated code| |src|
+|packageGuid|The GUID that will be associated with the C# project| |null|
+|interfacePrefix|Prefix interfaces with a community standard or widely accepted prefix.| |I|
+|targetFramework|The target .NET framework version.|
- **netstandard1.3**
- .NET Standard 1.3 compatible
- **netstandard1.4**
- .NET Standard 1.4 compatible
- **netstandard1.5**
- .NET Standard 1.5 compatible
- **netstandard1.6**
- .NET Standard 1.6 compatible
- **netstandard2.0**
- .NET Standard 2.0 compatible
- **netcoreapp2.0**
- .NET Core 2.0 compatible
|v4.6.1|
+|modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |PascalCase|
+|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
+|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
+|useDateTimeOffset|Use DateTimeOffset to model date-time properties| |false|
+|useCollection|Deserialize array types to Collection<T> instead of List<T>.| |false|
+|returnICollection|Return ICollection<T> instead of the concrete type.| |false|
+|optionalMethodArgument|C# Optional method argument, e.g. void square(int x=10) (.net 4.0+ only).| |true|
+|optionalAssemblyInfo|Generate AssemblyInfo.cs.| |true|
+|optionalProjectFile|Generate {PackageName}.csproj.| |true|
+|optionalEmitDefaultValues|Set DataMember's EmitDefaultValue.| |false|
+|nonPublicApi|Generates code with reduced access modifiers; allows embedding elsewhere without exposing non-public API calls to consumers.| |false|
+|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
+|netCoreProjectFile|Use the new format (.NET Core) for .NET project files (.csproj).| |false|
+|validatable|Generates self-validatable models.| |true|
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpRefactorClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java
similarity index 99%
rename from modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpRefactorClientCodegen.java
rename to modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java
index 00f74726d15..9f6f9416189 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpRefactorClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java
@@ -1,6 +1,5 @@
/*
* Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech)
- * Copyright 2018 SmartBear Software
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -35,7 +34,7 @@ import static org.openapitools.codegen.utils.StringUtils.camelize;
import static org.openapitools.codegen.utils.StringUtils.underscore;
@SuppressWarnings("Duplicates")
-public class CSharpRefactorClientCodegen extends AbstractCSharpCodegen {
+public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen {
// Defines the sdk option for targeted frameworks, which differs from targetFramework and targetFrameworkNuget
protected static final String MCS_NET_VERSION_KEY = "x-mcs-sdk";
protected static final String SUPPORTS_UWP = "supportsUWP";
@@ -79,7 +78,7 @@ public class CSharpRefactorClientCodegen extends AbstractCSharpCodegen {
// By default, generated code is considered public
protected boolean nonPublicApi = Boolean.FALSE;
- public CSharpRefactorClientCodegen() {
+ public CSharpNetCoreClientCodegen() {
super();
// mapped non-nullable type without ?
@@ -109,7 +108,7 @@ public class CSharpRefactorClientCodegen extends AbstractCSharpCodegen {
apiTemplateFiles.put("api.mustache", ".cs");
modelDocTemplateFiles.put("model_doc.mustache", ".md");
apiDocTemplateFiles.put("api_doc.mustache", ".md");
- embeddedTemplateDir = templateDir = "csharp-refactor";
+ embeddedTemplateDir = templateDir = "csharp-netcore";
cliOptions.clear();
@@ -286,7 +285,7 @@ public class CSharpRefactorClientCodegen extends AbstractCSharpCodegen {
@Override
public String getHelp() {
- return "Generates a CSharp client library.";
+ return "Generates a C# client library (.NET Standard, .NET Core).";
}
// private void syncStringProperty(Map properties, String key)
@@ -308,7 +307,7 @@ public class CSharpRefactorClientCodegen extends AbstractCSharpCodegen {
@Override
public String getName() {
- return "csharp-refactor";
+ return "csharp-netcore";
}
public String getNameUsingModelPropertyNaming(String name) {
diff --git a/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig b/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig
index c0ec82c5695..7fe2f245b9f 100644
--- a/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig
+++ b/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig
@@ -15,7 +15,7 @@ org.openapitools.codegen.languages.CppRestbedServerCodegen
org.openapitools.codegen.languages.CppRestSdkClientCodegen
org.openapitools.codegen.languages.CppTizenClientCodegen
org.openapitools.codegen.languages.CSharpClientCodegen
-org.openapitools.codegen.languages.CSharpRefactorClientCodegen
+org.openapitools.codegen.languages.CSharpNetCoreClientCodegen
org.openapitools.codegen.languages.CSharpDotNet2ClientCodegen
org.openapitools.codegen.languages.CSharpNancyFXServerCodegen
org.openapitools.codegen.languages.DartClientCodegen
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/ApiClient.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/ApiClient.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/ApiException.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/ApiException.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/ApiException.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/ApiException.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/ApiResponse.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/ApiResponse.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/ApiResponse.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/ApiResponse.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/AssemblyInfo.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/AssemblyInfo.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/AssemblyInfo.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/AssemblyInfo.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/ClientUtils.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/ClientUtils.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/ClientUtils.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/ClientUtils.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/Configuration.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/Configuration.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/Configuration.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/Configuration.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/ExceptionFactory.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/ExceptionFactory.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/ExceptionFactory.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/ExceptionFactory.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/GlobalConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/GlobalConfiguration.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/GlobalConfiguration.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/GlobalConfiguration.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/HttpMethod.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/HttpMethod.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/HttpMethod.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/HttpMethod.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/IApiAccessor.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/IApiAccessor.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/IApiAccessor.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/IApiAccessor.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/IAsynchronousClient.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/IAsynchronousClient.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/IAsynchronousClient.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/IAsynchronousClient.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/IReadableConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/IReadableConfiguration.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/IReadableConfiguration.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/IReadableConfiguration.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/ISynchronousClient.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/ISynchronousClient.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/ISynchronousClient.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/ISynchronousClient.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/JsonSubTypesTests.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/JsonSubTypesTests.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/JsonSubTypesTests.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/JsonSubTypesTests.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/Multimap.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/Multimap.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/Multimap.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/Multimap.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/OpenAPIDateConverter.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/OpenAPIDateConverter.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/OpenAPIDateConverter.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/OpenAPIDateConverter.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/Project.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/Project.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/Project.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/Project.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/README.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/README.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/README.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/README.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/ReadOnlyDictionary.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/ReadOnlyDictionary.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/ReadOnlyDictionary.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/ReadOnlyDictionary.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/RequestOptions.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/RequestOptions.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/RequestOptions.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/RequestOptions.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/Solution.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/Solution.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/Solution.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/Solution.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/TestProject.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/TestProject.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/TestProject.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/TestProject.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/api.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/api.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/api.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/api.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/api_doc.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/api_doc.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/api_doc.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/api_doc.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/api_test.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/api_test.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/api_test.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/api_test.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/enumClass.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/enumClass.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/enumClass.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/enumClass.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/git_push.sh.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/git_push.sh.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/git_push.sh.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/git_push.sh.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/gitignore.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/gitignore.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/gitignore.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/gitignore.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/model.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/model.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/model.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/model.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/modelEnum.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/modelEnum.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/modelEnum.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/modelEnum.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/modelGeneric.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/modelInnerEnum.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/modelInnerEnum.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/modelInnerEnum.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/modelInnerEnum.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/model_doc.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/model_doc.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/model_doc.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/model_doc.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/model_test.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/model_test.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/model_test.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/model_test.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/netcore_project.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/netcore_project.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/netcore_project.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/netcore_project.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/netcore_testproject.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/netcore_testproject.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/netcore_testproject.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/netcore_testproject.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/nuspec.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/nuspec.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/nuspec.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/nuspec.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/packages.config.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/packages.config.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/packages.config.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/packages.config.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/partial_header.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/partial_header.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/partial_header.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/partial_header.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/project.json.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/project.json.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/project.json.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/project.json.mustache
diff --git a/modules/openapi-generator/src/main/resources/csharp-refactor/visibility.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/visibility.mustache
similarity index 100%
rename from modules/openapi-generator/src/main/resources/csharp-refactor/visibility.mustache
rename to modules/openapi-generator/src/main/resources/csharp-netcore/visibility.mustache
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/.gitignore b/samples/client/petstore/csharp-netcore/OpenAPIClient/.gitignore
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/.gitignore
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/.gitignore
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/.openapi-generator-ignore b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator-ignore
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/.openapi-generator-ignore
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator-ignore
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/.openapi-generator/VERSION
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/Org.OpenAPITools.sln b/samples/client/petstore/csharp-netcore/OpenAPIClient/Org.OpenAPITools.sln
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/Org.OpenAPITools.sln
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/Org.OpenAPITools.sln
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/README.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/README.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/README.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/AdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/AdditionalPropertiesClass.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/AdditionalPropertiesClass.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/AdditionalPropertiesClass.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/Animal.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Animal.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/Animal.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Animal.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/AnimalFarm.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/AnimalFarm.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/AnimalFarm.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/AnimalFarm.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/AnotherFakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/AnotherFakeApi.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/AnotherFakeApi.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/AnotherFakeApi.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/ApiResponse.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ApiResponse.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/ApiResponse.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ApiResponse.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ArrayOfArrayOfNumberOnly.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/ArrayOfArrayOfNumberOnly.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ArrayOfArrayOfNumberOnly.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/ArrayOfNumberOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ArrayOfNumberOnly.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/ArrayOfNumberOnly.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ArrayOfNumberOnly.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/ArrayTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ArrayTest.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/ArrayTest.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ArrayTest.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/Capitalization.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Capitalization.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/Capitalization.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Capitalization.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/Cat.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Cat.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/Cat.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Cat.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/Category.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Category.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/Category.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Category.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/ClassModel.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ClassModel.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/ClassModel.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ClassModel.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/Dog.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Dog.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/Dog.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Dog.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/EnumArrays.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumArrays.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/EnumArrays.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumArrays.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/EnumClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumClass.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/EnumClass.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumClass.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/EnumTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumTest.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/EnumTest.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumTest.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/FakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FakeApi.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/FakeApi.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FakeApi.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/FakeClassnameTags123Api.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FakeClassnameTags123Api.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/FakeClassnameTags123Api.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FakeClassnameTags123Api.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/File.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/File.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/File.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/File.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/FileSchemaTestClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FileSchemaTestClass.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/FileSchemaTestClass.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FileSchemaTestClass.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/FormatTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FormatTest.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/FormatTest.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FormatTest.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/HasOnlyReadOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/HasOnlyReadOnly.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/HasOnlyReadOnly.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/HasOnlyReadOnly.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/List.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/List.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/List.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/List.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/MapTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/MapTest.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/MapTest.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/MapTest.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/MixedPropertiesAndAdditionalPropertiesClass.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/MixedPropertiesAndAdditionalPropertiesClass.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/MixedPropertiesAndAdditionalPropertiesClass.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/Model200Response.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Model200Response.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/Model200Response.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Model200Response.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/ModelClient.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ModelClient.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/ModelClient.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ModelClient.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/Name.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Name.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/Name.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Name.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/NumberOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/NumberOnly.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/NumberOnly.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/NumberOnly.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/Order.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Order.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/Order.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Order.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/OuterComposite.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterComposite.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/OuterComposite.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterComposite.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/OuterEnum.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterEnum.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/OuterEnum.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterEnum.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/Pet.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Pet.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/Pet.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Pet.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/PetApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/PetApi.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/PetApi.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/PetApi.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/ReadOnlyFirst.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ReadOnlyFirst.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/ReadOnlyFirst.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ReadOnlyFirst.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/Return.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Return.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/Return.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Return.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/SpecialModelName.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/SpecialModelName.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/SpecialModelName.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/SpecialModelName.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/StoreApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/StoreApi.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/StoreApi.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/StoreApi.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/StringBooleanMap.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/StringBooleanMap.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/StringBooleanMap.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/StringBooleanMap.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/Tag.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Tag.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/Tag.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Tag.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/TypeHolderDefault.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/TypeHolderDefault.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/TypeHolderDefault.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/TypeHolderDefault.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/TypeHolderExample.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/TypeHolderExample.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/TypeHolderExample.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/TypeHolderExample.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/User.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/User.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/User.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/User.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/UserApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/UserApi.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/UserApi.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/UserApi.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/docs/XmlItem.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/XmlItem.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/docs/XmlItem.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/docs/XmlItem.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/git_push.sh b/samples/client/petstore/csharp-netcore/OpenAPIClient/git_push.sh
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/git_push.sh
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/git_push.sh
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AnimalFarmTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AnimalFarmTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AnimalFarmTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AnimalFarmTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AnimalTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AnimalTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AnimalTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CatTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CatTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CatTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CategoryTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CategoryTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CategoryTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DogTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DogTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DogTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ListTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ListTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ListTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MapTestTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MapTestTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MapTestTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NameTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NameTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NameTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OrderTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OrderTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OrderTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PetTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PetTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PetTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReturnTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReturnTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReturnTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/StringBooleanMapTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/StringBooleanMapTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/StringBooleanMapTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/StringBooleanMapTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TagTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TagTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TagTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TypeHolderDefaultTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TypeHolderDefaultTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TypeHolderDefaultTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TypeHolderDefaultTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TypeHolderExampleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TypeHolderExampleTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TypeHolderExampleTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TypeHolderExampleTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/UserTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/UserTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/UserTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/XmlItemTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/XmlItemTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Model/XmlItemTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/XmlItemTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/linux-logo.png b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/linux-logo.png
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools.Test/linux-logo.png
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/linux-logo.png
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/UserApi.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Api/UserApi.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/UserApi.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiException.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/ApiException.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiException.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiResponse.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/ApiResponse.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiResponse.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ClientUtils.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/ClientUtils.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ClientUtils.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ExceptionFactory.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/ExceptionFactory.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ExceptionFactory.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/GlobalConfiguration.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/GlobalConfiguration.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/GlobalConfiguration.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/HttpMethod.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/HttpMethod.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/HttpMethod.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/HttpMethod.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/IApiAccessor.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/IApiAccessor.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/IApiAccessor.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/IAsynchronousClient.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/IAsynchronousClient.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/IAsynchronousClient.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ISynchronousClient.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/ISynchronousClient.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ISynchronousClient.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Multimap.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/Multimap.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Multimap.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/RequestOptions.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Client/RequestOptions.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/RequestOptions.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/AnimalFarm.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/AnimalFarm.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/AnimalFarm.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/AnimalFarm.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ApiResponse.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/ApiResponse.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ApiResponse.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayTest.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayTest.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayTest.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Capitalization.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/Capitalization.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Capitalization.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Category.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/Category.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Category.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ClassModel.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/ClassModel.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ClassModel.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/File.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/File.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/File.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/List.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/List.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/List.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Model200Response.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/Model200Response.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Model200Response.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Name.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/Name.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Name.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NumberOnly.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/NumberOnly.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NumberOnly.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterComposite.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/OuterComposite.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterComposite.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Return.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/Return.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Return.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/SpecialModelName.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/SpecialModelName.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/SpecialModelName.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/StringBooleanMap.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/StringBooleanMap.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/StringBooleanMap.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/StringBooleanMap.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Tag.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/Tag.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Tag.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/TypeHolderDefault.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TypeHolderDefault.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/TypeHolderDefault.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TypeHolderDefault.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/TypeHolderExample.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TypeHolderExample.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/TypeHolderExample.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TypeHolderExample.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/User.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/User.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/User.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/XmlItem.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/XmlItem.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Model/XmlItem.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/XmlItem.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.nuspec b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Properties/AssemblyInfo.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Properties/AssemblyInfo.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/Properties/AssemblyInfo.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Properties/AssemblyInfo.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/project.json b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/project.json
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClient/src/Org.OpenAPITools/project.json
rename to samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/project.json
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/.gitignore b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.gitignore
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/.gitignore
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/.gitignore
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/.openapi-generator-ignore b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator-ignore
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/.openapi-generator-ignore
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator-ignore
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/.openapi-generator/VERSION
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/.travis.yml b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.travis.yml
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/.travis.yml
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/.travis.yml
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/Org.OpenAPITools.sln b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/Org.OpenAPITools.sln
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/Org.OpenAPITools.sln
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/Org.OpenAPITools.sln
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/README.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/build.bat b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/build.bat
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/build.bat
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/build.bat
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/build.sh b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/build.sh
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/build.sh
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/build.sh
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/AdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesClass.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/AdditionalPropertiesClass.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesClass.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/Animal.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Animal.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/Animal.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Animal.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/AnotherFakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AnotherFakeApi.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/AnotherFakeApi.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AnotherFakeApi.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/ApiResponse.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ApiResponse.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/ApiResponse.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ApiResponse.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ArrayOfArrayOfNumberOnly.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/ArrayOfArrayOfNumberOnly.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ArrayOfArrayOfNumberOnly.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/ArrayOfNumberOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ArrayOfNumberOnly.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/ArrayOfNumberOnly.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ArrayOfNumberOnly.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/ArrayTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ArrayTest.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/ArrayTest.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ArrayTest.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/Capitalization.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Capitalization.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/Capitalization.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Capitalization.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/Cat.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Cat.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/Cat.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Cat.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/Category.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Category.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/Category.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Category.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/ClassModel.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ClassModel.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/ClassModel.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ClassModel.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/Dog.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Dog.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/Dog.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Dog.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/EnumArrays.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumArrays.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/EnumArrays.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumArrays.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/EnumClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumClass.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/EnumClass.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumClass.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/EnumTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumTest.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/EnumTest.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumTest.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/FakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FakeApi.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/FakeApi.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FakeApi.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/FakeClassnameTags123Api.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FakeClassnameTags123Api.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/FakeClassnameTags123Api.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FakeClassnameTags123Api.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/File.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/File.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/File.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/File.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/FileSchemaTestClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FileSchemaTestClass.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/FileSchemaTestClass.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FileSchemaTestClass.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/FormatTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FormatTest.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/FormatTest.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FormatTest.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/HasOnlyReadOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/HasOnlyReadOnly.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/HasOnlyReadOnly.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/HasOnlyReadOnly.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/List.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/List.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/List.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/List.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/MapTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/MapTest.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/MapTest.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/MapTest.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/MixedPropertiesAndAdditionalPropertiesClass.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/MixedPropertiesAndAdditionalPropertiesClass.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/MixedPropertiesAndAdditionalPropertiesClass.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/Model200Response.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Model200Response.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/Model200Response.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Model200Response.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/ModelClient.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ModelClient.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/ModelClient.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ModelClient.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/Name.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Name.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/Name.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Name.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/NumberOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/NumberOnly.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/NumberOnly.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/NumberOnly.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/Order.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Order.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/Order.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Order.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/OuterComposite.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterComposite.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/OuterComposite.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterComposite.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/OuterEnum.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterEnum.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/OuterEnum.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterEnum.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/Pet.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Pet.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/Pet.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Pet.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/PetApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/PetApi.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/PetApi.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/PetApi.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/ReadOnlyFirst.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ReadOnlyFirst.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/ReadOnlyFirst.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ReadOnlyFirst.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/Return.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Return.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/Return.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Return.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/SpecialModelName.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/SpecialModelName.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/SpecialModelName.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/SpecialModelName.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/StoreApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/StoreApi.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/StoreApi.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/StoreApi.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/Tag.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Tag.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/Tag.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Tag.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/TypeHolderDefault.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/TypeHolderDefault.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/TypeHolderDefault.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/TypeHolderDefault.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/TypeHolderExample.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/TypeHolderExample.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/TypeHolderExample.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/TypeHolderExample.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/User.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/User.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/User.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/User.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/UserApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/UserApi.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/UserApi.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/UserApi.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/XmlItem.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/XmlItem.md
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/docs/XmlItem.md
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/XmlItem.md
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/git_push.sh b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/git_push.sh
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/git_push.sh
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/git_push.sh
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/mono_nunit_test.sh b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/mono_nunit_test.sh
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/mono_nunit_test.sh
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/mono_nunit_test.sh
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AnimalTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AnimalTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AnimalTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CatTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CatTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CatTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CategoryTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CategoryTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CategoryTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DogTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DogTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DogTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FileTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FileTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FileTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ListTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ListTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ListTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MapTestTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MapTestTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MapTestTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NameTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NameTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NameTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OrderTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OrderTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OrderTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PetTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PetTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PetTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ReturnTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ReturnTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ReturnTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TagTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TagTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TagTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TypeHolderDefaultTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TypeHolderDefaultTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TypeHolderDefaultTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TypeHolderDefaultTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TypeHolderExampleTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TypeHolderExampleTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TypeHolderExampleTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TypeHolderExampleTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/UserTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/UserTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/UserTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/XmlItemTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/XmlItemTests.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/XmlItemTests.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/XmlItemTests.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/linux-logo.png b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/linux-logo.png
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools.Test/linux-logo.png
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/linux-logo.png
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/PetApi.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Api/PetApi.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/PetApi.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/StoreApi.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Api/StoreApi.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/StoreApi.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/UserApi.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Api/UserApi.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/UserApi.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiException.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiException.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiException.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiResponse.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiResponse.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiResponse.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ClientUtils.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/ClientUtils.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ClientUtils.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ExceptionFactory.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/ExceptionFactory.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ExceptionFactory.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/GlobalConfiguration.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/GlobalConfiguration.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/GlobalConfiguration.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpMethod.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpMethod.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpMethod.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpMethod.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IApiAccessor.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/IApiAccessor.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IApiAccessor.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IAsynchronousClient.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/IAsynchronousClient.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IAsynchronousClient.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ISynchronousClient.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/ISynchronousClient.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ISynchronousClient.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Multimap.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/Multimap.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Multimap.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/RequestOptions.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Client/RequestOptions.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/RequestOptions.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Animal.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/Animal.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Animal.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ApiResponse.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/ApiResponse.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ApiResponse.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayTest.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayTest.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayTest.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Capitalization.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/Capitalization.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Capitalization.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Category.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/Category.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Category.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ClassModel.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/ClassModel.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ClassModel.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumArrays.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumArrays.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumArrays.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumClass.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumClass.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumClass.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumTest.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumTest.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumTest.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/File.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/File.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/File.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/List.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/List.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/List.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MapTest.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/MapTest.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MapTest.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Model200Response.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/Model200Response.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Model200Response.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ModelClient.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/ModelClient.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ModelClient.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Name.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/Name.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Name.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NumberOnly.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/NumberOnly.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NumberOnly.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterComposite.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterComposite.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterComposite.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnum.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnum.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnum.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pet.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pet.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pet.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Return.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/Return.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Return.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/SpecialModelName.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/SpecialModelName.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/SpecialModelName.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Tag.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/Tag.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Tag.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/TypeHolderDefault.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TypeHolderDefault.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/TypeHolderDefault.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TypeHolderDefault.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/TypeHolderExample.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TypeHolderExample.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/TypeHolderExample.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TypeHolderExample.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/User.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/User.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/User.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/XmlItem.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/XmlItem.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Model/XmlItem.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/XmlItem.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.nuspec b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.nuspec
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Properties/AssemblyInfo.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Properties/AssemblyInfo.cs
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/Properties/AssemblyInfo.cs
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Properties/AssemblyInfo.cs
diff --git a/samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/project.json b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/project.json
similarity index 100%
rename from samples/client/petstore/csharp-refactor/OpenAPIClientCore/src/Org.OpenAPITools/project.json
rename to samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/project.json