diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/.gitignore b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/.gitignore
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/.gitignore
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/.gitignore
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator-ignore b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator-ignore
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator-ignore
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator-ignore
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator/FILES b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator/FILES
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator/FILES
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator/FILES
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator/VERSION b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator/VERSION
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator/VERSION
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/.openapi-generator/VERSION
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/Org.OpenAPITools.sln b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/Org.OpenAPITools.sln
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/Org.OpenAPITools.sln
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/Org.OpenAPITools.sln
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/README.md b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/README.md
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/README.md
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/README.md
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/api/openapi.yaml b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/api/openapi.yaml
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/api/openapi.yaml
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/api/openapi.yaml
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/appveyor.yml b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/appveyor.yml
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/appveyor.yml
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/appveyor.yml
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/docs/Env.md b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/docs/Env.md
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/docs/Env.md
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/docs/Env.md
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/docs/FakeApi.md b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/docs/FakeApi.md
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/docs/FakeApi.md
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/docs/FakeApi.md
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/docs/PropertyNameMapping.md b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/docs/PropertyNameMapping.md
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/docs/PropertyNameMapping.md
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/docs/PropertyNameMapping.md
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/git_push.sh b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/git_push.sh
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/git_push.sh
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/git_push.sh
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Model/EnvTests.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Model/EnvTests.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Model/EnvTests.cs
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Model/EnvTests.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Model/PropertyNameMappingTests.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Model/PropertyNameMappingTests.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Model/PropertyNameMappingTests.cs
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Model/PropertyNameMappingTests.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Api/FakeApi.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Api/FakeApi.cs
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Api/FakeApi.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiClient.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiClient.cs
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiClient.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiException.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiException.cs
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiException.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiResponse.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiResponse.cs
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiResponse.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ClientUtils.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ClientUtils.cs
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ClientUtils.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/Configuration.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/Configuration.cs
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/Configuration.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ExceptionFactory.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ExceptionFactory.cs
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ExceptionFactory.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/GlobalConfiguration.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/GlobalConfiguration.cs
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/GlobalConfiguration.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/HttpMethod.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/HttpMethod.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/HttpMethod.cs
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/HttpMethod.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IApiAccessor.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IApiAccessor.cs
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IApiAccessor.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IAsynchronousClient.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IAsynchronousClient.cs
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IAsynchronousClient.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/IReadableConfiguration.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ISynchronousClient.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ISynchronousClient.cs
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ISynchronousClient.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/Multimap.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/Multimap.cs
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/Multimap.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/RequestOptions.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/RequestOptions.cs
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/RequestOptions.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/RetryConfiguration.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/Env.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/Env.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/Env.cs
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/Env.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/PropertyNameMapping.cs b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/PropertyNameMapping.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/PropertyNameMapping.cs
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Model/PropertyNameMapping.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Org.OpenAPITools.csproj
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Org.OpenAPITools.csproj
rename to samples/client/petstore/csharp/restsharp/net6/OpenAPIClient-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Org.OpenAPITools.csproj