diff --git a/.github/workflows/samples-dotnet-standard.yaml b/.github/workflows/samples-dotnet-standard.yaml index 08779d55e06..47c4124b0f3 100644 --- a/.github/workflows/samples-dotnet-standard.yaml +++ b/.github/workflows/samples-dotnet-standard.yaml @@ -3,10 +3,10 @@ name: Samples C# .Net Standard on: push: paths: - - 'samples/client/petstore/csharp-netcore/**netstandard**/' + - 'samples/client/petstore/csharp/**netstandard**/' pull_request: paths: - - 'samples/client/petstore/csharp-netcore/**netstandard**/' + - 'samples/client/petstore/csharp/**netstandard**/' jobs: build: name: Build .Net projects @@ -16,7 +16,7 @@ jobs: matrix: sample: # clients - - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0 + - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0 steps: - uses: actions/checkout@v3 - uses: actions/setup-dotnet@v3.2.0 diff --git a/.github/workflows/samples-dotnet.yaml b/.github/workflows/samples-dotnet.yaml index 1fcea40e152..ddae0329c66 100644 --- a/.github/workflows/samples-dotnet.yaml +++ b/.github/workflows/samples-dotnet.yaml @@ -3,16 +3,16 @@ name: Samples C# .Net 7 on: push: paths: - - 'samples/client/petstore/csharp-netcore/**net6.0**/' - - 'samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore**/' + - 'samples/client/petstore/csharp/**net6.0**/' + - 'samples/client/petstore/csharp/OpenAPIClient-generichost-netcore**/' - 'samples/server/petstore/aspnetcore-6.0/**' - 'samples/server/petstore/aspnetcore-6.0-pocoModels/**' - 'samples/server/petstore/aspnetcore-6.0-useSwashBuckle/**' - 'samples/server/petstore/aspnetcore-6.0-useNewtonsoft/**' pull_request: paths: - - 'samples/client/petstore/csharp-netcore/**net6.0**/' - - 'samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore**/' + - 'samples/client/petstore/csharp/**net6.0**/' + - 'samples/client/petstore/csharp/OpenAPIClient-generichost-netcore**/' - 'samples/server/petstore/aspnetcore-6.0/**' - 'samples/server/petstore/aspnetcore-6.0-pocoModels/**' - 'samples/server/petstore/aspnetcore-6.0-project4Models/**' @@ -28,11 +28,11 @@ jobs: matrix: sample: # clients - - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0 - - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt - - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf - - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf - - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf + - samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0 + - samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt + - samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf + - samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf + - samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf - samples/server/petstore/aspnetcore-6.0 - samples/server/petstore/aspnetcore-6.0-pocoModels - samples/server/petstore/aspnetcore-6.0-project4Models diff --git a/.github/workflows/samples-dotnet6-client.yaml b/.github/workflows/samples-dotnet6-client.yaml index 4004ae9f0e0..3c405875bcf 100644 --- a/.github/workflows/samples-dotnet6-client.yaml +++ b/.github/workflows/samples-dotnet6-client.yaml @@ -4,41 +4,41 @@ on: push: paths: # build C# API client (multiple frameworks) - - samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/** + - samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/** # build C# API client (httpclient) - - samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/** + - samples/client/petstore/csharp/OpenAPIClient-httpclient/** # build C# API client (generichost) - - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/** + - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/** # build C# API client (netcore) - - samples/client/petstore/csharp-netcore/OpenAPIClient/** - - samples/client/petstore/csharp-netcore/OpenAPIClientCore/** + - samples/client/petstore/csharp/OpenAPIClient/** + - samples/client/petstore/csharp/OpenAPIClientCore/** # build C# API client (.net framework 4.7) - - samples/client/petstore/csharp-netcore/OpenAPIClient-net47/** + - samples/client/petstore/csharp/OpenAPIClient-net47/** # build C# API client (.net framework 4.8) - - samples/client/petstore/csharp-netcore/OpenAPIClient-net48/** + - samples/client/petstore/csharp/OpenAPIClient-net48/** # build C# API client (.net 5.0) - - samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/** + - samples/client/petstore/csharp/OpenAPIClient-net5.0/** # build C# API client (.net 5.0 with ConditionalSerialization) - - samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/** + - samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/** pull_request: paths: # build C# API client (multiple frameworks) - - samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/** + - samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/** # build C# API client (httpclient) - - samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/** + - samples/client/petstore/csharp/OpenAPIClient-httpclient/** # build C# API client (generichost) - - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/** + - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/** # build C# API client (netcore) - - samples/client/petstore/csharp-netcore/OpenAPIClient/** - - samples/client/petstore/csharp-netcore/OpenAPIClientCore/** + - samples/client/petstore/csharp/OpenAPIClient/** + - samples/client/petstore/csharp/OpenAPIClientCore/** # build C# API client (.net framework 4.7) - - samples/client/petstore/csharp-netcore/OpenAPIClient-net47/** + - samples/client/petstore/csharp/OpenAPIClient-net47/** # build C# API client (.net framework 4.8) - - samples/client/petstore/csharp-netcore/OpenAPIClient-net48/** + - samples/client/petstore/csharp/OpenAPIClient-net48/** # build C# API client (.net 5.0) - - samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/** + - samples/client/petstore/csharp/OpenAPIClient-net5.0/** # build C# API client (.net 5.0 with ConditionalSerialization) - - samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/** + - samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/** jobs: build: name: Build .Net clients @@ -49,22 +49,22 @@ jobs: sample: # clients # build C# API client (multiple frameworks) - - samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/ + - samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/ # build C# API client (httpclient) - - samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/ + - samples/client/petstore/csharp/OpenAPIClient-httpclient/ # build C# API client (generichost) - - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/ + - samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/ # build C# API client (netcore) - - samples/client/petstore/csharp-netcore/OpenAPIClient/ - - samples/client/petstore/csharp-netcore/OpenAPIClientCore/ + - samples/client/petstore/csharp/OpenAPIClient/ + - samples/client/petstore/csharp/OpenAPIClientCore/ # build C# API client (.net framework 4.7) - - samples/client/petstore/csharp-netcore/OpenAPIClient-net47/ + - samples/client/petstore/csharp/OpenAPIClient-net47/ # build C# API client (.net framework 4.8) - - samples/client/petstore/csharp-netcore/OpenAPIClient-net48/ + - samples/client/petstore/csharp/OpenAPIClient-net48/ # build C# API client (.net 5.0) - - samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/ + - samples/client/petstore/csharp/OpenAPIClient-net5.0/ # build C# API client (.net 5.0 with ConditionalSerialization) - - samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/ + - samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/ steps: - uses: actions/checkout@v3 - uses: actions/setup-dotnet@v3.2.0 diff --git a/appveyor.yml b/appveyor.yml index f2fcac6c248..96804576fc0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,41 +25,41 @@ build_script: ## build C# aspnetcore 2.2 server #- dotnet build samples\server\petstore\aspnetcore\Org.OpenAPITools.sln ## build C# API client (multiple frameworks) - #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClientCoreAndNet47\Org.OpenAPITools.sln + #- dotnet build samples\client\petstore\csharp\OpenAPIClientCoreAndNet47\Org.OpenAPITools.sln ## build C# API client (httpclient) - #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-httpclient\Org.OpenAPITools.sln + #- dotnet build samples\client\petstore\csharp\OpenAPIClient-httpclient\Org.OpenAPITools.sln ## build C# API client (generichost) - #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-generichost-netstandard2.0\Org.OpenAPITools.sln + #- dotnet build samples\client\petstore\csharp\OpenAPIClient-generichost-netstandard2.0\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 + #- dotnet build samples\client\petstore\csharp\OpenAPIClient\Org.OpenAPITools.sln + #- dotnet build samples\client\petstore\csharp\OpenAPIClientCore\Org.OpenAPITools.sln ## build C# API client (.net framework 4.7) - #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-net47\Org.OpenAPITools.sln + #- dotnet build samples\client\petstore\csharp\OpenAPIClient-net47\Org.OpenAPITools.sln ## build C# API client (.net framework 4.8) - #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-net48\Org.OpenAPITools.sln + #- dotnet build samples\client\petstore\csharp\OpenAPIClient-net48\Org.OpenAPITools.sln ## build C# API client (.net 5.0) - #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-net5.0\Org.OpenAPITools.sln + #- dotnet build samples\client\petstore\csharp\OpenAPIClient-net5.0\Org.OpenAPITools.sln ## build C# API client (.net 5.0 with ConditionalSerialization) - #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-ConditionalSerialization\Org.OpenAPITools.sln + #- dotnet build samples\client\petstore\csharp\OpenAPIClient-ConditionalSerialization\Org.OpenAPITools.sln test_script: # test c# API client (multiple frameworks) - - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClientCoreAndNet47\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj + - dotnet test samples\client\petstore\csharp\OpenAPIClientCoreAndNet47\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj # test c# API client (httpclient) - - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-httpclient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj + - dotnet test samples\client\petstore\csharp\OpenAPIClient-httpclient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj # test c# API client (generichost) - - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-generichost-netstandard2.0\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj + - dotnet test samples\client\petstore\csharp\OpenAPIClient-generichost-netstandard2.0\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj # test c# API client (netcore) - - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClientCore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj - #- dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj + - dotnet test samples\client\petstore\csharp\OpenAPIClientCore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj + #- dotnet test samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj # test C# API client (.net framework 4.7) - - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-net47\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj + - dotnet test samples\client\petstore\csharp\OpenAPIClient-net47\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj # test C# API client (.net framework 4.8) - - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-net48\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj + - dotnet test samples\client\petstore\csharp\OpenAPIClient-net48\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj # test C# API client (.net 5.0) - - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-net5.0\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj + - dotnet test samples\client\petstore\csharp\OpenAPIClient-net5.0\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj # test C# API Client using conditional-serialization - - dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient-ConditionalSerialization\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj + - dotnet test samples\client\petstore\csharp\OpenAPIClient-ConditionalSerialization\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj ### TODO: Execute all generators via powershell or other # generate all petstore clients diff --git a/bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore-latest-allOf.yaml b/bin/configs/csharp-OpenAPIClient-generichost-netcore-latest-allOf.yaml similarity index 68% rename from bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore-latest-allOf.yaml rename to bin/configs/csharp-OpenAPIClient-generichost-netcore-latest-allOf.yaml index 7c2d2e4c4c2..564f8f86700 100644 --- a/bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore-latest-allOf.yaml +++ b/bin/configs/csharp-OpenAPIClient-generichost-netcore-latest-allOf.yaml @@ -1,9 +1,9 @@ -# for csharp-netcore generichost -generatorName: csharp-netcore -outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf +# for csharp generichost +generatorName: csharp +outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf inputSpec: modules/openapi-generator/src/test/resources/3_0/allOf.yaml library: generichost -templateDir: modules/openapi-generator/src/main/resources/csharp-netcore +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' useCompareNetObjects: true diff --git a/bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore-latest-anyOf.yaml b/bin/configs/csharp-OpenAPIClient-generichost-netcore-latest-anyOf.yaml similarity index 68% rename from bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore-latest-anyOf.yaml rename to bin/configs/csharp-OpenAPIClient-generichost-netcore-latest-anyOf.yaml index 98ec9899158..fa00ed7114d 100644 --- a/bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore-latest-anyOf.yaml +++ b/bin/configs/csharp-OpenAPIClient-generichost-netcore-latest-anyOf.yaml @@ -1,9 +1,9 @@ -# for csharp-netcore generichost -generatorName: csharp-netcore -outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf +# for csharp generichost +generatorName: csharp +outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf inputSpec: modules/openapi-generator/src/test/resources/3_0/anyOf.yaml library: generichost -templateDir: modules/openapi-generator/src/main/resources/csharp-netcore +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' useCompareNetObjects: true diff --git a/bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore-latest-oneOf.yaml b/bin/configs/csharp-OpenAPIClient-generichost-netcore-latest-oneOf.yaml similarity index 68% rename from bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore-latest-oneOf.yaml rename to bin/configs/csharp-OpenAPIClient-generichost-netcore-latest-oneOf.yaml index a670bb58121..9db84f38833 100644 --- a/bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore-latest-oneOf.yaml +++ b/bin/configs/csharp-OpenAPIClient-generichost-netcore-latest-oneOf.yaml @@ -1,9 +1,9 @@ -# for csharp-netcore generichost -generatorName: csharp-netcore -outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf +# for csharp generichost +generatorName: csharp +outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOf.yaml library: generichost -templateDir: modules/openapi-generator/src/main/resources/csharp-netcore +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' useCompareNetObjects: true diff --git a/bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore5.0-nrt.yaml b/bin/configs/csharp-OpenAPIClient-generichost-netcore5.0-nrt.yaml similarity index 73% rename from bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore5.0-nrt.yaml rename to bin/configs/csharp-OpenAPIClient-generichost-netcore5.0-nrt.yaml index ae882e57715..de02f745f74 100644 --- a/bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore5.0-nrt.yaml +++ b/bin/configs/csharp-OpenAPIClient-generichost-netcore5.0-nrt.yaml @@ -1,9 +1,9 @@ -# for csharp-netcore generichost -generatorName: csharp-netcore -outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt +# for csharp generichost +generatorName: csharp +outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml library: generichost -templateDir: modules/openapi-generator/src/main/resources/csharp-netcore +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' useCompareNetObjects: true diff --git a/bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore5.0.yaml b/bin/configs/csharp-OpenAPIClient-generichost-netcore5.0.yaml similarity index 73% rename from bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore5.0.yaml rename to bin/configs/csharp-OpenAPIClient-generichost-netcore5.0.yaml index 4e36214bc5e..b87d1bd6034 100644 --- a/bin/configs/csharp-netcore-OpenAPIClient-generichost-netcore5.0.yaml +++ b/bin/configs/csharp-OpenAPIClient-generichost-netcore5.0.yaml @@ -1,9 +1,9 @@ -# for csharp-netcore generichost -generatorName: csharp-netcore -outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0 +# for csharp generichost +generatorName: csharp +outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0 inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml library: generichost -templateDir: modules/openapi-generator/src/main/resources/csharp-netcore +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' useCompareNetObjects: true diff --git a/bin/configs/csharp-netcore-OpenAPIClient-generichost-netstandard2.0.yaml b/bin/configs/csharp-OpenAPIClient-generichost-netstandard2.0.yaml similarity index 71% rename from bin/configs/csharp-netcore-OpenAPIClient-generichost-netstandard2.0.yaml rename to bin/configs/csharp-OpenAPIClient-generichost-netstandard2.0.yaml index 597c9753d4f..fbe662deba0 100644 --- a/bin/configs/csharp-netcore-OpenAPIClient-generichost-netstandard2.0.yaml +++ b/bin/configs/csharp-OpenAPIClient-generichost-netstandard2.0.yaml @@ -1,9 +1,9 @@ -# for csharp-netcore generichost -generatorName: csharp-netcore -outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0 +# for csharp generichost +generatorName: csharp +outputDir: samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0 inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml library: generichost -templateDir: modules/openapi-generator/src/main/resources/csharp-netcore +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' useCompareNetObjects: true diff --git a/bin/configs/csharp-netcore-OpenAPIClient-httpclient.yaml b/bin/configs/csharp-OpenAPIClient-httpclient.yaml similarity index 80% rename from bin/configs/csharp-netcore-OpenAPIClient-httpclient.yaml rename to bin/configs/csharp-OpenAPIClient-httpclient.yaml index 1139faf069c..e431b385e39 100644 --- a/bin/configs/csharp-netcore-OpenAPIClient-httpclient.yaml +++ b/bin/configs/csharp-OpenAPIClient-httpclient.yaml @@ -1,8 +1,8 @@ # for .net standard httpclient -generatorName: csharp-netcore -outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient +generatorName: csharp +outputDir: samples/client/petstore/csharp/OpenAPIClient-httpclient inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml -templateDir: modules/openapi-generator/src/main/resources/csharp-netcore +templateDir: modules/openapi-generator/src/main/resources/csharp library: httpclient additionalProperties: packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' diff --git a/bin/configs/csharp-netcore-OpenAPIClient-net47.yaml b/bin/configs/csharp-OpenAPIClient-net47.yaml similarity index 81% rename from bin/configs/csharp-netcore-OpenAPIClient-net47.yaml rename to bin/configs/csharp-OpenAPIClient-net47.yaml index 9ca276977a9..91985cd8faa 100644 --- a/bin/configs/csharp-netcore-OpenAPIClient-net47.yaml +++ b/bin/configs/csharp-OpenAPIClient-net47.yaml @@ -1,8 +1,8 @@ # for .net standard -generatorName: csharp-netcore -outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-net47 +generatorName: csharp +outputDir: samples/client/petstore/csharp/OpenAPIClient-net47 inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml -templateDir: modules/openapi-generator/src/main/resources/csharp-netcore +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' useCompareNetObjects: true diff --git a/bin/configs/csharp-netcore-OpenAPIClient-net48.yaml b/bin/configs/csharp-OpenAPIClient-net48.yaml similarity index 80% rename from bin/configs/csharp-netcore-OpenAPIClient-net48.yaml rename to bin/configs/csharp-OpenAPIClient-net48.yaml index 11c2583671a..29c4ac2b8f8 100644 --- a/bin/configs/csharp-netcore-OpenAPIClient-net48.yaml +++ b/bin/configs/csharp-OpenAPIClient-net48.yaml @@ -1,8 +1,8 @@ # for .net standard -generatorName: csharp-netcore -outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-net48 +generatorName: csharp +outputDir: samples/client/petstore/csharp/OpenAPIClient-net48 inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml -templateDir: modules/openapi-generator/src/main/resources/csharp-netcore +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' useCompareNetObjects: true diff --git a/bin/configs/csharp-netcore-OpenAPIClient-net50.yaml b/bin/configs/csharp-OpenAPIClient-net50.yaml similarity index 80% rename from bin/configs/csharp-netcore-OpenAPIClient-net50.yaml rename to bin/configs/csharp-OpenAPIClient-net50.yaml index a4fec62e035..347ac99a2b3 100644 --- a/bin/configs/csharp-netcore-OpenAPIClient-net50.yaml +++ b/bin/configs/csharp-OpenAPIClient-net50.yaml @@ -1,8 +1,8 @@ # for .net standard -generatorName: csharp-netcore -outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0 +generatorName: csharp +outputDir: samples/client/petstore/csharp/OpenAPIClient-net5.0 inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml -templateDir: modules/openapi-generator/src/main/resources/csharp-netcore +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' useCompareNetObjects: true diff --git a/bin/configs/csharp-netcore-OpenAPIClient-unityWebRequest.yaml b/bin/configs/csharp-OpenAPIClient-unityWebRequest.yaml similarity index 67% rename from bin/configs/csharp-netcore-OpenAPIClient-unityWebRequest.yaml rename to bin/configs/csharp-OpenAPIClient-unityWebRequest.yaml index b65bdf593f9..98b120a2eb6 100644 --- a/bin/configs/csharp-netcore-OpenAPIClient-unityWebRequest.yaml +++ b/bin/configs/csharp-OpenAPIClient-unityWebRequest.yaml @@ -1,6 +1,6 @@ # for .net Unity -generatorName: csharp-netcore -outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest +generatorName: csharp +outputDir: samples/client/petstore/csharp/OpenAPIClient-unityWebRequest inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml -templateDir: modules/openapi-generator/src/main/resources/csharp-netcore +templateDir: modules/openapi-generator/src/main/resources/csharp library: unityWebRequest \ No newline at end of file diff --git a/bin/configs/csharp-netcore-OpenAPIClient.yaml b/bin/configs/csharp-OpenAPIClient.yaml similarity index 80% rename from bin/configs/csharp-netcore-OpenAPIClient.yaml rename to bin/configs/csharp-OpenAPIClient.yaml index 16bf7675519..89548df7e7f 100644 --- a/bin/configs/csharp-netcore-OpenAPIClient.yaml +++ b/bin/configs/csharp-OpenAPIClient.yaml @@ -1,8 +1,8 @@ # for .net standard -generatorName: csharp-netcore -outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient +generatorName: csharp +outputDir: samples/client/petstore/csharp/OpenAPIClient inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml -templateDir: modules/openapi-generator/src/main/resources/csharp-netcore +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' useCompareNetObjects: true diff --git a/bin/configs/csharp-netcore-OpenAPIClientCore.yaml b/bin/configs/csharp-OpenAPIClientCore.yaml similarity index 76% rename from bin/configs/csharp-netcore-OpenAPIClientCore.yaml rename to bin/configs/csharp-OpenAPIClientCore.yaml index 8a73e9b84ea..597c7c328c7 100644 --- a/bin/configs/csharp-netcore-OpenAPIClientCore.yaml +++ b/bin/configs/csharp-OpenAPIClientCore.yaml @@ -1,7 +1,7 @@ -generatorName: csharp-netcore -outputDir: samples/client/petstore/csharp-netcore/OpenAPIClientCore +generatorName: csharp +outputDir: samples/client/petstore/csharp/OpenAPIClientCore inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml -templateDir: modules/openapi-generator/src/main/resources/csharp-netcore +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' targetFramework: net7.0 diff --git a/bin/configs/csharp-netcore-OpenAPIClientCoreAndNet47.yaml b/bin/configs/csharp-OpenAPIClientCoreAndNet47.yaml similarity index 71% rename from bin/configs/csharp-netcore-OpenAPIClientCoreAndNet47.yaml rename to bin/configs/csharp-OpenAPIClientCoreAndNet47.yaml index 45750b9f03e..5176032c265 100644 --- a/bin/configs/csharp-netcore-OpenAPIClientCoreAndNet47.yaml +++ b/bin/configs/csharp-OpenAPIClientCoreAndNet47.yaml @@ -1,7 +1,7 @@ -generatorName: csharp-netcore -outputDir: samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47 +generatorName: csharp +outputDir: samples/client/petstore/csharp/OpenAPIClientCoreAndNet47 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml -templateDir: modules/openapi-generator/src/main/resources/csharp-netcore +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' targetFramework: netstandard2.1;net47 diff --git a/bin/configs/csharp-netcore-OpenAPIClient_ConditionalSerialization.yaml b/bin/configs/csharp-OpenAPIClient_ConditionalSerialization.yaml similarity index 79% rename from bin/configs/csharp-netcore-OpenAPIClient_ConditionalSerialization.yaml rename to bin/configs/csharp-OpenAPIClient_ConditionalSerialization.yaml index cc75d89db86..b92f3bac224 100644 --- a/bin/configs/csharp-netcore-OpenAPIClient_ConditionalSerialization.yaml +++ b/bin/configs/csharp-OpenAPIClient_ConditionalSerialization.yaml @@ -1,8 +1,8 @@ # for .net standard -generatorName: csharp-netcore -outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization +generatorName: csharp +outputDir: samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml -templateDir: modules/openapi-generator/src/main/resources/csharp-netcore +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: packageGuid: '{fa96c953-af24-457d-8a01-f2fd2a7547a9}' useCompareNetObjects: true diff --git a/bin/configs/csharp-netcore-complex-files.yaml b/bin/configs/csharp-complex-files.yaml similarity index 77% rename from bin/configs/csharp-netcore-complex-files.yaml rename to bin/configs/csharp-complex-files.yaml index b67cece1ad1..efd6022c6e8 100644 --- a/bin/configs/csharp-netcore-complex-files.yaml +++ b/bin/configs/csharp-complex-files.yaml @@ -1,7 +1,7 @@ -generatorName: csharp-netcore -outputDir: samples/client/others/csharp-netcore-complex-files +generatorName: csharp +outputDir: samples/client/others/csharp-complex-files inputSpec: modules/openapi-generator/src/test/resources/3_0/form-multipart-binary-array.yaml -templateDir: modules/openapi-generator/src/main/resources/csharp-netcore +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' targetFramework: netstandard2.0 diff --git a/bin/configs/csharp-netcore-functions.yaml b/bin/configs/csharp-functions.yaml similarity index 69% rename from bin/configs/csharp-netcore-functions.yaml rename to bin/configs/csharp-functions.yaml index 3ce5234a94d..c1107404aee 100644 --- a/bin/configs/csharp-netcore-functions.yaml +++ b/bin/configs/csharp-functions.yaml @@ -1,7 +1,7 @@ -generatorName: csharp-netcore-functions -outputDir: samples/client/petstore/csharp-netcore-functions +generatorName: csharp-functions +outputDir: samples/client/petstore/csharp-functions inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml -templateDir: modules/openapi-generator/src/main/resources/csharp-netcore-functions +templateDir: modules/openapi-generator/src/main/resources/csharp-functions additionalProperties: packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' userSecretsGuid: "76e9e993-9159-441c-9c5b-fe95e7f4f020" diff --git a/bin/utils/test_file_list.yaml b/bin/utils/test_file_list.yaml index 8e9ae2052e0..d2ed1a960c6 100644 --- a/bin/utils/test_file_list.yaml +++ b/bin/utils/test_file_list.yaml @@ -1,10 +1,10 @@ --- -# csharp-netcore test files and image for upload -- filename: "samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs" +# csharp test files and image for upload +- filename: "samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs" sha256: 054adb6efaff70f492e471cb3e4d628d22cda814906808fd3fcce36ce710b7ee -- filename: "samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs" +- filename: "samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs" sha256: 7dad88554fe630d25c787cae05305d302d5e34ca810aee4fa23f20055f9188e1 -- filename: "samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/linux-logo.png" +- filename: "samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/linux-logo.png" sha256: 0a67c32728197e942b13bdda064b73793f12f5c795f1e5cf35a3adf69c973230 # java okhttp gson test files - filename: "samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ClientTest.java" diff --git a/docs/generators.md b/docs/generators.md index 0d5fa40bbfc..7bc9790541d 100644 --- a/docs/generators.md +++ b/docs/generators.md @@ -18,7 +18,7 @@ The following generators are available: * [cpp-tizen](generators/cpp-tizen.md) * [cpp-ue4 (beta)](generators/cpp-ue4.md) * [crystal (beta)](generators/crystal.md) -* [csharp-netcore](generators/csharp-netcore.md) +* [csharp](generators/csharp.md) * [dart](generators/dart.md) * [dart-dio](generators/dart-dio.md) * [eiffel](generators/eiffel.md) @@ -82,7 +82,7 @@ The following generators are available: * [cpp-qt-qhttpengine-server](generators/cpp-qt-qhttpengine-server.md) * [cpp-restbed-server](generators/cpp-restbed-server.md) * [cpp-restbed-server-deprecated](generators/cpp-restbed-server-deprecated.md) -* [csharp-netcore-functions](generators/csharp-netcore-functions.md) +* [csharp-functions](generators/csharp-functions.md) * [erlang-server](generators/erlang-server.md) * [fsharp-functions (beta)](generators/fsharp-functions.md) * [fsharp-giraffe-server (beta)](generators/fsharp-giraffe-server.md) diff --git a/docs/generators/csharp-netcore-functions.md b/docs/generators/csharp-functions.md similarity index 98% rename from docs/generators/csharp-netcore-functions.md rename to docs/generators/csharp-functions.md index f37e59368fe..65570107e43 100644 --- a/docs/generators/csharp-netcore-functions.md +++ b/docs/generators/csharp-functions.md @@ -1,12 +1,12 @@ --- -title: Documentation for the csharp-netcore-functions Generator +title: Documentation for the csharp-functions Generator --- ## METADATA | Property | Value | Notes | | -------- | ----- | ----- | -| generator name | csharp-netcore-functions | pass this to the generate command after -g | +| generator name | csharp-functions | pass this to the generate command after -g | | generator stability | STABLE | | | generator type | SERVER | | | generator language | C# | | diff --git a/docs/generators/csharp-netcore.md b/docs/generators/csharp.md similarity index 98% rename from docs/generators/csharp-netcore.md rename to docs/generators/csharp.md index 32f1448d696..0ac1a2e601d 100644 --- a/docs/generators/csharp-netcore.md +++ b/docs/generators/csharp.md @@ -1,12 +1,12 @@ --- -title: Documentation for the csharp-netcore Generator +title: Documentation for the csharp Generator --- ## METADATA | Property | Value | Notes | | -------- | ----- | ----- | -| generator name | csharp-netcore | pass this to the generate command after -g | +| generator name | csharp | pass this to the generate command after -g | | generator stability | STABLE | | | generator type | CLIENT | | | generator language | C# | | diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java index fabf1760468..3561243a136 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java @@ -165,7 +165,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen { apiTemplateFiles.put("api.mustache", ".cs"); modelDocTemplateFiles.put("model_doc.mustache", ".md"); apiDocTemplateFiles.put("api_doc.mustache", ".md"); - embeddedTemplateDir = templateDir = "csharp-netcore"; + embeddedTemplateDir = templateDir = "csharp"; cliOptions.clear(); @@ -565,7 +565,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen { @Override public String getName() { - return "csharp-netcore"; + return "csharp"; } public String getNameUsingModelPropertyNaming(String name) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpFunctionsServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpFunctionsServerCodegen.java index 966dcad9a25..2358960348a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpFunctionsServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpFunctionsServerCodegen.java @@ -108,7 +108,7 @@ public class CSharpFunctionsServerCodegen extends AbstractCSharpCodegen { modelTemplateFiles.put("model.mustache", ".cs"); apiTemplateFiles.put("function.mustache", ".cs"); - embeddedTemplateDir = templateDir = "csharp-netcore-functions"; + embeddedTemplateDir = templateDir = "csharp-functions"; // contextually reserved words // NOTE: C# uses camel cased reserved words, while models are title cased. We don't want lowercase comparisons. @@ -302,7 +302,7 @@ public class CSharpFunctionsServerCodegen extends AbstractCSharpCodegen { @Override public String getName() { - return "csharp-netcore-functions"; + return "csharp-functions"; } @Override diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/AbstractOpenAPISchema.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/AbstractOpenAPISchema.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/AbstractOpenAPISchema.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/AbstractOpenAPISchema.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/ApiClient.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/ApiClient.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/ApiClient.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/ApiClient.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/ApiException.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/ApiException.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/ApiException.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/ApiException.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/ApiResponse.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/ApiResponse.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/ApiResponse.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/ApiResponse.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/AssemblyInfo.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/AssemblyInfo.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/AssemblyInfo.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/AssemblyInfo.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/ClientUtils.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/ClientUtils.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/ClientUtils.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/ClientUtils.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/Configuration.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/Configuration.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/Configuration.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/Configuration.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/ExceptionFactory.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/ExceptionFactory.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/ExceptionFactory.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/ExceptionFactory.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/GlobalConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/GlobalConfiguration.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/GlobalConfiguration.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/GlobalConfiguration.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/HttpMethod.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/HttpMethod.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/HttpMethod.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/HttpMethod.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/HttpSigningConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/HttpSigningConfiguration.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/HttpSigningConfiguration.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/HttpSigningConfiguration.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/IApiAccessor.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/IApiAccessor.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/IApiAccessor.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/IApiAccessor.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/IAsynchronousClient.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/IAsynchronousClient.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/IAsynchronousClient.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/IAsynchronousClient.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/IReadableConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/IReadableConfiguration.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/IReadableConfiguration.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/IReadableConfiguration.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/ISynchronousClient.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/ISynchronousClient.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/ISynchronousClient.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/ISynchronousClient.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/JsonSubTypesTests.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/JsonSubTypesTests.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/JsonSubTypesTests.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/JsonSubTypesTests.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/Multimap.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/Multimap.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/Multimap.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/Multimap.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/OpenAPIDateConverter.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/OpenAPIDateConverter.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/OpenAPIDateConverter.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/OpenAPIDateConverter.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/OpenApi/TypeExtensions.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/OpenApi/TypeExtensions.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/OpenApi/TypeExtensions.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/OpenApi/TypeExtensions.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/Project.csproj.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/Project.csproj.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/Project.csproj.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/Project.csproj.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/Project.csproj.mustache.bak b/modules/openapi-generator/src/main/resources/csharp-functions/Project.csproj.mustache.bak similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/Project.csproj.mustache.bak rename to modules/openapi-generator/src/main/resources/csharp-functions/Project.csproj.mustache.bak diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/Project.nuspec.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/Project.nuspec.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/Project.nuspec.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/Project.nuspec.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/README.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/README.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/README.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/README.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/ReadOnlyDictionary.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/ReadOnlyDictionary.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/ReadOnlyDictionary.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/ReadOnlyDictionary.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/RequestOptions.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/RequestOptions.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/RequestOptions.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/RequestOptions.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/RetryConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/RetryConfiguration.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/RetryConfiguration.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/RetryConfiguration.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/Solution.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/Solution.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/Solution.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/Solution.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/TestProject.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/TestProject.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/TestProject.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/TestProject.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/WebRequestPathBuilder.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/WebRequestPathBuilder.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/WebRequestPathBuilder.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/WebRequestPathBuilder.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/api.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/api.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/api.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/api.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/api_doc.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/api_doc.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/api_doc.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/api_doc.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/api_test.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/api_test.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/api_test.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/api_test.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/appsettings.Development.json b/modules/openapi-generator/src/main/resources/csharp-functions/appsettings.Development.json similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/appsettings.Development.json rename to modules/openapi-generator/src/main/resources/csharp-functions/appsettings.Development.json diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/appsettings.json b/modules/openapi-generator/src/main/resources/csharp-functions/appsettings.json similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/appsettings.json rename to modules/openapi-generator/src/main/resources/csharp-functions/appsettings.json diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/appveyor.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/appveyor.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/appveyor.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/appveyor.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/bodyParam.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/bodyParam.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/bodyParam.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/bodyParam.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/build.bat.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/build.bat.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/build.bat.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/build.bat.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/build.sh.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/build.sh.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/build.sh.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/build.sh.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/controller.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/controller.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/controller.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/controller.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/enumClass.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/enumClass.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/enumClass.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/enumClass.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/formParam.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/formParam.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/formParam.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/formParam.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/function.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/function.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/function.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/function.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/function.mustache.bak b/modules/openapi-generator/src/main/resources/csharp-functions/function.mustache.bak similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/function.mustache.bak rename to modules/openapi-generator/src/main/resources/csharp-functions/function.mustache.bak diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/functions.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/functions.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/functions.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/functions.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/git_push.sh.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/git_push.sh.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/git_push.sh.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/git_push.sh.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/gitignore b/modules/openapi-generator/src/main/resources/csharp-functions/gitignore similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/gitignore rename to modules/openapi-generator/src/main/resources/csharp-functions/gitignore diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/gitignore.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/gitignore.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/gitignore.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/gitignore.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/headerParam.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/headerParam.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/headerParam.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/headerParam.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/host.json.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/host.json.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/host.json.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/host.json.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/libraries/httpclient/ApiClient.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/libraries/httpclient/ApiClient.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/libraries/httpclient/ApiClient.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/libraries/httpclient/ApiClient.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/libraries/httpclient/FileParameter.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/libraries/httpclient/FileParameter.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/libraries/httpclient/FileParameter.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/libraries/httpclient/FileParameter.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/libraries/httpclient/RequestOptions.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/libraries/httpclient/RequestOptions.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/libraries/httpclient/RequestOptions.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/libraries/httpclient/RequestOptions.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/libraries/httpclient/api.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/libraries/httpclient/api.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/libraries/httpclient/api.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/libraries/httpclient/api.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/libraries/httpclient/model.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/libraries/httpclient/model.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/libraries/httpclient/model.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/libraries/httpclient/model.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/listReturn.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/listReturn.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/listReturn.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/listReturn.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/local.settings.json.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/local.settings.json.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/local.settings.json.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/local.settings.json.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/mapReturn.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/mapReturn.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/mapReturn.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/mapReturn.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/model.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/model.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/model.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/model.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/modelAnyOf.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/modelAnyOf.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/modelAnyOf.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/modelAnyOf.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/modelEnum.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/modelEnum.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/modelEnum.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/modelEnum.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/modelGeneric.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/modelGeneric.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/modelGeneric.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/modelInnerEnum.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/modelInnerEnum.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/modelInnerEnum.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/modelInnerEnum.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/modelOneOf.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/modelOneOf.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/modelOneOf.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/modelOneOf.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/model_doc.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/model_doc.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/model_doc.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/model_doc.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/model_test.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/model_test.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/model_test.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/model_test.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/netcore_project.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/netcore_project.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/netcore_project.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/netcore_project.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/netcore_testproject.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/netcore_testproject.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/netcore_testproject.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/netcore_testproject.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/nuspec.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/nuspec.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/nuspec.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/nuspec.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/objectReturn.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/objectReturn.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/objectReturn.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/objectReturn.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/paramName.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/paramName.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/paramName.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/paramName.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/partial_header.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/partial_header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/partial_header.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/partial_header.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/pathParam.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/pathParam.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/pathParam.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/pathParam.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/project.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/project.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/project.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/project.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/queryParam.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/queryParam.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/queryParam.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/queryParam.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/tags.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/tags.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/tags.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/tags.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/typeConverter.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/typeConverter.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/typeConverter.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/typeConverter.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore-functions/visibility.mustache b/modules/openapi-generator/src/main/resources/csharp-functions/visibility.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore-functions/visibility.mustache rename to modules/openapi-generator/src/main/resources/csharp-functions/visibility.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/AbstractOpenAPISchema.mustache b/modules/openapi-generator/src/main/resources/csharp/AbstractOpenAPISchema.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/AbstractOpenAPISchema.mustache rename to modules/openapi-generator/src/main/resources/csharp/AbstractOpenAPISchema.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache b/modules/openapi-generator/src/main/resources/csharp/ApiClient.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache rename to modules/openapi-generator/src/main/resources/csharp/ApiClient.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/ApiException.mustache b/modules/openapi-generator/src/main/resources/csharp/ApiException.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/ApiException.mustache rename to modules/openapi-generator/src/main/resources/csharp/ApiException.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/ApiResponse.mustache b/modules/openapi-generator/src/main/resources/csharp/ApiResponse.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/ApiResponse.mustache rename to modules/openapi-generator/src/main/resources/csharp/ApiResponse.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/AssemblyInfo.mustache b/modules/openapi-generator/src/main/resources/csharp/AssemblyInfo.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/AssemblyInfo.mustache rename to modules/openapi-generator/src/main/resources/csharp/AssemblyInfo.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/ClientUtils.mustache b/modules/openapi-generator/src/main/resources/csharp/ClientUtils.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/ClientUtils.mustache rename to modules/openapi-generator/src/main/resources/csharp/ClientUtils.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/Configuration.mustache b/modules/openapi-generator/src/main/resources/csharp/Configuration.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/Configuration.mustache rename to modules/openapi-generator/src/main/resources/csharp/Configuration.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/ExceptionFactory.mustache b/modules/openapi-generator/src/main/resources/csharp/ExceptionFactory.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/ExceptionFactory.mustache rename to modules/openapi-generator/src/main/resources/csharp/ExceptionFactory.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/GlobalConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp/GlobalConfiguration.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/GlobalConfiguration.mustache rename to modules/openapi-generator/src/main/resources/csharp/GlobalConfiguration.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/HttpMethod.mustache b/modules/openapi-generator/src/main/resources/csharp/HttpMethod.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/HttpMethod.mustache rename to modules/openapi-generator/src/main/resources/csharp/HttpMethod.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/HttpSigningConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp/HttpSigningConfiguration.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/HttpSigningConfiguration.mustache rename to modules/openapi-generator/src/main/resources/csharp/HttpSigningConfiguration.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/IApiAccessor.mustache b/modules/openapi-generator/src/main/resources/csharp/IApiAccessor.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/IApiAccessor.mustache rename to modules/openapi-generator/src/main/resources/csharp/IApiAccessor.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/IAsynchronousClient.mustache b/modules/openapi-generator/src/main/resources/csharp/IAsynchronousClient.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/IAsynchronousClient.mustache rename to modules/openapi-generator/src/main/resources/csharp/IAsynchronousClient.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/IReadableConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp/IReadableConfiguration.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/IReadableConfiguration.mustache rename to modules/openapi-generator/src/main/resources/csharp/IReadableConfiguration.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/ISynchronousClient.mustache b/modules/openapi-generator/src/main/resources/csharp/ISynchronousClient.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/ISynchronousClient.mustache rename to modules/openapi-generator/src/main/resources/csharp/ISynchronousClient.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/JsonSubTypesTests.mustache b/modules/openapi-generator/src/main/resources/csharp/JsonSubTypesTests.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/JsonSubTypesTests.mustache rename to modules/openapi-generator/src/main/resources/csharp/JsonSubTypesTests.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/Multimap.mustache b/modules/openapi-generator/src/main/resources/csharp/Multimap.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/Multimap.mustache rename to modules/openapi-generator/src/main/resources/csharp/Multimap.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/OpenAPIDateConverter.mustache b/modules/openapi-generator/src/main/resources/csharp/OpenAPIDateConverter.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/OpenAPIDateConverter.mustache rename to modules/openapi-generator/src/main/resources/csharp/OpenAPIDateConverter.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/README.mustache b/modules/openapi-generator/src/main/resources/csharp/README.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/README.mustache rename to modules/openapi-generator/src/main/resources/csharp/README.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/ReadOnlyDictionary.mustache b/modules/openapi-generator/src/main/resources/csharp/ReadOnlyDictionary.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/ReadOnlyDictionary.mustache rename to modules/openapi-generator/src/main/resources/csharp/ReadOnlyDictionary.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/RequestOptions.mustache b/modules/openapi-generator/src/main/resources/csharp/RequestOptions.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/RequestOptions.mustache rename to modules/openapi-generator/src/main/resources/csharp/RequestOptions.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/RetryConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp/RetryConfiguration.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/RetryConfiguration.mustache rename to modules/openapi-generator/src/main/resources/csharp/RetryConfiguration.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/Solution.mustache b/modules/openapi-generator/src/main/resources/csharp/Solution.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/Solution.mustache rename to modules/openapi-generator/src/main/resources/csharp/Solution.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/TestProject.mustache b/modules/openapi-generator/src/main/resources/csharp/TestProject.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/TestProject.mustache rename to modules/openapi-generator/src/main/resources/csharp/TestProject.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/WebRequestPathBuilder.mustache b/modules/openapi-generator/src/main/resources/csharp/WebRequestPathBuilder.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/WebRequestPathBuilder.mustache rename to modules/openapi-generator/src/main/resources/csharp/WebRequestPathBuilder.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/api.mustache b/modules/openapi-generator/src/main/resources/csharp/api.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/api.mustache rename to modules/openapi-generator/src/main/resources/csharp/api.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/api_doc.mustache b/modules/openapi-generator/src/main/resources/csharp/api_doc.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/api_doc.mustache rename to modules/openapi-generator/src/main/resources/csharp/api_doc.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/api_test.mustache b/modules/openapi-generator/src/main/resources/csharp/api_test.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/api_test.mustache rename to modules/openapi-generator/src/main/resources/csharp/api_test.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/appveyor.mustache b/modules/openapi-generator/src/main/resources/csharp/appveyor.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/appveyor.mustache rename to modules/openapi-generator/src/main/resources/csharp/appveyor.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/auth/OAuthAuthenticator.mustache b/modules/openapi-generator/src/main/resources/csharp/auth/OAuthAuthenticator.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/auth/OAuthAuthenticator.mustache rename to modules/openapi-generator/src/main/resources/csharp/auth/OAuthAuthenticator.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/auth/OAuthFlow.mustache b/modules/openapi-generator/src/main/resources/csharp/auth/OAuthFlow.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/auth/OAuthFlow.mustache rename to modules/openapi-generator/src/main/resources/csharp/auth/OAuthFlow.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/auth/TokenResponse.mustache b/modules/openapi-generator/src/main/resources/csharp/auth/TokenResponse.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/auth/TokenResponse.mustache rename to modules/openapi-generator/src/main/resources/csharp/auth/TokenResponse.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/git_push.sh.mustache b/modules/openapi-generator/src/main/resources/csharp/git_push.sh.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/git_push.sh.mustache rename to modules/openapi-generator/src/main/resources/csharp/git_push.sh.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/gitignore.mustache b/modules/openapi-generator/src/main/resources/csharp/gitignore.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/gitignore.mustache rename to modules/openapi-generator/src/main/resources/csharp/gitignore.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/AfterOperationDefaultImplementation.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/AfterOperationDefaultImplementation.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/AfterOperationDefaultImplementation.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/AfterOperationDefaultImplementation.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ApiException.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiException.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ApiException.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiException.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ApiFactory.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiFactory.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ApiFactory.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiFactory.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ApiKeyToken.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiKeyToken.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ApiKeyToken.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiKeyToken.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ApiResponseEventArgs.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiResponseEventArgs.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ApiResponseEventArgs.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiResponseEventArgs.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ApiResponse`1.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiResponse`1.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ApiResponse`1.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiResponse`1.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ApiTestsBase.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiTestsBase.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ApiTestsBase.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiTestsBase.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/AsModel.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/AsModel.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/AsModel.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/AsModel.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/BasicToken.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/BasicToken.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/BasicToken.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/BasicToken.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/BearerToken.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/BearerToken.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/BearerToken.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/BearerToken.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ClientUtils.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ClientUtils.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ClientUtils.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ClientUtils.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/CookieContainer.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/CookieContainer.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/CookieContainer.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/CookieContainer.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/DateTimeFormats.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateTimeFormats.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/DateTimeFormats.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateTimeFormats.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/DateTimeJsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateTimeJsonConverter.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/DateTimeJsonConverter.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateTimeJsonConverter.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/DateTimeNullableJsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateTimeNullableJsonConverter.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/DateTimeNullableJsonConverter.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DateTimeNullableJsonConverter.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/DependencyInjectionTests.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DependencyInjectionTests.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/DependencyInjectionTests.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DependencyInjectionTests.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/EnumValueDataType.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/EnumValueDataType.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/EnumValueDataType.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/EnumValueDataType.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/HostConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HostConfiguration.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/HostConfiguration.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HostConfiguration.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/HttpSigningConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HttpSigningConfiguration.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/HttpSigningConfiguration.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HttpSigningConfiguration.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/HttpSigningToken.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HttpSigningToken.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/HttpSigningToken.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HttpSigningToken.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/IApi.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/IApi.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/IApi.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/IApi.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/IHostBuilderExtensions.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/IHostBuilderExtensions.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/IHostBuilderExtensions.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/IHostBuilderExtensions.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/IHttpClientBuilderExtensions.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/IHttpClientBuilderExtensions.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/IHttpClientBuilderExtensions.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/IHttpClientBuilderExtensions.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/IServiceCollectionExtensions.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/IServiceCollectionExtensions.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/IServiceCollectionExtensions.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/IServiceCollectionExtensions.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ImplementsIEquatable.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ImplementsIEquatable.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ImplementsIEquatable.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ImplementsIEquatable.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ImplementsValidatable.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ImplementsValidatable.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ImplementsValidatable.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ImplementsValidatable.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonConverter.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonSerializerOptionsProvider.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonSerializerOptionsProvider.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/JsonSerializerOptionsProvider.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonSerializerOptionsProvider.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ModelBaseSignature.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ModelBaseSignature.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ModelBaseSignature.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ModelBaseSignature.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ModelSignature.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ModelSignature.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ModelSignature.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ModelSignature.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/OAuthToken.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/OAuthToken.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/OAuthToken.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/OAuthToken.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/OnErrorDefaultImplementation.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/OnErrorDefaultImplementation.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/OnErrorDefaultImplementation.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/OnErrorDefaultImplementation.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/OperationSignature.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/OperationSignature.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/OperationSignature.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/OperationSignature.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/PropertyDataType.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/PropertyDataType.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/PropertyDataType.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/PropertyDataType.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/README.client.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/README.client.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/README.client.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/README.client.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/README.solution.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/README.solution.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/README.solution.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/README.solution.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/README.test.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/README.test.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/README.test.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/README.test.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/RateLimitProvider`1.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/RateLimitProvider`1.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/RateLimitProvider`1.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/RateLimitProvider`1.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/TokenBase.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/TokenBase.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/TokenBase.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/TokenBase.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/TokenContainer`1.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/TokenContainer`1.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/TokenContainer`1.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/TokenContainer`1.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/TokenProvider`1.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/TokenProvider`1.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/TokenProvider`1.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/TokenProvider`1.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/api.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/api.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/api_test.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api_test.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/api_test.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api_test.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/git_push.ps1.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/git_push.ps1.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/git_push.ps1.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/git_push.ps1.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/git_push.sh.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/git_push.sh.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/git_push.sh.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/git_push.sh.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/model.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/model.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/model.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/model.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/modelGeneric.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/modelGeneric.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/modelGeneric.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/testInstructions.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/testInstructions.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/testInstructions.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/generichost/testInstructions.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/ApiClient.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/httpclient/ApiClient.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/ApiClient.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/httpclient/ApiClient.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/FileParameter.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/httpclient/FileParameter.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/FileParameter.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/httpclient/FileParameter.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/RequestOptions.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/httpclient/RequestOptions.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/RequestOptions.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/httpclient/RequestOptions.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/api.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/httpclient/api.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/api.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/httpclient/api.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/model.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/httpclient/model.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/model.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/httpclient/model.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/ApiClient.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/unityWebRequest/ApiClient.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/ApiClient.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/unityWebRequest/ApiClient.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/ConnectionException.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/unityWebRequest/ConnectionException.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/ConnectionException.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/unityWebRequest/ConnectionException.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/README.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/unityWebRequest/README.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/README.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/unityWebRequest/README.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/RequestOptions.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/unityWebRequest/RequestOptions.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/RequestOptions.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/unityWebRequest/RequestOptions.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/UnexpectedResponseException.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/unityWebRequest/UnexpectedResponseException.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/UnexpectedResponseException.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/unityWebRequest/UnexpectedResponseException.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/api.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/unityWebRequest/api.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/api.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/unityWebRequest/api.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/api_test.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/unityWebRequest/api_test.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/api_test.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/unityWebRequest/api_test.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/asmdef.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/unityWebRequest/asmdef.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/asmdef.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/unityWebRequest/asmdef.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/asmdef_test.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/unityWebRequest/asmdef_test.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/asmdef_test.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/unityWebRequest/asmdef_test.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/model.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/unityWebRequest/model.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/model.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/unityWebRequest/model.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/model_test.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/unityWebRequest/model_test.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/libraries/unityWebRequest/model_test.mustache rename to modules/openapi-generator/src/main/resources/csharp/libraries/unityWebRequest/model_test.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/model.mustache b/modules/openapi-generator/src/main/resources/csharp/model.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/model.mustache rename to modules/openapi-generator/src/main/resources/csharp/model.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/modelAnyOf.mustache b/modules/openapi-generator/src/main/resources/csharp/modelAnyOf.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/modelAnyOf.mustache rename to modules/openapi-generator/src/main/resources/csharp/modelAnyOf.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/modelEnum.mustache b/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/modelEnum.mustache rename to modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache rename to modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/modelInnerEnum.mustache b/modules/openapi-generator/src/main/resources/csharp/modelInnerEnum.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/modelInnerEnum.mustache rename to modules/openapi-generator/src/main/resources/csharp/modelInnerEnum.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/modelOneOf.mustache b/modules/openapi-generator/src/main/resources/csharp/modelOneOf.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/modelOneOf.mustache rename to modules/openapi-generator/src/main/resources/csharp/modelOneOf.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/model_doc.mustache b/modules/openapi-generator/src/main/resources/csharp/model_doc.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/model_doc.mustache rename to modules/openapi-generator/src/main/resources/csharp/model_doc.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/model_test.mustache b/modules/openapi-generator/src/main/resources/csharp/model_test.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/model_test.mustache rename to modules/openapi-generator/src/main/resources/csharp/model_test.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/netcore_project.additions.mustache b/modules/openapi-generator/src/main/resources/csharp/netcore_project.additions.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/netcore_project.additions.mustache rename to modules/openapi-generator/src/main/resources/csharp/netcore_project.additions.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/netcore_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-netcore/netcore_project.mustache rename to modules/openapi-generator/src/main/resources/csharp/netcore_project.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/netcore_testproject.additions.mustache b/modules/openapi-generator/src/main/resources/csharp/netcore_testproject.additions.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/netcore_testproject.additions.mustache rename to modules/openapi-generator/src/main/resources/csharp/netcore_testproject.additions.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/netcore_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-netcore/netcore_testproject.mustache rename to modules/openapi-generator/src/main/resources/csharp/netcore_testproject.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/nuspec.mustache b/modules/openapi-generator/src/main/resources/csharp/nuspec.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/nuspec.mustache rename to modules/openapi-generator/src/main/resources/csharp/nuspec.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/openapi.mustache b/modules/openapi-generator/src/main/resources/csharp/openapi.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/openapi.mustache rename to modules/openapi-generator/src/main/resources/csharp/openapi.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/partial_header.mustache b/modules/openapi-generator/src/main/resources/csharp/partial_header.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/partial_header.mustache rename to modules/openapi-generator/src/main/resources/csharp/partial_header.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/validatable.mustache b/modules/openapi-generator/src/main/resources/csharp/validatable.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/validatable.mustache rename to modules/openapi-generator/src/main/resources/csharp/validatable.mustache diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/visibility.mustache b/modules/openapi-generator/src/main/resources/csharp/visibility.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/csharp-netcore/visibility.mustache rename to modules/openapi-generator/src/main/resources/csharp/visibility.mustache diff --git a/samples/client/others/csharp-netcore-complex-files/.gitignore b/samples/client/others/csharp-complex-files/.gitignore similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/.gitignore rename to samples/client/others/csharp-complex-files/.gitignore diff --git a/samples/client/others/csharp-netcore-complex-files/.openapi-generator-ignore b/samples/client/others/csharp-complex-files/.openapi-generator-ignore similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/.openapi-generator-ignore rename to samples/client/others/csharp-complex-files/.openapi-generator-ignore diff --git a/samples/client/others/csharp-netcore-complex-files/.openapi-generator/FILES b/samples/client/others/csharp-complex-files/.openapi-generator/FILES similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/.openapi-generator/FILES rename to samples/client/others/csharp-complex-files/.openapi-generator/FILES diff --git a/samples/client/others/csharp-netcore-complex-files/.openapi-generator/VERSION b/samples/client/others/csharp-complex-files/.openapi-generator/VERSION similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/.openapi-generator/VERSION rename to samples/client/others/csharp-complex-files/.openapi-generator/VERSION diff --git a/samples/client/others/csharp-netcore-complex-files/Org.OpenAPITools.sln b/samples/client/others/csharp-complex-files/Org.OpenAPITools.sln similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/Org.OpenAPITools.sln rename to samples/client/others/csharp-complex-files/Org.OpenAPITools.sln diff --git a/samples/client/others/csharp-netcore-complex-files/README.md b/samples/client/others/csharp-complex-files/README.md similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/README.md rename to samples/client/others/csharp-complex-files/README.md diff --git a/samples/client/others/csharp-netcore-complex-files/api/openapi.yaml b/samples/client/others/csharp-complex-files/api/openapi.yaml similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/api/openapi.yaml rename to samples/client/others/csharp-complex-files/api/openapi.yaml diff --git a/samples/client/others/csharp-netcore-complex-files/appveyor.yml b/samples/client/others/csharp-complex-files/appveyor.yml similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/appveyor.yml rename to samples/client/others/csharp-complex-files/appveyor.yml diff --git a/samples/client/others/csharp-netcore-complex-files/docs/MultipartApi.md b/samples/client/others/csharp-complex-files/docs/MultipartApi.md similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/docs/MultipartApi.md rename to samples/client/others/csharp-complex-files/docs/MultipartApi.md diff --git a/samples/client/others/csharp-netcore-complex-files/docs/MultipartArrayRequest.md b/samples/client/others/csharp-complex-files/docs/MultipartArrayRequest.md similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/docs/MultipartArrayRequest.md rename to samples/client/others/csharp-complex-files/docs/MultipartArrayRequest.md diff --git a/samples/client/others/csharp-netcore-complex-files/docs/MultipartMixedRequest.md b/samples/client/others/csharp-complex-files/docs/MultipartMixedRequest.md similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/docs/MultipartMixedRequest.md rename to samples/client/others/csharp-complex-files/docs/MultipartMixedRequest.md diff --git a/samples/client/others/csharp-netcore-complex-files/docs/MultipartMixedRequestMarker.md b/samples/client/others/csharp-complex-files/docs/MultipartMixedRequestMarker.md similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/docs/MultipartMixedRequestMarker.md rename to samples/client/others/csharp-complex-files/docs/MultipartMixedRequestMarker.md diff --git a/samples/client/others/csharp-netcore-complex-files/docs/MultipartMixedStatus.md b/samples/client/others/csharp-complex-files/docs/MultipartMixedStatus.md similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/docs/MultipartMixedStatus.md rename to samples/client/others/csharp-complex-files/docs/MultipartMixedStatus.md diff --git a/samples/client/others/csharp-netcore-complex-files/docs/MultipartSingleRequest.md b/samples/client/others/csharp-complex-files/docs/MultipartSingleRequest.md similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/docs/MultipartSingleRequest.md rename to samples/client/others/csharp-complex-files/docs/MultipartSingleRequest.md diff --git a/samples/client/others/csharp-netcore-complex-files/git_push.sh b/samples/client/others/csharp-complex-files/git_push.sh similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/git_push.sh rename to samples/client/others/csharp-complex-files/git_push.sh diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Api/MultipartApiTests.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools.Test/Api/MultipartApiTests.cs similarity index 94% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Api/MultipartApiTests.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools.Test/Api/MultipartApiTests.cs index 49d6b7ec392..7e672f7bd03 100644 --- a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Api/MultipartApiTests.cs +++ b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools.Test/Api/MultipartApiTests.cs @@ -75,7 +75,8 @@ namespace Org.OpenAPITools.Test.Api //MultipartMixedStatus status = null; //System.IO.Stream file = null; //MultipartMixedRequestMarker marker = null; - //instance.MultipartMixed(status, file, marker); + //List statusArray = null; + //instance.MultipartMixed(status, file, marker, statusArray); } /// diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Model/MultipartArrayRequestTests.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools.Test/Model/MultipartArrayRequestTests.cs similarity index 98% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Model/MultipartArrayRequestTests.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools.Test/Model/MultipartArrayRequestTests.cs index 177c1b07640..2d9f9aa4d2a 100644 --- a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Model/MultipartArrayRequestTests.cs +++ b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools.Test/Model/MultipartArrayRequestTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; @@ -55,7 +54,6 @@ namespace Org.OpenAPITools.Test.Model //Assert.IsType(instance); } - /// /// Test the property 'Files' /// @@ -64,7 +62,5 @@ namespace Org.OpenAPITools.Test.Model { // TODO unit test for the property 'Files' } - } - } diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Model/MultipartMixedRequestMarkerTests.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools.Test/Model/MultipartMixedRequestMarkerTests.cs similarity index 98% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Model/MultipartMixedRequestMarkerTests.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools.Test/Model/MultipartMixedRequestMarkerTests.cs index 7657e49a97b..0e61e3cdc7b 100644 --- a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Model/MultipartMixedRequestMarkerTests.cs +++ b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools.Test/Model/MultipartMixedRequestMarkerTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; @@ -55,7 +54,6 @@ namespace Org.OpenAPITools.Test.Model //Assert.IsType(instance); } - /// /// Test the property 'Name' /// @@ -64,7 +62,5 @@ namespace Org.OpenAPITools.Test.Model { // TODO unit test for the property 'Name' } - } - } diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Model/MultipartMixedRequestTests.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools.Test/Model/MultipartMixedRequestTests.cs similarity index 91% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Model/MultipartMixedRequestTests.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools.Test/Model/MultipartMixedRequestTests.cs index 99c381d0dfd..7b2bd136ed0 100644 --- a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Model/MultipartMixedRequestTests.cs +++ b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools.Test/Model/MultipartMixedRequestTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; @@ -55,7 +54,6 @@ namespace Org.OpenAPITools.Test.Model //Assert.IsType(instance); } - /// /// Test the property 'Status' /// @@ -64,6 +62,7 @@ namespace Org.OpenAPITools.Test.Model { // TODO unit test for the property 'Status' } + /// /// Test the property 'Marker' /// @@ -72,6 +71,7 @@ namespace Org.OpenAPITools.Test.Model { // TODO unit test for the property 'Marker' } + /// /// Test the property 'File' /// @@ -81,6 +81,13 @@ namespace Org.OpenAPITools.Test.Model // TODO unit test for the property 'File' } + /// + /// Test the property 'StatusArray' + /// + [Fact] + public void StatusArrayTest() + { + // TODO unit test for the property 'StatusArray' + } } - } diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Model/MultipartMixedStatusTests.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools.Test/Model/MultipartMixedStatusTests.cs similarity index 98% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Model/MultipartMixedStatusTests.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools.Test/Model/MultipartMixedStatusTests.cs index b3950715f40..4b99a2eb2d1 100644 --- a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Model/MultipartMixedStatusTests.cs +++ b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools.Test/Model/MultipartMixedStatusTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; @@ -54,9 +53,5 @@ namespace Org.OpenAPITools.Test.Model // TODO uncomment below to test "IsType" MultipartMixedStatus //Assert.IsType(instance); } - - - } - } diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Model/MultipartSingleRequestTests.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools.Test/Model/MultipartSingleRequestTests.cs similarity index 98% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Model/MultipartSingleRequestTests.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools.Test/Model/MultipartSingleRequestTests.cs index 445e118e3b2..97e2206c35f 100644 --- a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Model/MultipartSingleRequestTests.cs +++ b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools.Test/Model/MultipartSingleRequestTests.cs @@ -14,7 +14,6 @@ using System; using System.Linq; using System.IO; using System.Collections.Generic; -using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; using Org.OpenAPITools.Client; using System.Reflection; @@ -55,7 +54,6 @@ namespace Org.OpenAPITools.Test.Model //Assert.IsType(instance); } - /// /// Test the property 'File' /// @@ -64,7 +62,5 @@ namespace Org.OpenAPITools.Test.Model { // TODO unit test for the property 'File' } - } - } diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Api/MultipartApi.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Api/MultipartApi.cs similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Api/MultipartApi.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Api/MultipartApi.cs diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/ApiClient.cs similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/ApiClient.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/ApiClient.cs diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/ApiResponse.cs similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/ApiResponse.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/ApiResponse.cs diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/Configuration.cs similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/Configuration.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/Configuration.cs diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/ExceptionFactory.cs similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/ExceptionFactory.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/ExceptionFactory.cs diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/GlobalConfiguration.cs similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/GlobalConfiguration.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/GlobalConfiguration.cs diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/HttpMethod.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/HttpMethod.cs similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/HttpMethod.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/HttpMethod.cs diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/IApiAccessor.cs similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/IApiAccessor.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/IApiAccessor.cs diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/IAsynchronousClient.cs similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/IAsynchronousClient.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/IAsynchronousClient.cs diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/IReadableConfiguration.cs similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/IReadableConfiguration.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/IReadableConfiguration.cs diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/ISynchronousClient.cs similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/ISynchronousClient.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/ISynchronousClient.cs diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/Multimap.cs similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/Multimap.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/Multimap.cs diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/RequestOptions.cs similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/RequestOptions.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/RequestOptions.cs diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/RetryConfiguration.cs similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Client/RetryConfiguration.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/RetryConfiguration.cs diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartArrayRequest.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Model/MultipartArrayRequest.cs similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartArrayRequest.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Model/MultipartArrayRequest.cs diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartMixedRequest.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Model/MultipartMixedRequest.cs similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartMixedRequest.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Model/MultipartMixedRequest.cs diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartMixedRequestMarker.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Model/MultipartMixedRequestMarker.cs similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartMixedRequestMarker.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Model/MultipartMixedRequestMarker.cs diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartMixedStatus.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Model/MultipartMixedStatus.cs similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartMixedStatus.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Model/MultipartMixedStatus.cs diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartSingleRequest.cs b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Model/MultipartSingleRequest.cs similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartSingleRequest.cs rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Model/MultipartSingleRequest.cs diff --git a/samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp-netcore-functions/.gitignore b/samples/client/petstore/csharp-functions/.gitignore similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/.gitignore rename to samples/client/petstore/csharp-functions/.gitignore diff --git a/samples/client/petstore/csharp-netcore-functions/.openapi-generator-ignore b/samples/client/petstore/csharp-functions/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/.openapi-generator-ignore rename to samples/client/petstore/csharp-functions/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp-netcore-functions/.openapi-generator/FILES b/samples/client/petstore/csharp-functions/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/.openapi-generator/FILES rename to samples/client/petstore/csharp-functions/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp-netcore-functions/.openapi-generator/VERSION b/samples/client/petstore/csharp-functions/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/.openapi-generator/VERSION rename to samples/client/petstore/csharp-functions/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp-netcore-functions/Org.OpenAPITools.sln b/samples/client/petstore/csharp-functions/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/Org.OpenAPITools.sln rename to samples/client/petstore/csharp-functions/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp-netcore-functions/README.md b/samples/client/petstore/csharp-functions/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/README.md rename to samples/client/petstore/csharp-functions/README.md diff --git a/samples/client/petstore/csharp-netcore-functions/appveyor.yml b/samples/client/petstore/csharp-functions/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/appveyor.yml rename to samples/client/petstore/csharp-functions/appveyor.yml diff --git a/samples/client/petstore/csharp-netcore-functions/build.bat b/samples/client/petstore/csharp-functions/build.bat similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/build.bat rename to samples/client/petstore/csharp-functions/build.bat diff --git a/samples/client/petstore/csharp-netcore-functions/build.sh b/samples/client/petstore/csharp-functions/build.sh similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/build.sh rename to samples/client/petstore/csharp-functions/build.sh diff --git a/samples/client/petstore/csharp-netcore-functions/generatedSrc/Client/ApiClient.cs b/samples/client/petstore/csharp-functions/generatedSrc/Client/ApiClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/generatedSrc/Client/ApiClient.cs rename to samples/client/petstore/csharp-functions/generatedSrc/Client/ApiClient.cs diff --git a/samples/client/petstore/csharp-netcore-functions/generatedSrc/Client/ApiException.cs b/samples/client/petstore/csharp-functions/generatedSrc/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/generatedSrc/Client/ApiException.cs rename to samples/client/petstore/csharp-functions/generatedSrc/Client/ApiException.cs diff --git a/samples/client/petstore/csharp-netcore-functions/generatedSrc/Client/ApiResponse.cs b/samples/client/petstore/csharp-functions/generatedSrc/Client/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/generatedSrc/Client/ApiResponse.cs rename to samples/client/petstore/csharp-functions/generatedSrc/Client/ApiResponse.cs diff --git a/samples/client/petstore/csharp-netcore-functions/generatedSrc/Client/Configuration.cs b/samples/client/petstore/csharp-functions/generatedSrc/Client/Configuration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/generatedSrc/Client/Configuration.cs rename to samples/client/petstore/csharp-functions/generatedSrc/Client/Configuration.cs diff --git a/samples/client/petstore/csharp-netcore-functions/generatedSrc/Client/ExceptionFactory.cs b/samples/client/petstore/csharp-functions/generatedSrc/Client/ExceptionFactory.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/generatedSrc/Client/ExceptionFactory.cs rename to samples/client/petstore/csharp-functions/generatedSrc/Client/ExceptionFactory.cs diff --git a/samples/client/petstore/csharp-netcore-functions/generatedSrc/Client/IApiAccessor.cs b/samples/client/petstore/csharp-functions/generatedSrc/Client/IApiAccessor.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/generatedSrc/Client/IApiAccessor.cs rename to samples/client/petstore/csharp-functions/generatedSrc/Client/IApiAccessor.cs diff --git a/samples/client/petstore/csharp-netcore-functions/generatedSrc/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp-functions/generatedSrc/Client/OpenAPIDateConverter.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/generatedSrc/Client/OpenAPIDateConverter.cs rename to samples/client/petstore/csharp-functions/generatedSrc/Client/OpenAPIDateConverter.cs diff --git a/samples/client/petstore/csharp-netcore-functions/generatedSrc/Functions/PetApi.cs b/samples/client/petstore/csharp-functions/generatedSrc/Functions/PetApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/generatedSrc/Functions/PetApi.cs rename to samples/client/petstore/csharp-functions/generatedSrc/Functions/PetApi.cs diff --git a/samples/client/petstore/csharp-netcore-functions/generatedSrc/Functions/StoreApi.cs b/samples/client/petstore/csharp-functions/generatedSrc/Functions/StoreApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/generatedSrc/Functions/StoreApi.cs rename to samples/client/petstore/csharp-functions/generatedSrc/Functions/StoreApi.cs diff --git a/samples/client/petstore/csharp-netcore-functions/generatedSrc/Functions/UserApi.cs b/samples/client/petstore/csharp-functions/generatedSrc/Functions/UserApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/generatedSrc/Functions/UserApi.cs rename to samples/client/petstore/csharp-functions/generatedSrc/Functions/UserApi.cs diff --git a/samples/client/petstore/csharp-netcore-functions/generatedSrc/Models/ApiResponse.cs b/samples/client/petstore/csharp-functions/generatedSrc/Models/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/generatedSrc/Models/ApiResponse.cs rename to samples/client/petstore/csharp-functions/generatedSrc/Models/ApiResponse.cs diff --git a/samples/client/petstore/csharp-netcore-functions/generatedSrc/Models/Category.cs b/samples/client/petstore/csharp-functions/generatedSrc/Models/Category.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/generatedSrc/Models/Category.cs rename to samples/client/petstore/csharp-functions/generatedSrc/Models/Category.cs diff --git a/samples/client/petstore/csharp-netcore-functions/generatedSrc/Models/Order.cs b/samples/client/petstore/csharp-functions/generatedSrc/Models/Order.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/generatedSrc/Models/Order.cs rename to samples/client/petstore/csharp-functions/generatedSrc/Models/Order.cs diff --git a/samples/client/petstore/csharp-netcore-functions/generatedSrc/Models/Pet.cs b/samples/client/petstore/csharp-functions/generatedSrc/Models/Pet.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/generatedSrc/Models/Pet.cs rename to samples/client/petstore/csharp-functions/generatedSrc/Models/Pet.cs diff --git a/samples/client/petstore/csharp-netcore-functions/generatedSrc/Models/Tag.cs b/samples/client/petstore/csharp-functions/generatedSrc/Models/Tag.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/generatedSrc/Models/Tag.cs rename to samples/client/petstore/csharp-functions/generatedSrc/Models/Tag.cs diff --git a/samples/client/petstore/csharp-netcore-functions/generatedSrc/Models/User.cs b/samples/client/petstore/csharp-functions/generatedSrc/Models/User.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/generatedSrc/Models/User.cs rename to samples/client/petstore/csharp-functions/generatedSrc/Models/User.cs diff --git a/samples/client/petstore/csharp-netcore-functions/generatedSrc/README.md b/samples/client/petstore/csharp-functions/generatedSrc/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/generatedSrc/README.md rename to samples/client/petstore/csharp-functions/generatedSrc/README.md diff --git a/samples/client/petstore/csharp-netcore-functions/generatedSrc/project.json b/samples/client/petstore/csharp-functions/generatedSrc/project.json similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/generatedSrc/project.json rename to samples/client/petstore/csharp-functions/generatedSrc/project.json diff --git a/samples/client/petstore/csharp-netcore-functions/git_push.sh b/samples/client/petstore/csharp-functions/git_push.sh similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/git_push.sh rename to samples/client/petstore/csharp-functions/git_push.sh diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/.gitignore b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/.gitignore similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/.gitignore rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/.gitignore diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/ApiClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/ApiClient.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/ApiClient.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/ApiResponse.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/ApiResponse.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/Configuration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/Configuration.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/Configuration.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/ExceptionFactory.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/ExceptionFactory.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/ExceptionFactory.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/GlobalConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/GlobalConfiguration.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/GlobalConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/HttpMethod.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/HttpMethod.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/HttpMethod.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/HttpMethod.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/IApiAccessor.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/IApiAccessor.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/IApiAccessor.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/IAsynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/IAsynchronousClient.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/IAsynchronousClient.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/IReadableConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/IReadableConfiguration.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/IReadableConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/ISynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/ISynchronousClient.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/ISynchronousClient.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/Multimap.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/Multimap.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/Multimap.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/RequestOptions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/RequestOptions.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/RequestOptions.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/RetryConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Client/RetryConfiguration.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Client/RetryConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Converters/CustomEnumConverter.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Converters/CustomEnumConverter.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Converters/CustomEnumConverter.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Converters/CustomEnumConverter.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Functions/PetApi.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Functions/PetApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Functions/PetApi.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Functions/PetApi.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Functions/StoreApi.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Functions/StoreApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Functions/StoreApi.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Functions/StoreApi.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Functions/UserApi.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Functions/UserApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Functions/UserApi.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Functions/UserApi.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Models/AbstractOpenAPISchema.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Models/AbstractOpenAPISchema.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Models/AbstractOpenAPISchema.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Models/AbstractOpenAPISchema.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Models/ApiResponse.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Models/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Models/ApiResponse.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Models/ApiResponse.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Models/Category.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Models/Category.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Models/Category.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Models/Category.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Models/Order.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Models/Order.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Models/Order.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Models/Order.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Models/Pet.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Models/Pet.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Models/Pet.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Models/Pet.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Models/Tag.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Models/Tag.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Models/Tag.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Models/Tag.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Models/User.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Models/User.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Models/User.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Models/User.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/OpenApi/TypeExtensions.cs b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/OpenApi/TypeExtensions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/OpenApi/TypeExtensions.cs rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/OpenApi/TypeExtensions.cs diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/host.json b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/host.json similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/host.json rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/host.json diff --git a/samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/local.settings.json b/samples/client/petstore/csharp-functions/src/Org.OpenAPITools/local.settings.json similarity index 100% rename from samples/client/petstore/csharp-netcore-functions/src/Org.OpenAPITools/local.settings.json rename to samples/client/petstore/csharp-functions/src/Org.OpenAPITools/local.settings.json diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.gitignore b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/.gitignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.gitignore rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/.gitignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator-ignore b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator-ignore rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/FILES b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/FILES rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/VERSION rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/Org.OpenAPITools.sln b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/README.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/README.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/api/openapi.yaml b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/api/openapi.yaml rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/api/openapi.yaml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/appveyor.yml b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/appveyor.yml rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/appveyor.yml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Activity.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Activity.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Activity.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Activity.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ActivityOutputElementRepresentation.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ActivityOutputElementRepresentation.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ActivityOutputElementRepresentation.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/AdditionalPropertiesClass.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/AdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/AdditionalPropertiesClass.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/AdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Animal.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Animal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Animal.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Animal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/AnotherFakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/AnotherFakeApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/AnotherFakeApi.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/AnotherFakeApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ApiResponse.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ApiResponse.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ApiResponse.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ApiResponse.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Apple.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Apple.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Apple.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Apple.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/AppleReq.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/AppleReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/AppleReq.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/AppleReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ArrayOfArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ArrayOfArrayOfNumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ArrayOfArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ArrayOfNumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ArrayOfNumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ArrayTest.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ArrayTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ArrayTest.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ArrayTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Banana.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Banana.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Banana.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Banana.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/BananaReq.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/BananaReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/BananaReq.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/BananaReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/BasquePig.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/BasquePig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/BasquePig.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/BasquePig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Capitalization.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Capitalization.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Capitalization.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Capitalization.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Cat.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Cat.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Cat.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Cat.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/CatAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/CatAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/CatAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/CatAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Category.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Category.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Category.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Category.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ChildCat.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ChildCat.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ChildCat.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ChildCat.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ChildCatAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ChildCatAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ChildCatAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ChildCatAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ClassModel.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ClassModel.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ClassModel.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ClassModel.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ComplexQuadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ComplexQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ComplexQuadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ComplexQuadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/DanishPig.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/DanishPig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/DanishPig.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/DanishPig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/DateOnlyClass.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/DateOnlyClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/DateOnlyClass.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/DateOnlyClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/DefaultApi.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/DefaultApi.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/DefaultApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/DeprecatedObject.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/DeprecatedObject.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/DeprecatedObject.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/DeprecatedObject.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Dog.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Dog.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Dog.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Dog.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/DogAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/DogAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/DogAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/DogAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Drawing.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Drawing.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Drawing.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Drawing.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/EnumArrays.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/EnumArrays.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/EnumArrays.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/EnumArrays.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/EnumClass.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/EnumClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/EnumClass.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/EnumClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/EnumTest.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/EnumTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/EnumTest.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/EnumTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/EquilateralTriangle.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/EquilateralTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/EquilateralTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/EquilateralTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FakeApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/FakeApi.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FakeApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/FakeClassnameTags123Api.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FakeClassnameTags123Api.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/FakeClassnameTags123Api.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FakeClassnameTags123Api.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/File.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/File.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/File.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/File.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/FileSchemaTestClass.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FileSchemaTestClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/FileSchemaTestClass.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FileSchemaTestClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Foo.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Foo.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Foo.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Foo.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/FooGetDefaultResponse.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FooGetDefaultResponse.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/FooGetDefaultResponse.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FooGetDefaultResponse.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FormatTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/FormatTest.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FormatTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Fruit.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Fruit.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Fruit.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Fruit.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/FruitReq.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FruitReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/FruitReq.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/FruitReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/GmFruit.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/GmFruit.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/GmFruit.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/GmFruit.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/GrandparentAnimal.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/GrandparentAnimal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/GrandparentAnimal.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/GrandparentAnimal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/HasOnlyReadOnly.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/HasOnlyReadOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/HasOnlyReadOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/HasOnlyReadOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/HealthCheckResult.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/HealthCheckResult.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/HealthCheckResult.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/HealthCheckResult.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/IsoscelesTriangle.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/IsoscelesTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/IsoscelesTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/IsoscelesTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/List.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/List.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/List.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/List.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/LiteralStringClass.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/LiteralStringClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/LiteralStringClass.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/LiteralStringClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Mammal.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Mammal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Mammal.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Mammal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/MapTest.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/MapTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/MapTest.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/MapTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/MixedPropertiesAndAdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/MixedPropertiesAndAdditionalPropertiesClass.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/MixedPropertiesAndAdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Model200Response.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Model200Response.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Model200Response.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Model200Response.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ModelClient.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ModelClient.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ModelClient.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ModelClient.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Name.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Name.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Name.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Name.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/NullableClass.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/NullableClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/NullableClass.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/NullableClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/NullableGuidClass.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/NullableGuidClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/NullableGuidClass.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/NullableGuidClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/NullableShape.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/NullableShape.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/NullableShape.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/NullableShape.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/NumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/NumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/NumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/NumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ObjectWithDeprecatedFields.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ObjectWithDeprecatedFields.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ObjectWithDeprecatedFields.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/OneOfString.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/OneOfString.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/OneOfString.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/OneOfString.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Order.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Order.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Order.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Order.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/OuterComposite.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/OuterComposite.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/OuterComposite.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/OuterComposite.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/OuterEnum.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/OuterEnum.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/OuterEnum.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/OuterEnum.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/OuterEnumDefaultValue.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/OuterEnumDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/OuterEnumDefaultValue.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/OuterEnumDefaultValue.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/OuterEnumInteger.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/OuterEnumInteger.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/OuterEnumInteger.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/OuterEnumInteger.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/OuterEnumIntegerDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/OuterEnumIntegerDefaultValue.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/OuterEnumIntegerDefaultValue.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ParentPet.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ParentPet.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ParentPet.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ParentPet.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Pet.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Pet.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Pet.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Pet.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/PetApi.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/PetApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/PetApi.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/PetApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Pig.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Pig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Pig.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Pig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/PolymorphicProperty.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/PolymorphicProperty.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/PolymorphicProperty.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/PolymorphicProperty.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Quadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Quadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Quadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Quadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/QuadrilateralInterface.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/QuadrilateralInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/QuadrilateralInterface.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/QuadrilateralInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ReadOnlyFirst.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ReadOnlyFirst.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ReadOnlyFirst.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ReadOnlyFirst.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Return.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Return.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Return.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Return.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ScaleneTriangle.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ScaleneTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ScaleneTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ScaleneTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Shape.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Shape.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Shape.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Shape.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ShapeInterface.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ShapeInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ShapeInterface.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ShapeInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ShapeOrNull.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ShapeOrNull.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ShapeOrNull.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ShapeOrNull.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/SimpleQuadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/SimpleQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/SimpleQuadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/SimpleQuadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/SpecialModelName.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/SpecialModelName.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/SpecialModelName.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/SpecialModelName.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/StoreApi.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/StoreApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/StoreApi.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/StoreApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Tag.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Tag.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Tag.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Tag.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/TestCollectionEndingWithWordList.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/TestCollectionEndingWithWordList.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/TestCollectionEndingWithWordList.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/TestCollectionEndingWithWordListObject.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/TestCollectionEndingWithWordListObject.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/TestCollectionEndingWithWordListObject.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Triangle.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Triangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Triangle.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Triangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/TriangleInterface.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/TriangleInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/TriangleInterface.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/TriangleInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/User.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/User.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/User.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/User.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/UserApi.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/UserApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/UserApi.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/UserApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Whale.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Whale.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Whale.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Whale.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Zebra.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Zebra.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/Zebra.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/Zebra.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ZeroBasedEnum.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ZeroBasedEnum.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ZeroBasedEnum.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ZeroBasedEnum.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ZeroBasedEnumClass.md b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ZeroBasedEnumClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/ZeroBasedEnumClass.md rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/docs/ZeroBasedEnumClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/git_push.sh b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/git_push.sh similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/git_push.sh rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/git_push.sh diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/PetApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/PetApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/PetApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/UserApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/UserApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Api/UserApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ActivityTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ActivityTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ActivityTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ActivityTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AnimalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AnimalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AppleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AppleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/AppleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/BananaTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/BananaTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/BananaTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CatTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CatTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CatTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CategoryTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CategoryTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/CategoryTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DogTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DogTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DogTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DrawingTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DrawingTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DrawingTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/DrawingTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FileTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FileTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FileTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FooTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FooTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FooTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FooTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FruitTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FruitTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/FruitTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ListTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ListTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ListTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MammalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MammalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MammalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MapTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MapTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MapTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NameTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NameTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NameTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OrderTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OrderTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OrderTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/PetTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/PetTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/PetTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/PigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/PigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/PigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ReturnTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ReturnTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ReturnTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/SerializeBasedOnInitialization.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/SerializeBasedOnInitialization.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/SerializeBasedOnInitialization.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/SerializeBasedOnInitialization.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ShapeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ShapeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TagTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TagTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TagTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/TriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/UserTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/UserTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/UserTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/WhaleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/WhaleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/WhaleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/WhaleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ZebraTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ZebraTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ZebraTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ZebraTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/AnotherFakeApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/AnotherFakeApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/AnotherFakeApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/FakeApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/FakeApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/FakeApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/PetApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/PetApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/PetApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/StoreApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/StoreApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/StoreApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/UserApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/UserApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Api/UserApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Configuration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Configuration.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Configuration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ExceptionFactory.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ExceptionFactory.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ExceptionFactory.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/GlobalConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/GlobalConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/GlobalConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/HttpMethod.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/HttpMethod.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/HttpMethod.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/HttpMethod.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/IApiAccessor.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/IApiAccessor.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/IApiAccessor.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/IAsynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/IAsynchronousClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/IAsynchronousClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/IReadableConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/IReadableConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/IReadableConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ISynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ISynchronousClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ISynchronousClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Multimap.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Multimap.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Multimap.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/RequestOptions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/RequestOptions.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/RequestOptions.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/RetryConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/RetryConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/RetryConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Activity.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Activity.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Activity.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Animal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Animal.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Animal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ApiResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ApiResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Apple.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Apple.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Apple.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AppleReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AppleReq.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/AppleReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ArrayTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Banana.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Banana.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Banana.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/BananaReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/BananaReq.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/BananaReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/BasquePig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/BasquePig.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/BasquePig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Capitalization.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Capitalization.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Capitalization.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Cat.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Cat.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Cat.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/CatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/CatAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/CatAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Category.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Category.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Category.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ChildCat.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ChildCat.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ChildCat.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ChildCatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ChildCatAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ChildCatAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ClassModel.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ClassModel.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ClassModel.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DanishPig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DanishPig.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DanishPig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DateOnlyClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DateOnlyClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DateOnlyClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DeprecatedObject.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DeprecatedObject.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DeprecatedObject.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Dog.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Dog.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Dog.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DogAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DogAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/DogAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Drawing.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Drawing.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Drawing.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumArrays.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumArrays.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumArrays.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EquilateralTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EquilateralTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EquilateralTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/File.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/File.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/File.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Foo.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Foo.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Foo.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FormatTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Fruit.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Fruit.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FruitReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FruitReq.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/FruitReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/GmFruit.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/GmFruit.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/GmFruit.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/GrandparentAnimal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/GrandparentAnimal.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/GrandparentAnimal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/HealthCheckResult.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/HealthCheckResult.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/HealthCheckResult.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/List.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/List.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/List.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/LiteralStringClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/LiteralStringClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/LiteralStringClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Mammal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Mammal.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Mammal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MapTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MapTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MapTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Model200Response.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Model200Response.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Model200Response.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ModelClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ModelClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ModelClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Name.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Name.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Name.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableGuidClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableGuidClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableGuidClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableShape.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableShape.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NullableShape.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OneOfString.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OneOfString.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OneOfString.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Order.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Order.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Order.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterComposite.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterComposite.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterComposite.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnum.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnum.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnum.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumInteger.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumInteger.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumInteger.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ParentPet.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ParentPet.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ParentPet.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pet.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pet.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pet.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pig.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Pig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/PolymorphicProperty.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/PolymorphicProperty.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/PolymorphicProperty.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Quadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Quadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Quadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Return.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Return.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Return.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ScaleneTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ScaleneTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ScaleneTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Shape.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Shape.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Shape.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ShapeInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ShapeInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ShapeInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ShapeOrNull.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ShapeOrNull.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ShapeOrNull.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/SpecialModelName.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/SpecialModelName.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/SpecialModelName.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Tag.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Tag.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Tag.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Triangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Triangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Triangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TriangleInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TriangleInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/TriangleInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/User.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/User.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Whale.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Whale.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Whale.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Zebra.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Zebra.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/Zebra.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.gitignore b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/.gitignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.gitignore rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/.gitignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator-ignore b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator-ignore rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/VERSION rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/Org.OpenAPITools.sln b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/README.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/README.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/api/openapi.yaml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/appveyor.yml b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/appveyor.yml rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/appveyor.yml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/AnotherFakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/AnotherFakeApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/AnotherFakeApi.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/AnotherFakeApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/DefaultApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/DefaultApi.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/DefaultApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeApi.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeClassnameTags123Api.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeClassnameTags123Api.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeClassnameTags123Api.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/FakeClassnameTags123Api.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/PetApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/PetApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/PetApi.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/PetApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/StoreApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/StoreApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/StoreApi.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/StoreApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/UserApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/UserApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/apis/UserApi.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/apis/UserApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Activity.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Activity.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Activity.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Activity.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ActivityOutputElementRepresentation.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ActivityOutputElementRepresentation.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ActivityOutputElementRepresentation.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/AdditionalPropertiesClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/AdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/AdditionalPropertiesClass.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/AdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Animal.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Animal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Animal.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Animal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ApiResponse.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ApiResponse.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ApiResponse.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ApiResponse.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Apple.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Apple.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Apple.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Apple.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/AppleReq.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/AppleReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/AppleReq.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/AppleReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ArrayOfArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ArrayOfArrayOfNumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ArrayOfArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ArrayOfNumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ArrayOfNumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ArrayTest.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ArrayTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ArrayTest.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ArrayTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Banana.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Banana.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Banana.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Banana.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/BananaReq.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/BananaReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/BananaReq.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/BananaReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/BasquePig.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/BasquePig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/BasquePig.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/BasquePig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Capitalization.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Capitalization.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Capitalization.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Capitalization.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Cat.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Cat.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Cat.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Cat.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/CatAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/CatAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/CatAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/CatAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Category.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Category.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Category.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Category.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ChildCat.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ChildCat.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ChildCat.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ChildCat.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ChildCatAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ChildCatAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ChildCatAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ChildCatAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ClassModel.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ClassModel.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ClassModel.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ClassModel.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ComplexQuadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ComplexQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ComplexQuadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ComplexQuadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/DanishPig.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/DanishPig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/DanishPig.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/DanishPig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/DateOnlyClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/DateOnlyClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/DateOnlyClass.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/DateOnlyClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/DeprecatedObject.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/DeprecatedObject.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/DeprecatedObject.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/DeprecatedObject.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Dog.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Dog.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Dog.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Dog.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/DogAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/DogAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/DogAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/DogAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Drawing.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Drawing.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Drawing.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Drawing.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumArrays.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumArrays.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumArrays.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumArrays.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumClass.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumTest.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumTest.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EquilateralTriangle.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/EquilateralTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EquilateralTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/EquilateralTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/File.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/File.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/File.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/File.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FileSchemaTestClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FileSchemaTestClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FileSchemaTestClass.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FileSchemaTestClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Foo.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Foo.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Foo.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Foo.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FooGetDefaultResponse.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FooGetDefaultResponse.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FooGetDefaultResponse.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FooGetDefaultResponse.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FormatTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FormatTest.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FormatTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Fruit.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Fruit.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Fruit.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Fruit.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FruitReq.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FruitReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/FruitReq.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/FruitReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/GmFruit.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/GmFruit.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/GmFruit.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/GmFruit.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/GrandparentAnimal.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/GrandparentAnimal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/GrandparentAnimal.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/GrandparentAnimal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/HasOnlyReadOnly.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/HasOnlyReadOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/HasOnlyReadOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/HasOnlyReadOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/HealthCheckResult.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/HealthCheckResult.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/HealthCheckResult.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/HealthCheckResult.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/IsoscelesTriangle.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/IsoscelesTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/IsoscelesTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/IsoscelesTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/List.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/List.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/List.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/List.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/LiteralStringClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/LiteralStringClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/LiteralStringClass.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/LiteralStringClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Mammal.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Mammal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Mammal.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Mammal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/MapTest.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/MapTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/MapTest.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/MapTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Model200Response.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Model200Response.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Model200Response.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Model200Response.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ModelClient.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ModelClient.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ModelClient.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ModelClient.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Name.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Name.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Name.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Name.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableClass.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableGuidClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableGuidClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableGuidClass.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableGuidClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableShape.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableShape.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableShape.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/NullableShape.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/NumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/NumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/NumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/NumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ObjectWithDeprecatedFields.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ObjectWithDeprecatedFields.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ObjectWithDeprecatedFields.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/OneOfString.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/OneOfString.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/OneOfString.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/OneOfString.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Order.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Order.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Order.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Order.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterComposite.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterComposite.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterComposite.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterComposite.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterEnum.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterEnum.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterEnum.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterEnum.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterEnumDefaultValue.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterEnumDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterEnumDefaultValue.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterEnumDefaultValue.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterEnumInteger.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterEnumInteger.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterEnumInteger.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterEnumInteger.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterEnumIntegerDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterEnumIntegerDefaultValue.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/OuterEnumIntegerDefaultValue.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ParentPet.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ParentPet.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ParentPet.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ParentPet.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Pet.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Pet.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Pet.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Pet.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Pig.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Pig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Pig.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Pig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/PolymorphicProperty.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/PolymorphicProperty.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/PolymorphicProperty.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/PolymorphicProperty.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Quadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Quadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Quadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Quadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/QuadrilateralInterface.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/QuadrilateralInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/QuadrilateralInterface.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/QuadrilateralInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ReadOnlyFirst.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ReadOnlyFirst.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ReadOnlyFirst.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ReadOnlyFirst.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Return.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Return.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Return.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Return.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ScaleneTriangle.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ScaleneTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ScaleneTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ScaleneTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Shape.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Shape.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Shape.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Shape.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ShapeInterface.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ShapeInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ShapeInterface.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ShapeInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ShapeOrNull.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ShapeOrNull.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ShapeOrNull.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/SimpleQuadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/SimpleQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/SimpleQuadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/SimpleQuadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/SpecialModelName.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/SpecialModelName.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/SpecialModelName.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/SpecialModelName.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Tag.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Tag.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Tag.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Tag.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/TestCollectionEndingWithWordList.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/TestCollectionEndingWithWordList.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/TestCollectionEndingWithWordList.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/TestCollectionEndingWithWordListObject.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/TestCollectionEndingWithWordListObject.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/TestCollectionEndingWithWordListObject.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Triangle.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Triangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Triangle.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Triangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/TriangleInterface.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/TriangleInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/TriangleInterface.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/TriangleInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/User.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/User.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/User.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/User.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Whale.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Whale.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Whale.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Whale.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Zebra.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Zebra.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/Zebra.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/Zebra.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ZeroBasedEnum.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ZeroBasedEnum.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ZeroBasedEnum.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ZeroBasedEnum.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ZeroBasedEnumClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ZeroBasedEnumClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/ZeroBasedEnumClass.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/models/ZeroBasedEnumClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/scripts/git_push.ps1 b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/scripts/git_push.ps1 similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/scripts/git_push.ps1 rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/scripts/git_push.ps1 diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/scripts/git_push.sh b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/scripts/git_push.sh similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/scripts/git_push.sh rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/docs/scripts/git_push.sh diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/PetApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/PetApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/PetApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/UserApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/UserApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/UserApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ActivityTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ActivityTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ActivityTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ActivityTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AnimalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AnimalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AppleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AppleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/AppleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BananaTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BananaTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BananaTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CatTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CatTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CatTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CategoryTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CategoryTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/CategoryTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DogTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DogTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DogTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DrawingTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DrawingTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DrawingTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/DrawingTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FileTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FileTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FileTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FooTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FooTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FooTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FooTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/FruitTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ListTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ListTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ListTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MammalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MammalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MammalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MapTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MapTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MapTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NameTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NameTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NameTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OrderTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OrderTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OrderTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PetTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PetTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PetTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ReturnTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ReturnTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ReturnTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ShapeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TagTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TagTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TagTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/TriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/UserTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/UserTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/UserTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/WhaleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/WhaleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/WhaleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/WhaleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ZebraTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ZebraTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ZebraTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ZebraTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/README.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/README.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/AnotherFakeApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/AnotherFakeApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/AnotherFakeApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/IApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/IApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/IApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/IApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/StoreApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/StoreApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/StoreApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiFactory.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiFactory.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiFactory.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiFactory.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiKeyToken.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiKeyToken.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiKeyToken.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiKeyToken.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiResponse`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiResponse`1.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiResponse`1.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiResponse`1.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/BasicToken.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/BasicToken.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/BasicToken.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/BasicToken.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/BearerToken.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/BearerToken.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/BearerToken.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/BearerToken.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/CookieContainer.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/CookieContainer.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/CookieContainer.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/CookieContainer.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HttpSigningToken.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HttpSigningToken.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HttpSigningToken.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HttpSigningToken.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/OAuthToken.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/OAuthToken.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/OAuthToken.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/OAuthToken.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/TokenBase.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/TokenBase.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/TokenBase.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/TokenContainer`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/TokenContainer`1.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/TokenContainer`1.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/TokenContainer`1.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/TokenProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/TokenProvider`1.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/TokenProvider`1.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Activity.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Activity.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Activity.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Animal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Animal.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Animal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ApiResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Apple.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Apple.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Apple.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AppleReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AppleReq.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/AppleReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ArrayTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Banana.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Banana.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Banana.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BananaReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BananaReq.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BananaReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BasquePig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BasquePig.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/BasquePig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Capitalization.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Capitalization.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Capitalization.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Cat.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Cat.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Cat.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/CatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/CatAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/CatAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Category.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ChildCat.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ChildCat.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ChildCat.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ChildCatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ChildCatAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ChildCatAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ClassModel.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ClassModel.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ClassModel.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DanishPig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DanishPig.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DanishPig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DateOnlyClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DeprecatedObject.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DeprecatedObject.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DeprecatedObject.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Dog.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Dog.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Dog.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DogAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DogAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/DogAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Drawing.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Drawing.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Drawing.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EquilateralTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EquilateralTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EquilateralTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/File.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/File.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/File.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Foo.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Foo.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Foo.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FormatTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Fruit.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Fruit.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FruitReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FruitReq.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FruitReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GmFruit.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GmFruit.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GmFruit.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GrandparentAnimal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GrandparentAnimal.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/GrandparentAnimal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/HealthCheckResult.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/HealthCheckResult.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/HealthCheckResult.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/List.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/List.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/List.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/LiteralStringClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/LiteralStringClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/LiteralStringClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Mammal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Mammal.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Mammal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Model200Response.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ModelClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ModelClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ModelClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Name.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableGuidClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableGuidClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableGuidClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableShape.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableShape.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableShape.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OneOfString.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OneOfString.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OneOfString.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Order.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterComposite.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnum.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnum.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnum.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumInteger.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumInteger.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumInteger.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ParentPet.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ParentPet.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ParentPet.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pet.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pig.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/PolymorphicProperty.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/PolymorphicProperty.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/PolymorphicProperty.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Quadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Quadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Quadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Return.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ScaleneTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ScaleneTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ScaleneTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/SpecialModelName.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Tag.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Tag.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Tag.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Triangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Triangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Triangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TriangleInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TriangleInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/TriangleInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Whale.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Whale.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Whale.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Zebra.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Zebra.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Zebra.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/README.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/README.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.gitignore b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/.gitignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.gitignore rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/.gitignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator-ignore b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator-ignore rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/.openapi-generator/VERSION rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/Org.OpenAPITools.sln b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/README.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/README.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/api/openapi.yaml b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/api/openapi.yaml rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/api/openapi.yaml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/appveyor.yml b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/appveyor.yml rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/appveyor.yml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/AnotherFakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/AnotherFakeApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/AnotherFakeApi.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/AnotherFakeApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/DefaultApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/DefaultApi.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/DefaultApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/FakeApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/FakeApi.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/FakeApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/FakeClassnameTags123Api.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/FakeClassnameTags123Api.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/FakeClassnameTags123Api.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/FakeClassnameTags123Api.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/PetApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/PetApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/PetApi.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/PetApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/StoreApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/StoreApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/StoreApi.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/StoreApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/UserApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/UserApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/apis/UserApi.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/apis/UserApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Activity.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Activity.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Activity.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Activity.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ActivityOutputElementRepresentation.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ActivityOutputElementRepresentation.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ActivityOutputElementRepresentation.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/AdditionalPropertiesClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/AdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/AdditionalPropertiesClass.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/AdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Animal.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Animal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Animal.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Animal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ApiResponse.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ApiResponse.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ApiResponse.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ApiResponse.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Apple.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Apple.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Apple.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Apple.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/AppleReq.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/AppleReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/AppleReq.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/AppleReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ArrayOfArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ArrayOfArrayOfNumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ArrayOfArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ArrayOfNumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ArrayOfNumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ArrayTest.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ArrayTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ArrayTest.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ArrayTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Banana.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Banana.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Banana.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Banana.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/BananaReq.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/BananaReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/BananaReq.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/BananaReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/BasquePig.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/BasquePig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/BasquePig.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/BasquePig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Capitalization.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Capitalization.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Capitalization.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Capitalization.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Cat.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Cat.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Cat.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Cat.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/CatAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/CatAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/CatAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/CatAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Category.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Category.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Category.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Category.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ChildCat.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ChildCat.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ChildCat.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ChildCat.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ChildCatAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ChildCatAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ChildCatAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ChildCatAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ClassModel.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ClassModel.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ClassModel.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ClassModel.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ComplexQuadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ComplexQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ComplexQuadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ComplexQuadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/DanishPig.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/DanishPig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/DanishPig.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/DanishPig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/DateOnlyClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/DateOnlyClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/DateOnlyClass.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/DateOnlyClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/DeprecatedObject.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/DeprecatedObject.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/DeprecatedObject.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/DeprecatedObject.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Dog.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Dog.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Dog.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Dog.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/DogAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/DogAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/DogAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/DogAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Drawing.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Drawing.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Drawing.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Drawing.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/EnumArrays.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/EnumArrays.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/EnumArrays.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/EnumArrays.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/EnumClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/EnumClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/EnumClass.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/EnumClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/EnumTest.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/EnumTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/EnumTest.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/EnumTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/EquilateralTriangle.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/EquilateralTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/EquilateralTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/EquilateralTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/File.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/File.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/File.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/File.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/FileSchemaTestClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FileSchemaTestClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/FileSchemaTestClass.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FileSchemaTestClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Foo.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Foo.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Foo.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Foo.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/FooGetDefaultResponse.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FooGetDefaultResponse.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/FooGetDefaultResponse.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FooGetDefaultResponse.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FormatTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/FormatTest.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FormatTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Fruit.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Fruit.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Fruit.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Fruit.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/FruitReq.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FruitReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/FruitReq.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/FruitReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/GmFruit.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/GmFruit.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/GmFruit.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/GmFruit.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/GrandparentAnimal.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/GrandparentAnimal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/GrandparentAnimal.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/GrandparentAnimal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/HasOnlyReadOnly.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/HasOnlyReadOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/HasOnlyReadOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/HasOnlyReadOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/HealthCheckResult.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/HealthCheckResult.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/HealthCheckResult.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/HealthCheckResult.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/IsoscelesTriangle.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/IsoscelesTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/IsoscelesTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/IsoscelesTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/List.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/List.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/List.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/List.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/LiteralStringClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/LiteralStringClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/LiteralStringClass.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/LiteralStringClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Mammal.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Mammal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Mammal.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Mammal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/MapTest.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/MapTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/MapTest.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/MapTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Model200Response.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Model200Response.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Model200Response.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Model200Response.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ModelClient.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ModelClient.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ModelClient.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ModelClient.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Name.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Name.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Name.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Name.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/NullableClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/NullableClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/NullableClass.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/NullableClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/NullableGuidClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/NullableGuidClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/NullableGuidClass.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/NullableGuidClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/NullableShape.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/NullableShape.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/NullableShape.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/NullableShape.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/NumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/NumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/NumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/NumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ObjectWithDeprecatedFields.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ObjectWithDeprecatedFields.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ObjectWithDeprecatedFields.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/OneOfString.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/OneOfString.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/OneOfString.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/OneOfString.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Order.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Order.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Order.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Order.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/OuterComposite.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/OuterComposite.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/OuterComposite.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/OuterComposite.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/OuterEnum.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/OuterEnum.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/OuterEnum.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/OuterEnum.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/OuterEnumDefaultValue.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/OuterEnumDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/OuterEnumDefaultValue.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/OuterEnumDefaultValue.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/OuterEnumInteger.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/OuterEnumInteger.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/OuterEnumInteger.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/OuterEnumInteger.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/OuterEnumIntegerDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/OuterEnumIntegerDefaultValue.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/OuterEnumIntegerDefaultValue.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ParentPet.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ParentPet.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ParentPet.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ParentPet.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Pet.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Pet.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Pet.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Pet.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Pig.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Pig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Pig.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Pig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/PolymorphicProperty.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/PolymorphicProperty.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/PolymorphicProperty.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/PolymorphicProperty.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Quadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Quadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Quadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Quadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/QuadrilateralInterface.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/QuadrilateralInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/QuadrilateralInterface.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/QuadrilateralInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ReadOnlyFirst.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ReadOnlyFirst.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ReadOnlyFirst.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ReadOnlyFirst.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Return.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Return.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Return.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Return.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ScaleneTriangle.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ScaleneTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ScaleneTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ScaleneTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Shape.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Shape.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Shape.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Shape.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ShapeInterface.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ShapeInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ShapeInterface.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ShapeInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ShapeOrNull.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ShapeOrNull.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ShapeOrNull.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/SimpleQuadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/SimpleQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/SimpleQuadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/SimpleQuadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/SpecialModelName.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/SpecialModelName.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/SpecialModelName.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/SpecialModelName.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Tag.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Tag.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Tag.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Tag.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/TestCollectionEndingWithWordList.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/TestCollectionEndingWithWordList.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/TestCollectionEndingWithWordList.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/TestCollectionEndingWithWordListObject.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/TestCollectionEndingWithWordListObject.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/TestCollectionEndingWithWordListObject.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Triangle.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Triangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Triangle.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Triangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/TriangleInterface.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/TriangleInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/TriangleInterface.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/TriangleInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/User.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/User.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/User.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/User.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Whale.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Whale.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Whale.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Whale.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Zebra.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Zebra.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/Zebra.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/Zebra.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ZeroBasedEnum.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ZeroBasedEnum.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ZeroBasedEnum.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ZeroBasedEnum.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ZeroBasedEnumClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ZeroBasedEnumClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/ZeroBasedEnumClass.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/models/ZeroBasedEnumClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/scripts/git_push.ps1 b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/scripts/git_push.ps1 similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/scripts/git_push.ps1 rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/scripts/git_push.ps1 diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/scripts/git_push.sh b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/scripts/git_push.sh similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/scripts/git_push.sh rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/docs/scripts/git_push.sh diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CatTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CatTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CatTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DogTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DogTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DogTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FileTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FileTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FileTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FooTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FooTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FooTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FooTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ListTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ListTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ListTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NameTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NameTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NameTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PetTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PetTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PetTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TagTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TagTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TagTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/UserTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/UserTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/UserTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/README.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/README.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/IApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/IApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/IApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/IApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/StoreApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/StoreApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/StoreApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiFactory.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiFactory.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiFactory.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiFactory.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiKeyToken.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiKeyToken.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiKeyToken.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiKeyToken.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/BasicToken.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/BasicToken.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/BasicToken.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/BasicToken.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/BearerToken.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/BearerToken.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/BearerToken.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/BearerToken.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/CookieContainer.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/CookieContainer.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/CookieContainer.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/CookieContainer.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HttpSigningToken.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HttpSigningToken.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HttpSigningToken.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HttpSigningToken.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/OAuthToken.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/OAuthToken.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/OAuthToken.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/OAuthToken.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/TokenBase.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/TokenBase.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/TokenBase.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/TokenContainer`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/TokenContainer`1.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/TokenContainer`1.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/TokenContainer`1.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/TokenProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/TokenProvider`1.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/TokenProvider`1.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Activity.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Activity.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Activity.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Animal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Animal.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Animal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ApiResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Apple.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Apple.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Apple.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AppleReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AppleReq.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/AppleReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ArrayTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Banana.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Banana.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Banana.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BananaReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BananaReq.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BananaReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BasquePig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BasquePig.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/BasquePig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Capitalization.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Capitalization.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Capitalization.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Cat.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Cat.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Cat.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/CatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/CatAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/CatAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Category.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ChildCat.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ChildCat.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ChildCat.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ClassModel.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ClassModel.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ClassModel.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DanishPig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DanishPig.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DanishPig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Dog.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Dog.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Dog.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DogAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DogAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/DogAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Drawing.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Drawing.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Drawing.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/File.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/File.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/File.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Foo.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Foo.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Foo.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FormatTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Fruit.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Fruit.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FruitReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FruitReq.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FruitReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GmFruit.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GmFruit.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GmFruit.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/List.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/List.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/List.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Mammal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Mammal.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Mammal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Model200Response.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ModelClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ModelClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ModelClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Name.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableShape.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableShape.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NullableShape.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/NumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OneOfString.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OneOfString.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OneOfString.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Order.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterComposite.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnum.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnum.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnum.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ParentPet.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ParentPet.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ParentPet.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pet.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pig.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Pig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Quadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Quadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Quadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Return.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Shape.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Shape.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Shape.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/SpecialModelName.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Tag.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Tag.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Tag.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Triangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Triangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Triangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TriangleInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TriangleInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/TriangleInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Whale.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Whale.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Whale.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Zebra.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Zebra.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/Zebra.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/README.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/README.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/.gitignore b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/.gitignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/.gitignore rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/.gitignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator-ignore b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator-ignore rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/FILES b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/FILES rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/VERSION rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/Org.OpenAPITools.sln b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/README.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/README.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/api/openapi.yaml b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/api/openapi.yaml rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/api/openapi.yaml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/appveyor.yml b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/appveyor.yml rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/appveyor.yml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/docs/apis/DefaultApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/apis/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/docs/apis/DefaultApi.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/apis/DefaultApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/Adult.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/Adult.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/Adult.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/Adult.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/AdultAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/AdultAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/AdultAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/AdultAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/Child.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/Child.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/Child.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/Child.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/ChildAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/ChildAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/ChildAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/ChildAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/Person.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/Person.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/Person.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/models/Person.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/docs/scripts/git_push.ps1 b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/scripts/git_push.ps1 similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/docs/scripts/git_push.ps1 rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/scripts/git_push.ps1 diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/docs/scripts/git_push.sh b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/scripts/git_push.sh similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/docs/scripts/git_push.sh rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/docs/scripts/git_push.sh diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/AdultAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/AdultAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/AdultAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/AdultAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/AdultTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/AdultTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/AdultTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/AdultTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/ChildAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/ChildAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/ChildAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/ChildAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/ChildTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/PersonTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/PersonTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/PersonTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Model/PersonTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/README.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/README.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Api/IApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Api/IApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Api/IApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Api/IApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiFactory.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiFactory.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiFactory.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiFactory.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/CookieContainer.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/CookieContainer.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/CookieContainer.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/CookieContainer.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/HostConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/HostConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/HostConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/TokenBase.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/TokenBase.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/TokenBase.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Adult.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Adult.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Adult.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Adult.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/AdultAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/AdultAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/AdultAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/AdultAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Child.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Child.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Child.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Child.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/ChildAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/ChildAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/ChildAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/ChildAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Person.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Person.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Person.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Model/Person.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/README.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/README.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/.gitignore b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/.gitignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/.gitignore rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/.gitignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator-ignore b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator-ignore rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/FILES b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/FILES rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/VERSION rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/Org.OpenAPITools.sln b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/README.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/README.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/api/openapi.yaml b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/api/openapi.yaml rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/api/openapi.yaml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/appveyor.yml b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/appveyor.yml rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/appveyor.yml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/docs/apis/DefaultApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/apis/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/docs/apis/DefaultApi.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/apis/DefaultApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/docs/models/Apple.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/models/Apple.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/docs/models/Apple.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/models/Apple.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/docs/models/Banana.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/models/Banana.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/docs/models/Banana.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/models/Banana.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/docs/models/Fruit.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/models/Fruit.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/docs/models/Fruit.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/models/Fruit.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/docs/scripts/git_push.ps1 b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/scripts/git_push.ps1 similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/docs/scripts/git_push.ps1 rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/scripts/git_push.ps1 diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/docs/scripts/git_push.sh b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/scripts/git_push.sh similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/docs/scripts/git_push.sh rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/docs/scripts/git_push.sh diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/README.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/README.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Api/IApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Api/IApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Api/IApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Api/IApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiFactory.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiFactory.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiFactory.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiFactory.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/CookieContainer.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/CookieContainer.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/CookieContainer.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/CookieContainer.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/TokenBase.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/TokenBase.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/TokenBase.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Apple.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Apple.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Apple.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Banana.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Banana.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Banana.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Fruit.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Fruit.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/README.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/README.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/.gitignore b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.gitignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/.gitignore rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.gitignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator-ignore b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator-ignore rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/FILES b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/FILES rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/VERSION rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/Org.OpenAPITools.sln b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/README.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/README.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/api/openapi.yaml b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/api/openapi.yaml rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/api/openapi.yaml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/appveyor.yml b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/appveyor.yml rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/appveyor.yml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/docs/apis/DefaultApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/apis/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/docs/apis/DefaultApi.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/apis/DefaultApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Apple.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Apple.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Apple.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Apple.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Banana.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Banana.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Banana.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Banana.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Fruit.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Fruit.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Fruit.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Fruit.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/docs/scripts/git_push.ps1 b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/scripts/git_push.ps1 similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/docs/scripts/git_push.ps1 rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/scripts/git_push.ps1 diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/docs/scripts/git_push.sh b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/scripts/git_push.sh similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/docs/scripts/git_push.sh rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/scripts/git_push.sh diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/README.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/README.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/IApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/IApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/IApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/IApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiFactory.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiFactory.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiFactory.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiFactory.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/CookieContainer.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/CookieContainer.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/CookieContainer.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/CookieContainer.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenBase.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenBase.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenBase.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Apple.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Apple.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Apple.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Banana.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Banana.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Banana.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/README.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/README.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.gitignore b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/.gitignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.gitignore rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/.gitignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator-ignore b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator-ignore rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/VERSION rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/Org.OpenAPITools.sln b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/README.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/README.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/api/openapi.yaml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/appveyor.yml b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/appveyor.yml rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/appveyor.yml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/AnotherFakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/AnotherFakeApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/AnotherFakeApi.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/AnotherFakeApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/DefaultApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/DefaultApi.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/DefaultApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeApi.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeClassnameTags123Api.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeClassnameTags123Api.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeClassnameTags123Api.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/FakeClassnameTags123Api.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/PetApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/PetApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/PetApi.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/PetApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/StoreApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/StoreApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/StoreApi.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/StoreApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/UserApi.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/UserApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/apis/UserApi.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/apis/UserApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Activity.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Activity.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Activity.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Activity.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ActivityOutputElementRepresentation.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ActivityOutputElementRepresentation.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ActivityOutputElementRepresentation.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/AdditionalPropertiesClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/AdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/AdditionalPropertiesClass.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/AdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Animal.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Animal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Animal.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Animal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ApiResponse.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ApiResponse.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ApiResponse.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ApiResponse.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Apple.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Apple.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Apple.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Apple.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/AppleReq.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/AppleReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/AppleReq.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/AppleReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ArrayOfArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ArrayOfArrayOfNumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ArrayOfArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ArrayOfNumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ArrayOfNumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ArrayTest.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ArrayTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ArrayTest.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ArrayTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Banana.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Banana.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Banana.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Banana.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/BananaReq.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/BananaReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/BananaReq.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/BananaReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/BasquePig.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/BasquePig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/BasquePig.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/BasquePig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Capitalization.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Capitalization.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Capitalization.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Capitalization.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Cat.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Cat.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Cat.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Cat.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/CatAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/CatAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/CatAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/CatAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Category.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Category.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Category.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Category.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ChildCat.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ChildCat.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ChildCat.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ChildCat.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ChildCatAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ChildCatAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ChildCatAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ChildCatAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ClassModel.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ClassModel.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ClassModel.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ClassModel.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ComplexQuadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ComplexQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ComplexQuadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ComplexQuadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/DanishPig.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/DanishPig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/DanishPig.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/DanishPig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/DateOnlyClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/DateOnlyClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/DateOnlyClass.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/DateOnlyClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/DeprecatedObject.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/DeprecatedObject.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/DeprecatedObject.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/DeprecatedObject.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Dog.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Dog.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Dog.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Dog.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/DogAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/DogAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/DogAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/DogAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Drawing.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Drawing.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Drawing.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Drawing.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumArrays.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumArrays.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumArrays.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumArrays.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumClass.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumTest.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumTest.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EquilateralTriangle.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/EquilateralTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EquilateralTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/EquilateralTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/File.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/File.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/File.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/File.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FileSchemaTestClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/FileSchemaTestClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FileSchemaTestClass.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/FileSchemaTestClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Foo.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Foo.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Foo.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Foo.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FooGetDefaultResponse.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/FooGetDefaultResponse.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FooGetDefaultResponse.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/FooGetDefaultResponse.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/FormatTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FormatTest.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/FormatTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Fruit.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Fruit.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Fruit.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Fruit.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FruitReq.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/FruitReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/FruitReq.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/FruitReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/GmFruit.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/GmFruit.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/GmFruit.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/GmFruit.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/GrandparentAnimal.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/GrandparentAnimal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/GrandparentAnimal.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/GrandparentAnimal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/HasOnlyReadOnly.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/HasOnlyReadOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/HasOnlyReadOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/HasOnlyReadOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/HealthCheckResult.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/HealthCheckResult.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/HealthCheckResult.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/HealthCheckResult.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/IsoscelesTriangle.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/IsoscelesTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/IsoscelesTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/IsoscelesTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/List.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/List.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/List.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/List.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/LiteralStringClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/LiteralStringClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/LiteralStringClass.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/LiteralStringClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Mammal.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Mammal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Mammal.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Mammal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/MapTest.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/MapTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/MapTest.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/MapTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Model200Response.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Model200Response.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Model200Response.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Model200Response.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ModelClient.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ModelClient.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ModelClient.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ModelClient.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Name.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Name.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Name.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Name.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableClass.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableGuidClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableGuidClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableGuidClass.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableGuidClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableShape.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableShape.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableShape.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/NullableShape.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/NumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/NumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/NumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/NumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ObjectWithDeprecatedFields.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ObjectWithDeprecatedFields.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ObjectWithDeprecatedFields.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/OneOfString.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/OneOfString.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/OneOfString.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/OneOfString.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Order.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Order.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Order.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Order.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterComposite.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterComposite.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterComposite.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterComposite.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterEnum.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterEnum.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterEnum.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterEnum.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterEnumDefaultValue.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterEnumDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterEnumDefaultValue.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterEnumDefaultValue.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterEnumInteger.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterEnumInteger.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterEnumInteger.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterEnumInteger.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterEnumIntegerDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterEnumIntegerDefaultValue.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/OuterEnumIntegerDefaultValue.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ParentPet.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ParentPet.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ParentPet.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ParentPet.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Pet.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Pet.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Pet.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Pet.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Pig.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Pig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Pig.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Pig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/PolymorphicProperty.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/PolymorphicProperty.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/PolymorphicProperty.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/PolymorphicProperty.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Quadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Quadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Quadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Quadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/QuadrilateralInterface.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/QuadrilateralInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/QuadrilateralInterface.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/QuadrilateralInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ReadOnlyFirst.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ReadOnlyFirst.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ReadOnlyFirst.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ReadOnlyFirst.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Return.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Return.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Return.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Return.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ScaleneTriangle.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ScaleneTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ScaleneTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ScaleneTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Shape.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Shape.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Shape.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Shape.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ShapeInterface.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ShapeInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ShapeInterface.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ShapeInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ShapeOrNull.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ShapeOrNull.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ShapeOrNull.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ShapeOrNull.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/SimpleQuadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/SimpleQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/SimpleQuadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/SimpleQuadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/SpecialModelName.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/SpecialModelName.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/SpecialModelName.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/SpecialModelName.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Tag.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Tag.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Tag.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Tag.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/TestCollectionEndingWithWordList.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/TestCollectionEndingWithWordList.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/TestCollectionEndingWithWordList.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/TestCollectionEndingWithWordListObject.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/TestCollectionEndingWithWordListObject.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/TestCollectionEndingWithWordListObject.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Triangle.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Triangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Triangle.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Triangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/TriangleInterface.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/TriangleInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/TriangleInterface.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/TriangleInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/User.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/User.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/User.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/User.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Whale.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Whale.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Whale.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Whale.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Zebra.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Zebra.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/Zebra.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/Zebra.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ZeroBasedEnum.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ZeroBasedEnum.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ZeroBasedEnum.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ZeroBasedEnum.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ZeroBasedEnumClass.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ZeroBasedEnumClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/ZeroBasedEnumClass.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/models/ZeroBasedEnumClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/scripts/git_push.ps1 b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/scripts/git_push.ps1 similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/scripts/git_push.ps1 rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/scripts/git_push.ps1 diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/scripts/git_push.sh b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/scripts/git_push.sh similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/scripts/git_push.sh rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/docs/scripts/git_push.sh diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CatTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CatTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CatTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DogTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DogTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DogTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FileTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FileTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FileTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FooTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FooTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FooTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FooTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ListTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ListTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ListTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NameTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NameTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NameTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PetTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PetTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PetTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TagTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TagTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TagTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/UserTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/UserTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/UserTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/README.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/README.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/IApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/IApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/IApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/IApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/StoreApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/StoreApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/StoreApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiFactory.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiFactory.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiFactory.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiFactory.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiKeyToken.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiKeyToken.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiKeyToken.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiKeyToken.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/BasicToken.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/BasicToken.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/BasicToken.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/BasicToken.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/BearerToken.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/BearerToken.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/BearerToken.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/BearerToken.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/CookieContainer.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/CookieContainer.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/CookieContainer.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/CookieContainer.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HttpSigningToken.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HttpSigningToken.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HttpSigningToken.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HttpSigningToken.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/OAuthToken.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/OAuthToken.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/OAuthToken.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/OAuthToken.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/TokenBase.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/TokenBase.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/TokenBase.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/TokenContainer`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/TokenContainer`1.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/TokenContainer`1.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/TokenContainer`1.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/TokenProvider`1.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/TokenProvider`1.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/TokenProvider`1.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Activity.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Activity.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Activity.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Animal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Animal.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Animal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ApiResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Apple.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Apple.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Apple.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AppleReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AppleReq.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/AppleReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ArrayTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Banana.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Banana.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Banana.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BananaReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BananaReq.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BananaReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BasquePig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BasquePig.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/BasquePig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Capitalization.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Capitalization.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Capitalization.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Cat.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Cat.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Cat.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/CatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/CatAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/CatAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Category.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ChildCat.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ChildCat.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ChildCat.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ClassModel.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ClassModel.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ClassModel.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DanishPig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DanishPig.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DanishPig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Dog.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Dog.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Dog.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DogAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DogAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/DogAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Drawing.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Drawing.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Drawing.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/File.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/File.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/File.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Foo.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Foo.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Foo.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FormatTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Fruit.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Fruit.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FruitReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FruitReq.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FruitReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GmFruit.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GmFruit.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GmFruit.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/List.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/List.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/List.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Mammal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Mammal.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Mammal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Model200Response.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ModelClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ModelClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ModelClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Name.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableShape.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableShape.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NullableShape.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/NumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OneOfString.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OneOfString.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OneOfString.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Order.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterComposite.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnum.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnum.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnum.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ParentPet.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ParentPet.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ParentPet.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pet.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pig.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Pig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Quadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Quadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Quadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Return.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Shape.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Shape.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Shape.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/SpecialModelName.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Tag.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Tag.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Tag.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Triangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Triangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Triangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TriangleInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TriangleInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/TriangleInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Whale.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Whale.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Whale.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Zebra.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Zebra.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/Zebra.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/README.md b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/README.md rename to samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.gitignore b/samples/client/petstore/csharp/OpenAPIClient-httpclient/.gitignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.gitignore rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/.gitignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator-ignore b/samples/client/petstore/csharp/OpenAPIClient-httpclient/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator-ignore rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/FILES b/samples/client/petstore/csharp/OpenAPIClient-httpclient/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/FILES rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClient-httpclient/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/VERSION rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/Org.OpenAPITools.sln b/samples/client/petstore/csharp/OpenAPIClient-httpclient/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/README.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/README.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/api/openapi.yaml b/samples/client/petstore/csharp/OpenAPIClient-httpclient/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/api/openapi.yaml rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/api/openapi.yaml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/appveyor.yml b/samples/client/petstore/csharp/OpenAPIClient-httpclient/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/appveyor.yml rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/appveyor.yml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Activity.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Activity.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Activity.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Activity.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ActivityOutputElementRepresentation.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ActivityOutputElementRepresentation.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ActivityOutputElementRepresentation.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/AdditionalPropertiesClass.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/AdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/AdditionalPropertiesClass.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/AdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Animal.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Animal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Animal.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Animal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/AnotherFakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/AnotherFakeApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/AnotherFakeApi.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/AnotherFakeApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ApiResponse.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ApiResponse.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ApiResponse.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ApiResponse.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Apple.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Apple.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Apple.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Apple.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/AppleReq.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/AppleReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/AppleReq.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/AppleReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ArrayOfArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ArrayOfArrayOfNumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ArrayOfArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ArrayOfNumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ArrayOfNumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ArrayTest.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ArrayTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ArrayTest.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ArrayTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Banana.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Banana.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Banana.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Banana.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/BananaReq.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/BananaReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/BananaReq.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/BananaReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/BasquePig.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/BasquePig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/BasquePig.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/BasquePig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Capitalization.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Capitalization.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Capitalization.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Capitalization.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Cat.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Cat.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Cat.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Cat.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/CatAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/CatAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/CatAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/CatAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Category.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Category.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Category.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Category.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ChildCat.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ChildCat.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ChildCat.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ChildCat.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ChildCatAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ChildCatAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ChildCatAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ChildCatAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ClassModel.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ClassModel.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ClassModel.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ClassModel.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ComplexQuadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ComplexQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ComplexQuadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ComplexQuadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/DanishPig.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/DanishPig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/DanishPig.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/DanishPig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/DateOnlyClass.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/DateOnlyClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/DateOnlyClass.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/DateOnlyClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/DefaultApi.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/DefaultApi.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/DefaultApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/DeprecatedObject.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/DeprecatedObject.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/DeprecatedObject.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/DeprecatedObject.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Dog.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Dog.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Dog.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Dog.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/DogAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/DogAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/DogAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/DogAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Drawing.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Drawing.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Drawing.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Drawing.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EnumArrays.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/EnumArrays.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EnumArrays.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/EnumArrays.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EnumClass.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/EnumClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EnumClass.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/EnumClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EnumTest.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/EnumTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EnumTest.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/EnumTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EquilateralTriangle.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/EquilateralTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EquilateralTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/EquilateralTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FakeApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FakeApi.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FakeApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FakeClassnameTags123Api.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FakeClassnameTags123Api.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FakeClassnameTags123Api.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FakeClassnameTags123Api.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/File.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/File.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/File.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/File.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FileSchemaTestClass.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FileSchemaTestClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FileSchemaTestClass.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FileSchemaTestClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Foo.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Foo.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Foo.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Foo.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FooGetDefaultResponse.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FooGetDefaultResponse.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FooGetDefaultResponse.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FooGetDefaultResponse.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FormatTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FormatTest.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FormatTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Fruit.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Fruit.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Fruit.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Fruit.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FruitReq.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FruitReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FruitReq.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/FruitReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/GmFruit.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/GmFruit.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/GmFruit.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/GmFruit.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/GrandparentAnimal.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/GrandparentAnimal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/GrandparentAnimal.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/GrandparentAnimal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/HasOnlyReadOnly.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/HasOnlyReadOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/HasOnlyReadOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/HasOnlyReadOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/HealthCheckResult.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/HealthCheckResult.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/HealthCheckResult.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/HealthCheckResult.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/IsoscelesTriangle.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/IsoscelesTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/IsoscelesTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/IsoscelesTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/List.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/List.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/List.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/List.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/LiteralStringClass.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/LiteralStringClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/LiteralStringClass.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/LiteralStringClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Mammal.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Mammal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Mammal.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Mammal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/MapTest.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/MapTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/MapTest.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/MapTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Model200Response.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Model200Response.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Model200Response.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Model200Response.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ModelClient.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ModelClient.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ModelClient.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ModelClient.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Name.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Name.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Name.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Name.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/NullableClass.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/NullableClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/NullableClass.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/NullableClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/NullableGuidClass.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/NullableGuidClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/NullableGuidClass.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/NullableGuidClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/NullableShape.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/NullableShape.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/NullableShape.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/NullableShape.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/NumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/NumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/NumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/NumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ObjectWithDeprecatedFields.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ObjectWithDeprecatedFields.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ObjectWithDeprecatedFields.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OneOfString.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/OneOfString.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OneOfString.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/OneOfString.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Order.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Order.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Order.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Order.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterComposite.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/OuterComposite.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterComposite.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/OuterComposite.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterEnum.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/OuterEnum.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterEnum.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/OuterEnum.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterEnumDefaultValue.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/OuterEnumDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterEnumDefaultValue.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/OuterEnumDefaultValue.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterEnumInteger.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/OuterEnumInteger.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterEnumInteger.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/OuterEnumInteger.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/OuterEnumIntegerDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterEnumIntegerDefaultValue.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/OuterEnumIntegerDefaultValue.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ParentPet.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ParentPet.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ParentPet.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ParentPet.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Pet.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Pet.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Pet.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Pet.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/PetApi.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/PetApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/PetApi.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/PetApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Pig.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Pig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Pig.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Pig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/PolymorphicProperty.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/PolymorphicProperty.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/PolymorphicProperty.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/PolymorphicProperty.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Quadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Quadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Quadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Quadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/QuadrilateralInterface.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/QuadrilateralInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/QuadrilateralInterface.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/QuadrilateralInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ReadOnlyFirst.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ReadOnlyFirst.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ReadOnlyFirst.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ReadOnlyFirst.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Return.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Return.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Return.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Return.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ScaleneTriangle.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ScaleneTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ScaleneTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ScaleneTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Shape.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Shape.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Shape.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Shape.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ShapeInterface.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ShapeInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ShapeInterface.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ShapeInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ShapeOrNull.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ShapeOrNull.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ShapeOrNull.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ShapeOrNull.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/SimpleQuadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/SimpleQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/SimpleQuadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/SimpleQuadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/SpecialModelName.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/SpecialModelName.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/SpecialModelName.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/SpecialModelName.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/StoreApi.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/StoreApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/StoreApi.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/StoreApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Tag.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Tag.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Tag.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Tag.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/TestCollectionEndingWithWordList.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/TestCollectionEndingWithWordList.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/TestCollectionEndingWithWordList.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/TestCollectionEndingWithWordListObject.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/TestCollectionEndingWithWordListObject.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/TestCollectionEndingWithWordListObject.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Triangle.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Triangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Triangle.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Triangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/TriangleInterface.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/TriangleInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/TriangleInterface.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/TriangleInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/User.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/User.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/User.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/User.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/UserApi.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/UserApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/UserApi.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/UserApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Whale.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Whale.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Whale.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Whale.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Zebra.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Zebra.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Zebra.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/Zebra.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ZeroBasedEnum.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ZeroBasedEnum.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ZeroBasedEnum.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ZeroBasedEnum.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ZeroBasedEnumClass.md b/samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ZeroBasedEnumClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ZeroBasedEnumClass.md rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/docs/ZeroBasedEnumClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/git_push.sh b/samples/client/petstore/csharp/OpenAPIClient-httpclient/git_push.sh similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/git_push.sh rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/git_push.sh diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/PetApiTestsV2.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/PetApiTestsV2.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/PetApiTestsV2.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/PetApiTestsV2.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/UserApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/UserApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Api/UserApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ActivityTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ActivityTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ActivityTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ActivityTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AnimalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AnimalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AppleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AppleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/AppleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/BananaTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/BananaTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/BananaTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CatTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CatTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CatTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CategoryTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CategoryTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/CategoryTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DogTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DogTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DogTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DrawingTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DrawingTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DrawingTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/DrawingTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FileTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FileTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FileTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FooTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FooTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FooTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FooTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FruitTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FruitTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/FruitTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ListTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ListTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ListTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MammalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MammalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MammalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MapTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MapTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MapTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NameTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NameTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NameTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OrderTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OrderTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OrderTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/PetTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/PetTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/PetTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/PigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/PigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/PigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ReturnTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ReturnTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ReturnTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ShapeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ShapeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TagTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TagTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TagTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/TriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/UserTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/UserTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/UserTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/WhaleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/WhaleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/WhaleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/WhaleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ZebraTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ZebraTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ZebraTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ZebraTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/linux-logo.png b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/linux-logo.png similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/linux-logo.png rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools.Test/linux-logo.png diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/FakeApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/FakeApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/FakeApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/PetApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/PetApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/PetApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/StoreApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/StoreApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/StoreApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/UserApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/UserApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Api/UserApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/Configuration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/Configuration.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/Configuration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ExceptionFactory.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ExceptionFactory.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ExceptionFactory.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/FileParameter.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/FileParameter.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/FileParameter.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/FileParameter.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/GlobalConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/GlobalConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/GlobalConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/IApiAccessor.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/IApiAccessor.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/IApiAccessor.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/IAsynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/IAsynchronousClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/IAsynchronousClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ISynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ISynchronousClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ISynchronousClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/Multimap.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/Multimap.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/Multimap.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/RequestOptions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/RequestOptions.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/RequestOptions.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/RetryConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/RetryConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/RetryConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/WebRequestPathBuilder.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/WebRequestPathBuilder.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/WebRequestPathBuilder.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/WebRequestPathBuilder.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Activity.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Activity.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Activity.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Animal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Animal.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Animal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ApiResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ApiResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Apple.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Apple.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Apple.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AppleReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AppleReq.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/AppleReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ArrayTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Banana.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Banana.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Banana.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BananaReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BananaReq.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BananaReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BasquePig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BasquePig.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/BasquePig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Capitalization.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Capitalization.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Capitalization.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Cat.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Cat.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Cat.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/CatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/CatAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/CatAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Category.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Category.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Category.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ChildCat.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ChildCat.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ChildCat.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ChildCatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ChildCatAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ChildCatAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ClassModel.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ClassModel.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ClassModel.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DanishPig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DanishPig.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DanishPig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DateOnlyClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DateOnlyClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DateOnlyClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DeprecatedObject.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DeprecatedObject.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DeprecatedObject.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Dog.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Dog.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Dog.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DogAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DogAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/DogAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Drawing.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Drawing.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Drawing.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumArrays.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumArrays.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumArrays.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EquilateralTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EquilateralTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EquilateralTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/File.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/File.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/File.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Foo.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Foo.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Foo.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FormatTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Fruit.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Fruit.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FruitReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FruitReq.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FruitReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/GmFruit.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/GmFruit.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/GmFruit.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/GrandparentAnimal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/GrandparentAnimal.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/GrandparentAnimal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/HealthCheckResult.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/HealthCheckResult.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/HealthCheckResult.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/List.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/List.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/List.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/LiteralStringClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/LiteralStringClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/LiteralStringClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Mammal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Mammal.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Mammal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MapTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MapTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MapTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Model200Response.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Model200Response.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Model200Response.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ModelClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ModelClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ModelClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Name.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Name.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Name.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableGuidClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableGuidClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableGuidClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableShape.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableShape.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableShape.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OneOfString.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OneOfString.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OneOfString.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Order.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Order.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Order.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterComposite.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterComposite.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterComposite.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnum.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnum.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnum.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ParentPet.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ParentPet.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ParentPet.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pet.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pet.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pet.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pig.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/PolymorphicProperty.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/PolymorphicProperty.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/PolymorphicProperty.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Quadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Quadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Quadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Return.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Return.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Return.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ScaleneTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ScaleneTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ScaleneTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Shape.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Shape.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Shape.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeOrNull.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeOrNull.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeOrNull.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SpecialModelName.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SpecialModelName.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/SpecialModelName.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Tag.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Tag.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Tag.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Triangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Triangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Triangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TriangleInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TriangleInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/TriangleInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/User.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/User.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Whale.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Whale.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Whale.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Zebra.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Zebra.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Zebra.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/OpenAPIClient-httpclient/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.gitignore b/samples/client/petstore/csharp/OpenAPIClient-net47/.gitignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.gitignore rename to samples/client/petstore/csharp/OpenAPIClient-net47/.gitignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator-ignore b/samples/client/petstore/csharp/OpenAPIClient-net47/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator-ignore rename to samples/client/petstore/csharp/OpenAPIClient-net47/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/FILES b/samples/client/petstore/csharp/OpenAPIClient-net47/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/FILES rename to samples/client/petstore/csharp/OpenAPIClient-net47/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClient-net47/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/VERSION rename to samples/client/petstore/csharp/OpenAPIClient-net47/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/Org.OpenAPITools.sln b/samples/client/petstore/csharp/OpenAPIClient-net47/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/OpenAPIClient-net47/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/README.md b/samples/client/petstore/csharp/OpenAPIClient-net47/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/README.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/api/openapi.yaml b/samples/client/petstore/csharp/OpenAPIClient-net47/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/api/openapi.yaml rename to samples/client/petstore/csharp/OpenAPIClient-net47/api/openapi.yaml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/appveyor.yml b/samples/client/petstore/csharp/OpenAPIClient-net47/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/appveyor.yml rename to samples/client/petstore/csharp/OpenAPIClient-net47/appveyor.yml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Activity.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Activity.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Activity.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/Activity.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ActivityOutputElementRepresentation.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ActivityOutputElementRepresentation.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ActivityOutputElementRepresentation.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/AdditionalPropertiesClass.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/AdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/AdditionalPropertiesClass.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/AdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Animal.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Animal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Animal.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/Animal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/AnotherFakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/AnotherFakeApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/AnotherFakeApi.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/AnotherFakeApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ApiResponse.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ApiResponse.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ApiResponse.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/ApiResponse.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Apple.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Apple.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Apple.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/Apple.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/AppleReq.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/AppleReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/AppleReq.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/AppleReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ArrayOfArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ArrayOfArrayOfNumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/ArrayOfArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ArrayOfNumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ArrayOfNumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/ArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ArrayTest.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ArrayTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ArrayTest.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/ArrayTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Banana.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Banana.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Banana.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/Banana.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/BananaReq.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/BananaReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/BananaReq.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/BananaReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/BasquePig.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/BasquePig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/BasquePig.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/BasquePig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Capitalization.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Capitalization.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Capitalization.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/Capitalization.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Cat.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Cat.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Cat.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/Cat.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/CatAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/CatAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/CatAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/CatAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Category.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Category.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Category.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/Category.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ChildCat.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ChildCat.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ChildCat.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/ChildCat.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ChildCatAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ChildCatAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ChildCatAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/ChildCatAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ClassModel.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ClassModel.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ClassModel.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/ClassModel.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ComplexQuadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ComplexQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ComplexQuadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/ComplexQuadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/DanishPig.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/DanishPig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/DanishPig.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/DanishPig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/DateOnlyClass.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/DateOnlyClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/DateOnlyClass.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/DateOnlyClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/DefaultApi.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/DefaultApi.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/DefaultApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/DeprecatedObject.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/DeprecatedObject.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/DeprecatedObject.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/DeprecatedObject.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Dog.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Dog.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Dog.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/Dog.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/DogAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/DogAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/DogAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/DogAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Drawing.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Drawing.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Drawing.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/Drawing.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EnumArrays.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/EnumArrays.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EnumArrays.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/EnumArrays.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EnumClass.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/EnumClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EnumClass.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/EnumClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EnumTest.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/EnumTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EnumTest.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/EnumTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EquilateralTriangle.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/EquilateralTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EquilateralTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/EquilateralTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/FakeApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FakeApi.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/FakeApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FakeClassnameTags123Api.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/FakeClassnameTags123Api.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FakeClassnameTags123Api.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/FakeClassnameTags123Api.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/File.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/File.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/File.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/File.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FileSchemaTestClass.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/FileSchemaTestClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FileSchemaTestClass.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/FileSchemaTestClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Foo.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Foo.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Foo.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/Foo.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FooGetDefaultResponse.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/FooGetDefaultResponse.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FooGetDefaultResponse.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/FooGetDefaultResponse.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/FormatTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FormatTest.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/FormatTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Fruit.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Fruit.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Fruit.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/Fruit.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FruitReq.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/FruitReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FruitReq.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/FruitReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/GmFruit.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/GmFruit.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/GmFruit.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/GmFruit.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/GrandparentAnimal.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/GrandparentAnimal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/GrandparentAnimal.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/GrandparentAnimal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/HasOnlyReadOnly.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/HasOnlyReadOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/HasOnlyReadOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/HasOnlyReadOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/HealthCheckResult.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/HealthCheckResult.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/HealthCheckResult.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/HealthCheckResult.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/IsoscelesTriangle.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/IsoscelesTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/IsoscelesTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/IsoscelesTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/List.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/List.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/List.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/List.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/LiteralStringClass.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/LiteralStringClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/LiteralStringClass.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/LiteralStringClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Mammal.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Mammal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Mammal.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/Mammal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/MapTest.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/MapTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/MapTest.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/MapTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/MixedPropertiesAndAdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/MixedPropertiesAndAdditionalPropertiesClass.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/MixedPropertiesAndAdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Model200Response.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Model200Response.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Model200Response.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/Model200Response.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ModelClient.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ModelClient.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ModelClient.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/ModelClient.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Name.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Name.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Name.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/Name.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/NullableClass.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/NullableClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/NullableClass.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/NullableClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/NullableGuidClass.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/NullableGuidClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/NullableGuidClass.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/NullableGuidClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/NullableShape.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/NullableShape.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/NullableShape.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/NullableShape.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/NumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/NumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/NumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/NumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ObjectWithDeprecatedFields.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ObjectWithDeprecatedFields.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/ObjectWithDeprecatedFields.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OneOfString.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/OneOfString.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OneOfString.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/OneOfString.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Order.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Order.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Order.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/Order.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterComposite.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/OuterComposite.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterComposite.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/OuterComposite.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterEnum.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/OuterEnum.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterEnum.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/OuterEnum.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterEnumDefaultValue.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/OuterEnumDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterEnumDefaultValue.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/OuterEnumDefaultValue.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterEnumInteger.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/OuterEnumInteger.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterEnumInteger.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/OuterEnumInteger.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/OuterEnumIntegerDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterEnumIntegerDefaultValue.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/OuterEnumIntegerDefaultValue.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ParentPet.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ParentPet.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ParentPet.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/ParentPet.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Pet.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Pet.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Pet.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/Pet.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/PetApi.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/PetApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/PetApi.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/PetApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Pig.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Pig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Pig.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/Pig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/PolymorphicProperty.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/PolymorphicProperty.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/PolymorphicProperty.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/PolymorphicProperty.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Quadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Quadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Quadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/Quadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/QuadrilateralInterface.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/QuadrilateralInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/QuadrilateralInterface.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/QuadrilateralInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ReadOnlyFirst.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ReadOnlyFirst.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ReadOnlyFirst.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/ReadOnlyFirst.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Return.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Return.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Return.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/Return.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ScaleneTriangle.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ScaleneTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ScaleneTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/ScaleneTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Shape.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Shape.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Shape.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/Shape.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ShapeInterface.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ShapeInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ShapeInterface.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/ShapeInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ShapeOrNull.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ShapeOrNull.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ShapeOrNull.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/ShapeOrNull.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/SimpleQuadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/SimpleQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/SimpleQuadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/SimpleQuadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/SpecialModelName.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/SpecialModelName.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/SpecialModelName.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/SpecialModelName.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/StoreApi.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/StoreApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/StoreApi.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/StoreApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Tag.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Tag.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Tag.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/Tag.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/TestCollectionEndingWithWordList.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/TestCollectionEndingWithWordList.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/TestCollectionEndingWithWordList.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/TestCollectionEndingWithWordListObject.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/TestCollectionEndingWithWordListObject.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/TestCollectionEndingWithWordListObject.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Triangle.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Triangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Triangle.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/Triangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/TriangleInterface.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/TriangleInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/TriangleInterface.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/TriangleInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/User.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/User.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/User.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/User.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/UserApi.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/UserApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/UserApi.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/UserApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Whale.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Whale.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Whale.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/Whale.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Zebra.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/Zebra.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Zebra.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/Zebra.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ZeroBasedEnum.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ZeroBasedEnum.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ZeroBasedEnum.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/ZeroBasedEnum.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ZeroBasedEnumClass.md b/samples/client/petstore/csharp/OpenAPIClient-net47/docs/ZeroBasedEnumClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ZeroBasedEnumClass.md rename to samples/client/petstore/csharp/OpenAPIClient-net47/docs/ZeroBasedEnumClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/git_push.sh b/samples/client/petstore/csharp/OpenAPIClient-net47/git_push.sh similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/git_push.sh rename to samples/client/petstore/csharp/OpenAPIClient-net47/git_push.sh diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/PetApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/PetApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/PetApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/UserApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/UserApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Api/UserApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ActivityTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ActivityTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ActivityTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ActivityTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AnimalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AnimalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AppleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AppleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/AppleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/BananaTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/BananaTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/BananaTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CatTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CatTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CatTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CategoryTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CategoryTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/CategoryTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DogTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DogTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DogTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DrawingTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DrawingTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DrawingTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/DrawingTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FileTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FileTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FileTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FooTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FooTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FooTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FooTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FruitTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FruitTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/FruitTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ListTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ListTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ListTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MammalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MammalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MammalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MapTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MapTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MapTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NameTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NameTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NameTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OrderTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OrderTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OrderTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/PetTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/PetTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/PetTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/PigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/PigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/PigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ReturnTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ReturnTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ReturnTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ShapeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ShapeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TagTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TagTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TagTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/TriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/UserTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/UserTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/UserTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/WhaleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/WhaleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/WhaleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/WhaleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ZebraTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ZebraTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ZebraTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ZebraTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/AnotherFakeApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/AnotherFakeApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/AnotherFakeApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/FakeApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/FakeApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/FakeApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/PetApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/PetApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/PetApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/StoreApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/StoreApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/StoreApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/UserApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Api/UserApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Api/UserApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Configuration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Configuration.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Configuration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ExceptionFactory.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ExceptionFactory.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ExceptionFactory.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/GlobalConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/GlobalConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/GlobalConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpMethod.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpMethod.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpMethod.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpMethod.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/IApiAccessor.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/IApiAccessor.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/IApiAccessor.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/IAsynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/IAsynchronousClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/IAsynchronousClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/IReadableConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/IReadableConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/IReadableConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ISynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ISynchronousClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ISynchronousClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Multimap.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Multimap.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Multimap.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/RequestOptions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/RequestOptions.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/RequestOptions.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/RetryConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/RetryConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/RetryConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Activity.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Activity.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Activity.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Animal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Animal.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Animal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ApiResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ApiResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Apple.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Apple.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Apple.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AppleReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AppleReq.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/AppleReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ArrayTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Banana.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Banana.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Banana.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BananaReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BananaReq.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BananaReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BasquePig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BasquePig.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/BasquePig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Capitalization.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Capitalization.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Capitalization.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Cat.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Cat.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Cat.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/CatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/CatAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/CatAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Category.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Category.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Category.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ChildCat.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ChildCat.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ChildCat.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ChildCatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ChildCatAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ChildCatAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ClassModel.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ClassModel.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ClassModel.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DanishPig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DanishPig.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DanishPig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DateOnlyClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DateOnlyClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DateOnlyClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DeprecatedObject.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DeprecatedObject.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DeprecatedObject.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Dog.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Dog.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Dog.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DogAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DogAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/DogAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Drawing.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Drawing.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Drawing.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumArrays.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumArrays.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumArrays.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EquilateralTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EquilateralTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EquilateralTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/File.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/File.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/File.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Foo.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Foo.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Foo.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FormatTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Fruit.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Fruit.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FruitReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FruitReq.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FruitReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GmFruit.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GmFruit.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GmFruit.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GrandparentAnimal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GrandparentAnimal.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GrandparentAnimal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/HealthCheckResult.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/HealthCheckResult.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/HealthCheckResult.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/List.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/List.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/List.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/LiteralStringClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/LiteralStringClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/LiteralStringClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Mammal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Mammal.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Mammal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MapTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MapTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MapTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Model200Response.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Model200Response.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Model200Response.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ModelClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ModelClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ModelClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Name.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Name.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Name.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableGuidClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableGuidClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableGuidClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableShape.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableShape.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableShape.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OneOfString.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OneOfString.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OneOfString.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Order.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Order.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Order.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterComposite.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterComposite.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterComposite.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnum.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnum.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnum.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumInteger.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumInteger.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumInteger.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ParentPet.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ParentPet.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ParentPet.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pet.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pet.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pet.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pig.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/PolymorphicProperty.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/PolymorphicProperty.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/PolymorphicProperty.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Quadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Quadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Quadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Return.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Return.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Return.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ScaleneTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ScaleneTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ScaleneTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Shape.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Shape.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Shape.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeOrNull.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeOrNull.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeOrNull.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SpecialModelName.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SpecialModelName.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/SpecialModelName.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Tag.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Tag.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Tag.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Triangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Triangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Triangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TriangleInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TriangleInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/TriangleInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/User.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/User.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Whale.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Whale.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Whale.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Zebra.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Zebra.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Zebra.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.gitignore b/samples/client/petstore/csharp/OpenAPIClient-net48/.gitignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.gitignore rename to samples/client/petstore/csharp/OpenAPIClient-net48/.gitignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator-ignore b/samples/client/petstore/csharp/OpenAPIClient-net48/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator-ignore rename to samples/client/petstore/csharp/OpenAPIClient-net48/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/FILES b/samples/client/petstore/csharp/OpenAPIClient-net48/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/FILES rename to samples/client/petstore/csharp/OpenAPIClient-net48/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClient-net48/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/.openapi-generator/VERSION rename to samples/client/petstore/csharp/OpenAPIClient-net48/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/Org.OpenAPITools.sln b/samples/client/petstore/csharp/OpenAPIClient-net48/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/OpenAPIClient-net48/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/README.md b/samples/client/petstore/csharp/OpenAPIClient-net48/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/README.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/api/openapi.yaml b/samples/client/petstore/csharp/OpenAPIClient-net48/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/api/openapi.yaml rename to samples/client/petstore/csharp/OpenAPIClient-net48/api/openapi.yaml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/appveyor.yml b/samples/client/petstore/csharp/OpenAPIClient-net48/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/appveyor.yml rename to samples/client/petstore/csharp/OpenAPIClient-net48/appveyor.yml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Activity.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Activity.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Activity.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/Activity.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ActivityOutputElementRepresentation.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ActivityOutputElementRepresentation.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ActivityOutputElementRepresentation.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/AdditionalPropertiesClass.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/AdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/AdditionalPropertiesClass.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/AdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Animal.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Animal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Animal.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/Animal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/AnotherFakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/AnotherFakeApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/AnotherFakeApi.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/AnotherFakeApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ApiResponse.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ApiResponse.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ApiResponse.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/ApiResponse.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Apple.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Apple.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Apple.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/Apple.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/AppleReq.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/AppleReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/AppleReq.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/AppleReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ArrayOfArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ArrayOfArrayOfNumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/ArrayOfArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ArrayOfNumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ArrayOfNumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/ArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ArrayTest.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ArrayTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ArrayTest.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/ArrayTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Banana.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Banana.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Banana.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/Banana.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/BananaReq.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/BananaReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/BananaReq.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/BananaReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/BasquePig.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/BasquePig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/BasquePig.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/BasquePig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Capitalization.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Capitalization.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Capitalization.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/Capitalization.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Cat.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Cat.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Cat.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/Cat.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/CatAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/CatAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/CatAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/CatAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Category.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Category.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Category.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/Category.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ChildCat.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ChildCat.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ChildCat.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/ChildCat.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ChildCatAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ChildCatAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ChildCatAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/ChildCatAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ClassModel.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ClassModel.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ClassModel.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/ClassModel.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ComplexQuadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ComplexQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ComplexQuadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/ComplexQuadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/DanishPig.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/DanishPig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/DanishPig.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/DanishPig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/DateOnlyClass.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/DateOnlyClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/DateOnlyClass.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/DateOnlyClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/DefaultApi.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/DefaultApi.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/DefaultApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/DeprecatedObject.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/DeprecatedObject.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/DeprecatedObject.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/DeprecatedObject.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Dog.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Dog.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Dog.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/Dog.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/DogAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/DogAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/DogAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/DogAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Drawing.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Drawing.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Drawing.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/Drawing.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/EnumArrays.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/EnumArrays.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/EnumArrays.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/EnumArrays.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/EnumClass.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/EnumClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/EnumClass.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/EnumClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/EnumTest.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/EnumTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/EnumTest.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/EnumTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/EquilateralTriangle.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/EquilateralTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/EquilateralTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/EquilateralTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/FakeApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/FakeApi.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/FakeApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/FakeClassnameTags123Api.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/FakeClassnameTags123Api.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/FakeClassnameTags123Api.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/FakeClassnameTags123Api.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/File.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/File.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/File.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/File.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/FileSchemaTestClass.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/FileSchemaTestClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/FileSchemaTestClass.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/FileSchemaTestClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Foo.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Foo.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Foo.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/Foo.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/FooGetDefaultResponse.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/FooGetDefaultResponse.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/FooGetDefaultResponse.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/FooGetDefaultResponse.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/FormatTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/FormatTest.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/FormatTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Fruit.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Fruit.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Fruit.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/Fruit.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/FruitReq.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/FruitReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/FruitReq.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/FruitReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/GmFruit.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/GmFruit.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/GmFruit.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/GmFruit.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/GrandparentAnimal.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/GrandparentAnimal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/GrandparentAnimal.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/GrandparentAnimal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/HasOnlyReadOnly.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/HasOnlyReadOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/HasOnlyReadOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/HasOnlyReadOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/HealthCheckResult.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/HealthCheckResult.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/HealthCheckResult.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/HealthCheckResult.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/IsoscelesTriangle.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/IsoscelesTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/IsoscelesTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/IsoscelesTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/List.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/List.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/List.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/List.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/LiteralStringClass.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/LiteralStringClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/LiteralStringClass.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/LiteralStringClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Mammal.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Mammal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Mammal.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/Mammal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/MapTest.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/MapTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/MapTest.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/MapTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/MixedPropertiesAndAdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/MixedPropertiesAndAdditionalPropertiesClass.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/MixedPropertiesAndAdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Model200Response.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Model200Response.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Model200Response.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/Model200Response.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ModelClient.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ModelClient.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ModelClient.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/ModelClient.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Name.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Name.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Name.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/Name.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/NullableClass.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/NullableClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/NullableClass.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/NullableClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/NullableGuidClass.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/NullableGuidClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/NullableGuidClass.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/NullableGuidClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/NullableShape.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/NullableShape.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/NullableShape.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/NullableShape.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/NumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/NumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/NumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/NumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ObjectWithDeprecatedFields.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ObjectWithDeprecatedFields.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/ObjectWithDeprecatedFields.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/OneOfString.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/OneOfString.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/OneOfString.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/OneOfString.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Order.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Order.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Order.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/Order.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/OuterComposite.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/OuterComposite.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/OuterComposite.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/OuterComposite.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/OuterEnum.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/OuterEnum.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/OuterEnum.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/OuterEnum.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/OuterEnumDefaultValue.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/OuterEnumDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/OuterEnumDefaultValue.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/OuterEnumDefaultValue.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/OuterEnumInteger.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/OuterEnumInteger.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/OuterEnumInteger.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/OuterEnumInteger.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/OuterEnumIntegerDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/OuterEnumIntegerDefaultValue.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/OuterEnumIntegerDefaultValue.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ParentPet.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ParentPet.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ParentPet.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/ParentPet.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Pet.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Pet.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Pet.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/Pet.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/PetApi.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/PetApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/PetApi.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/PetApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Pig.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Pig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Pig.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/Pig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/PolymorphicProperty.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/PolymorphicProperty.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/PolymorphicProperty.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/PolymorphicProperty.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Quadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Quadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Quadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/Quadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/QuadrilateralInterface.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/QuadrilateralInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/QuadrilateralInterface.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/QuadrilateralInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ReadOnlyFirst.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ReadOnlyFirst.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ReadOnlyFirst.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/ReadOnlyFirst.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Return.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Return.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Return.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/Return.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ScaleneTriangle.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ScaleneTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ScaleneTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/ScaleneTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Shape.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Shape.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Shape.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/Shape.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ShapeInterface.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ShapeInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ShapeInterface.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/ShapeInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ShapeOrNull.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ShapeOrNull.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ShapeOrNull.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/ShapeOrNull.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/SimpleQuadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/SimpleQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/SimpleQuadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/SimpleQuadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/SpecialModelName.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/SpecialModelName.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/SpecialModelName.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/SpecialModelName.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/StoreApi.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/StoreApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/StoreApi.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/StoreApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Tag.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Tag.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Tag.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/Tag.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/TestCollectionEndingWithWordList.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/TestCollectionEndingWithWordList.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/TestCollectionEndingWithWordList.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/TestCollectionEndingWithWordListObject.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/TestCollectionEndingWithWordListObject.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/TestCollectionEndingWithWordListObject.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Triangle.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Triangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Triangle.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/Triangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/TriangleInterface.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/TriangleInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/TriangleInterface.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/TriangleInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/User.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/User.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/User.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/User.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/UserApi.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/UserApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/UserApi.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/UserApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Whale.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Whale.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Whale.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/Whale.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Zebra.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/Zebra.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/Zebra.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/Zebra.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ZeroBasedEnum.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ZeroBasedEnum.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ZeroBasedEnum.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/ZeroBasedEnum.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ZeroBasedEnumClass.md b/samples/client/petstore/csharp/OpenAPIClient-net48/docs/ZeroBasedEnumClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/ZeroBasedEnumClass.md rename to samples/client/petstore/csharp/OpenAPIClient-net48/docs/ZeroBasedEnumClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/git_push.sh b/samples/client/petstore/csharp/OpenAPIClient-net48/git_push.sh similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/git_push.sh rename to samples/client/petstore/csharp/OpenAPIClient-net48/git_push.sh diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/PetApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/PetApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/PetApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/UserApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/UserApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Api/UserApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ActivityTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ActivityTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ActivityTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ActivityTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AnimalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AnimalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AppleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AppleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/AppleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/BananaTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/BananaTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/BananaTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CatTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CatTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CatTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CategoryTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CategoryTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/CategoryTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DogTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DogTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DogTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DrawingTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DrawingTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DrawingTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/DrawingTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FileTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FileTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FileTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FooTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FooTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FooTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FooTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FruitTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FruitTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/FruitTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ListTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ListTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ListTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MammalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MammalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MammalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MapTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MapTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MapTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NameTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NameTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NameTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OrderTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OrderTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OrderTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/PetTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/PetTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/PetTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/PigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/PigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/PigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ReturnTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ReturnTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ReturnTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ShapeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ShapeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TagTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TagTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TagTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/TriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/UserTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/UserTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/UserTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/WhaleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/WhaleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/WhaleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/WhaleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ZebraTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ZebraTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ZebraTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ZebraTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/AnotherFakeApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Api/AnotherFakeApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/AnotherFakeApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/FakeApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Api/FakeApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/FakeApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/PetApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Api/PetApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/PetApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/StoreApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Api/StoreApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/StoreApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/UserApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Api/UserApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Api/UserApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ApiClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ApiClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ApiClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ApiResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ApiResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Configuration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Configuration.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Configuration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ExceptionFactory.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ExceptionFactory.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ExceptionFactory.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/GlobalConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/GlobalConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/GlobalConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/HttpMethod.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/HttpMethod.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/HttpMethod.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/HttpMethod.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/IApiAccessor.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/IApiAccessor.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/IApiAccessor.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/IAsynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/IAsynchronousClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/IAsynchronousClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/IReadableConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/IReadableConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/IReadableConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ISynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ISynchronousClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ISynchronousClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Multimap.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Multimap.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Multimap.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/RequestOptions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/RequestOptions.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/RequestOptions.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/RetryConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/RetryConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/RetryConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Activity.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Activity.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Activity.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Animal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Animal.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Animal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ApiResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ApiResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Apple.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Apple.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Apple.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AppleReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AppleReq.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/AppleReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ArrayTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Banana.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Banana.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Banana.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/BananaReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/BananaReq.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/BananaReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/BasquePig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/BasquePig.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/BasquePig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Capitalization.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Capitalization.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Capitalization.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Cat.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Cat.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Cat.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/CatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/CatAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/CatAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Category.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Category.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Category.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ChildCat.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ChildCat.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ChildCat.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ChildCatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ChildCatAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ChildCatAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ClassModel.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ClassModel.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ClassModel.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DanishPig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DanishPig.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DanishPig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DateOnlyClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DateOnlyClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DateOnlyClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DeprecatedObject.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DeprecatedObject.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DeprecatedObject.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Dog.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Dog.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Dog.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DogAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DogAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/DogAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Drawing.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Drawing.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Drawing.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumArrays.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumArrays.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumArrays.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EquilateralTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EquilateralTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EquilateralTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/File.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/File.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/File.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Foo.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Foo.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Foo.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FormatTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Fruit.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Fruit.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FruitReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FruitReq.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/FruitReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/GmFruit.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/GmFruit.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/GmFruit.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/GrandparentAnimal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/GrandparentAnimal.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/GrandparentAnimal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/HealthCheckResult.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/HealthCheckResult.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/HealthCheckResult.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/List.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/List.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/List.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/LiteralStringClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/LiteralStringClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/LiteralStringClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Mammal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Mammal.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Mammal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MapTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MapTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MapTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Model200Response.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Model200Response.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Model200Response.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ModelClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ModelClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ModelClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Name.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Name.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Name.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableGuidClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableGuidClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableGuidClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableShape.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableShape.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NullableShape.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/NumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OneOfString.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OneOfString.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OneOfString.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Order.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Order.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Order.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterComposite.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterComposite.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterComposite.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnum.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnum.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnum.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumInteger.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumInteger.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumInteger.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ParentPet.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ParentPet.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ParentPet.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Pet.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Pet.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Pet.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Pig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Pig.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Pig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/PolymorphicProperty.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/PolymorphicProperty.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/PolymorphicProperty.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Quadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Quadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Quadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Return.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Return.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Return.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ScaleneTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ScaleneTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ScaleneTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Shape.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Shape.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Shape.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ShapeInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ShapeInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ShapeInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ShapeOrNull.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ShapeOrNull.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ShapeOrNull.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/SpecialModelName.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/SpecialModelName.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/SpecialModelName.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Tag.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Tag.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Tag.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Triangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Triangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Triangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TriangleInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TriangleInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/TriangleInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/User.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/User.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Whale.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Whale.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Whale.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Zebra.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Zebra.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/Zebra.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.gitignore b/samples/client/petstore/csharp/OpenAPIClient-net5.0/.gitignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.gitignore rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/.gitignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator-ignore b/samples/client/petstore/csharp/OpenAPIClient-net5.0/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator-ignore rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/FILES b/samples/client/petstore/csharp/OpenAPIClient-net5.0/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/FILES rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClient-net5.0/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/VERSION rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/Org.OpenAPITools.sln b/samples/client/petstore/csharp/OpenAPIClient-net5.0/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/README.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/README.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/api/openapi.yaml b/samples/client/petstore/csharp/OpenAPIClient-net5.0/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/api/openapi.yaml rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/api/openapi.yaml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/appveyor.yml b/samples/client/petstore/csharp/OpenAPIClient-net5.0/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/appveyor.yml rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/appveyor.yml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Activity.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Activity.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Activity.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Activity.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ActivityOutputElementRepresentation.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ActivityOutputElementRepresentation.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ActivityOutputElementRepresentation.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/AdditionalPropertiesClass.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/AdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/AdditionalPropertiesClass.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/AdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Animal.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Animal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Animal.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Animal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/AnotherFakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/AnotherFakeApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/AnotherFakeApi.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/AnotherFakeApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ApiResponse.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ApiResponse.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ApiResponse.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ApiResponse.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Apple.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Apple.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Apple.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Apple.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/AppleReq.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/AppleReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/AppleReq.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/AppleReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ArrayOfArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ArrayOfArrayOfNumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ArrayOfArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ArrayOfNumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ArrayOfNumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ArrayTest.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ArrayTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ArrayTest.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ArrayTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Banana.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Banana.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Banana.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Banana.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/BananaReq.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/BananaReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/BananaReq.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/BananaReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/BasquePig.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/BasquePig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/BasquePig.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/BasquePig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Capitalization.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Capitalization.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Capitalization.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Capitalization.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Cat.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Cat.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Cat.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Cat.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/CatAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/CatAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/CatAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/CatAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Category.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Category.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Category.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Category.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ChildCat.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ChildCat.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ChildCat.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ChildCat.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ChildCatAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ChildCatAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ChildCatAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ChildCatAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ClassModel.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ClassModel.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ClassModel.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ClassModel.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ComplexQuadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ComplexQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ComplexQuadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ComplexQuadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/DanishPig.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/DanishPig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/DanishPig.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/DanishPig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/DateOnlyClass.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/DateOnlyClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/DateOnlyClass.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/DateOnlyClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/DefaultApi.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/DefaultApi.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/DefaultApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/DeprecatedObject.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/DeprecatedObject.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/DeprecatedObject.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/DeprecatedObject.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Dog.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Dog.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Dog.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Dog.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/DogAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/DogAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/DogAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/DogAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Drawing.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Drawing.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Drawing.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Drawing.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EnumArrays.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/EnumArrays.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EnumArrays.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/EnumArrays.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EnumClass.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/EnumClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EnumClass.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/EnumClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EnumTest.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/EnumTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EnumTest.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/EnumTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EquilateralTriangle.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/EquilateralTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EquilateralTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/EquilateralTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FakeApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FakeApi.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FakeApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FakeClassnameTags123Api.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FakeClassnameTags123Api.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FakeClassnameTags123Api.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FakeClassnameTags123Api.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/File.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/File.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/File.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/File.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FileSchemaTestClass.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FileSchemaTestClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FileSchemaTestClass.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FileSchemaTestClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Foo.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Foo.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Foo.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Foo.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FooGetDefaultResponse.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FooGetDefaultResponse.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FooGetDefaultResponse.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FooGetDefaultResponse.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FormatTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FormatTest.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FormatTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Fruit.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Fruit.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Fruit.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Fruit.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FruitReq.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FruitReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FruitReq.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/FruitReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/GmFruit.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/GmFruit.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/GmFruit.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/GmFruit.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/GrandparentAnimal.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/GrandparentAnimal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/GrandparentAnimal.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/GrandparentAnimal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/HasOnlyReadOnly.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/HasOnlyReadOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/HasOnlyReadOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/HasOnlyReadOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/HealthCheckResult.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/HealthCheckResult.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/HealthCheckResult.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/HealthCheckResult.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/IsoscelesTriangle.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/IsoscelesTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/IsoscelesTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/IsoscelesTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/List.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/List.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/List.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/List.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/LiteralStringClass.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/LiteralStringClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/LiteralStringClass.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/LiteralStringClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Mammal.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Mammal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Mammal.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Mammal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/MapTest.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/MapTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/MapTest.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/MapTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/MixedPropertiesAndAdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/MixedPropertiesAndAdditionalPropertiesClass.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/MixedPropertiesAndAdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Model200Response.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Model200Response.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Model200Response.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Model200Response.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ModelClient.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ModelClient.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ModelClient.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ModelClient.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Name.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Name.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Name.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Name.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/NullableClass.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/NullableClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/NullableClass.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/NullableClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/NullableGuidClass.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/NullableGuidClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/NullableGuidClass.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/NullableGuidClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/NullableShape.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/NullableShape.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/NullableShape.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/NullableShape.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/NumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/NumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/NumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/NumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ObjectWithDeprecatedFields.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ObjectWithDeprecatedFields.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ObjectWithDeprecatedFields.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OneOfString.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/OneOfString.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OneOfString.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/OneOfString.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Order.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Order.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Order.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Order.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterComposite.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/OuterComposite.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterComposite.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/OuterComposite.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterEnum.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/OuterEnum.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterEnum.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/OuterEnum.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterEnumDefaultValue.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/OuterEnumDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterEnumDefaultValue.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/OuterEnumDefaultValue.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterEnumInteger.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/OuterEnumInteger.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterEnumInteger.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/OuterEnumInteger.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/OuterEnumIntegerDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterEnumIntegerDefaultValue.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/OuterEnumIntegerDefaultValue.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ParentPet.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ParentPet.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ParentPet.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ParentPet.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Pet.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Pet.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Pet.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Pet.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/PetApi.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/PetApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/PetApi.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/PetApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/PetStatusFilter.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/PetStatusFilter.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/PetStatusFilter.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/PetStatusFilter.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Pig.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Pig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Pig.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Pig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/PolymorphicProperty.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/PolymorphicProperty.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/PolymorphicProperty.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/PolymorphicProperty.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Quadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Quadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Quadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Quadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/QuadrilateralInterface.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/QuadrilateralInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/QuadrilateralInterface.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/QuadrilateralInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ReadOnlyFirst.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ReadOnlyFirst.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ReadOnlyFirst.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ReadOnlyFirst.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Return.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Return.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Return.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Return.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ScaleneTriangle.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ScaleneTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ScaleneTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ScaleneTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Shape.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Shape.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Shape.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Shape.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ShapeInterface.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ShapeInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ShapeInterface.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ShapeInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ShapeOrNull.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ShapeOrNull.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ShapeOrNull.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ShapeOrNull.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/SimpleQuadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/SimpleQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/SimpleQuadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/SimpleQuadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/SpecialModelName.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/SpecialModelName.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/SpecialModelName.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/SpecialModelName.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/StoreApi.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/StoreApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/StoreApi.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/StoreApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Tag.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Tag.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Tag.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Tag.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/TestCollectionEndingWithWordList.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/TestCollectionEndingWithWordList.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/TestCollectionEndingWithWordList.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/TestCollectionEndingWithWordListObject.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/TestCollectionEndingWithWordListObject.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/TestCollectionEndingWithWordListObject.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Triangle.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Triangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Triangle.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Triangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/TriangleInterface.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/TriangleInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/TriangleInterface.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/TriangleInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/User.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/User.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/User.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/User.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/UserApi.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/UserApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/UserApi.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/UserApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Whale.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Whale.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Whale.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Whale.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Zebra.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Zebra.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Zebra.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/Zebra.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ZeroBasedEnum.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ZeroBasedEnum.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ZeroBasedEnum.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ZeroBasedEnum.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ZeroBasedEnumClass.md b/samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ZeroBasedEnumClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ZeroBasedEnumClass.md rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/docs/ZeroBasedEnumClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/git_push.sh b/samples/client/petstore/csharp/OpenAPIClient-net5.0/git_push.sh similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/git_push.sh rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/git_push.sh diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ActivityTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AnimalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/AppleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/BananaTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CatTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CatTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CatTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/CategoryTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DogTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DogTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DogTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/DrawingTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FileTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FileTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FileTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FooTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FooTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FooTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FooTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/FruitTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ListTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ListTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ListTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MammalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MapTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NameTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NameTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NameTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OrderTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PetStatusFilterTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PetStatusFilterTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PetStatusFilterTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PetStatusFilterTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PetTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PetTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PetTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ReturnTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ShapeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TagTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TagTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TagTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/TriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/UserTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/UserTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/UserTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/WhaleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ZebraTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/FakeApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/FakeApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/FakeApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/PetApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/PetApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/PetApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/StoreApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/StoreApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/StoreApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/UserApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/UserApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Api/UserApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Configuration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Configuration.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Configuration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ExceptionFactory.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ExceptionFactory.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ExceptionFactory.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/GlobalConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/GlobalConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/GlobalConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/HttpMethod.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/HttpMethod.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/HttpMethod.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/HttpMethod.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/IApiAccessor.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/IApiAccessor.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/IApiAccessor.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/IAsynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/IAsynchronousClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/IAsynchronousClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/IReadableConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/IReadableConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/IReadableConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ISynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ISynchronousClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ISynchronousClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Multimap.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Multimap.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Multimap.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/RequestOptions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/RequestOptions.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/RequestOptions.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/RetryConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/RetryConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/RetryConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Activity.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Activity.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Activity.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Animal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Animal.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Animal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ApiResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ApiResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Apple.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Apple.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Apple.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AppleReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AppleReq.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/AppleReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ArrayTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Banana.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Banana.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Banana.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BananaReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BananaReq.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BananaReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BasquePig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BasquePig.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/BasquePig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Capitalization.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Capitalization.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Capitalization.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Cat.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Cat.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Cat.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/CatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/CatAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/CatAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Category.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Category.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Category.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ChildCat.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ChildCat.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ChildCat.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ChildCatAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ClassModel.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ClassModel.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ClassModel.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DanishPig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DanishPig.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DanishPig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DateOnlyClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DeprecatedObject.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Dog.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Dog.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Dog.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DogAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DogAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/DogAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Drawing.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Drawing.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Drawing.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumArrays.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumArrays.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumArrays.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EquilateralTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/File.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/File.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/File.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Foo.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Foo.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Foo.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FormatTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Fruit.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Fruit.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FruitReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FruitReq.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FruitReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/GmFruit.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/GmFruit.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/GmFruit.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/GrandparentAnimal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/HealthCheckResult.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/List.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/List.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/List.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/LiteralStringClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Mammal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Mammal.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Mammal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MapTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MapTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MapTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Model200Response.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Model200Response.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Model200Response.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ModelClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ModelClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ModelClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Name.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Name.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Name.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableGuidClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableShape.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableShape.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableShape.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OneOfString.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OneOfString.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OneOfString.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Order.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Order.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Order.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterComposite.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterComposite.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterComposite.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnum.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnum.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnum.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ParentPet.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ParentPet.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ParentPet.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pet.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pet.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pet.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/PetStatusFilter.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/PetStatusFilter.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/PetStatusFilter.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/PetStatusFilter.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pig.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/PolymorphicProperty.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Quadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Quadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Quadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Return.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Return.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Return.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ScaleneTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Shape.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Shape.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Shape.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SpecialModelName.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SpecialModelName.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/SpecialModelName.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Tag.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Tag.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Tag.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Triangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Triangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Triangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TriangleInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TriangleInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/TriangleInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/User.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/User.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Whale.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Whale.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Whale.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Zebra.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Zebra.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Zebra.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.gitignore b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/.gitignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.gitignore rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/.gitignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator-ignore b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator-ignore rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/FILES b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/FILES rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/.openapi-generator/VERSION rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/README.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/README.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/api/openapi.yaml b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/api/openapi.yaml rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/api/openapi.yaml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Activity.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Activity.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Activity.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Activity.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ActivityOutputElementRepresentation.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ActivityOutputElementRepresentation.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ActivityOutputElementRepresentation.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/AdditionalPropertiesClass.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/AdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/AdditionalPropertiesClass.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/AdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Animal.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Animal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Animal.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Animal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/AnotherFakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/AnotherFakeApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/AnotherFakeApi.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/AnotherFakeApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ApiResponse.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ApiResponse.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ApiResponse.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ApiResponse.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Apple.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Apple.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Apple.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Apple.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/AppleReq.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/AppleReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/AppleReq.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/AppleReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ArrayOfArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ArrayOfArrayOfNumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ArrayOfArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ArrayOfNumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ArrayOfNumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ArrayTest.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ArrayTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ArrayTest.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ArrayTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Banana.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Banana.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Banana.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Banana.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/BananaReq.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/BananaReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/BananaReq.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/BananaReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/BasquePig.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/BasquePig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/BasquePig.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/BasquePig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Capitalization.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Capitalization.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Capitalization.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Capitalization.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Cat.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Cat.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Cat.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Cat.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/CatAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/CatAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/CatAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/CatAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Category.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Category.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Category.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Category.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ChildCat.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ChildCat.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ChildCat.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ChildCat.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ChildCatAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ChildCatAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ChildCatAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ChildCatAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ClassModel.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ClassModel.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ClassModel.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ClassModel.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ComplexQuadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ComplexQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ComplexQuadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ComplexQuadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DanishPig.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/DanishPig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DanishPig.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/DanishPig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DateOnlyClass.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/DateOnlyClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DateOnlyClass.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/DateOnlyClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DefaultApi.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DefaultApi.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/DefaultApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DeprecatedObject.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/DeprecatedObject.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DeprecatedObject.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/DeprecatedObject.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Dog.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Dog.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Dog.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Dog.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DogAllOf.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/DogAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/DogAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/DogAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Drawing.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Drawing.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Drawing.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Drawing.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/EnumArrays.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/EnumArrays.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/EnumArrays.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/EnumArrays.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/EnumClass.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/EnumClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/EnumClass.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/EnumClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/EnumTest.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/EnumTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/EnumTest.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/EnumTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/EquilateralTriangle.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/EquilateralTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/EquilateralTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/EquilateralTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FakeApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FakeApi.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FakeApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FakeClassnameTags123Api.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FakeClassnameTags123Api.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FakeClassnameTags123Api.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FakeClassnameTags123Api.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/File.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/File.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/File.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/File.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FileSchemaTestClass.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FileSchemaTestClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FileSchemaTestClass.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FileSchemaTestClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Foo.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Foo.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Foo.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Foo.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FooGetDefaultResponse.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FooGetDefaultResponse.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FooGetDefaultResponse.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FooGetDefaultResponse.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FormatTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FormatTest.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FormatTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Fruit.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Fruit.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Fruit.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Fruit.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FruitReq.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FruitReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/FruitReq.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/FruitReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/GmFruit.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/GmFruit.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/GmFruit.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/GmFruit.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/GrandparentAnimal.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/GrandparentAnimal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/GrandparentAnimal.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/GrandparentAnimal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/HasOnlyReadOnly.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/HasOnlyReadOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/HasOnlyReadOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/HasOnlyReadOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/HealthCheckResult.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/HealthCheckResult.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/HealthCheckResult.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/HealthCheckResult.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/IsoscelesTriangle.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/IsoscelesTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/IsoscelesTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/IsoscelesTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/List.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/List.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/List.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/List.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/LiteralStringClass.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/LiteralStringClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/LiteralStringClass.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/LiteralStringClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Mammal.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Mammal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Mammal.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Mammal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/MapTest.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/MapTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/MapTest.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/MapTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/MixedPropertiesAndAdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/MixedPropertiesAndAdditionalPropertiesClass.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/MixedPropertiesAndAdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Model200Response.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Model200Response.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Model200Response.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Model200Response.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ModelClient.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ModelClient.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ModelClient.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ModelClient.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Name.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Name.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Name.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Name.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/NullableClass.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/NullableClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/NullableClass.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/NullableClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/NullableGuidClass.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/NullableGuidClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/NullableGuidClass.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/NullableGuidClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/NullableShape.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/NullableShape.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/NullableShape.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/NullableShape.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/NumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/NumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/NumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/NumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ObjectWithDeprecatedFields.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ObjectWithDeprecatedFields.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ObjectWithDeprecatedFields.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OneOfString.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/OneOfString.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OneOfString.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/OneOfString.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Order.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Order.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Order.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Order.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterComposite.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/OuterComposite.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterComposite.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/OuterComposite.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterEnum.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/OuterEnum.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterEnum.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/OuterEnum.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterEnumDefaultValue.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/OuterEnumDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterEnumDefaultValue.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/OuterEnumDefaultValue.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterEnumInteger.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/OuterEnumInteger.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterEnumInteger.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/OuterEnumInteger.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/OuterEnumIntegerDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/OuterEnumIntegerDefaultValue.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/OuterEnumIntegerDefaultValue.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ParentPet.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ParentPet.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ParentPet.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ParentPet.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Pet.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Pet.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Pet.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Pet.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/PetApi.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/PetApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/PetApi.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/PetApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Pig.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Pig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Pig.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Pig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/PolymorphicProperty.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/PolymorphicProperty.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/PolymorphicProperty.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/PolymorphicProperty.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Quadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Quadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Quadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Quadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/QuadrilateralInterface.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/QuadrilateralInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/QuadrilateralInterface.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/QuadrilateralInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ReadOnlyFirst.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ReadOnlyFirst.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ReadOnlyFirst.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ReadOnlyFirst.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Return.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Return.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Return.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Return.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ScaleneTriangle.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ScaleneTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ScaleneTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ScaleneTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Shape.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Shape.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Shape.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Shape.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ShapeInterface.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ShapeInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ShapeInterface.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ShapeInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ShapeOrNull.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ShapeOrNull.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ShapeOrNull.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ShapeOrNull.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/SimpleQuadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/SimpleQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/SimpleQuadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/SimpleQuadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/SpecialModelName.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/SpecialModelName.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/SpecialModelName.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/SpecialModelName.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/StoreApi.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/StoreApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/StoreApi.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/StoreApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Tag.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Tag.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Tag.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Tag.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/TestCollectionEndingWithWordList.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/TestCollectionEndingWithWordList.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/TestCollectionEndingWithWordList.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/TestCollectionEndingWithWordListObject.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/TestCollectionEndingWithWordListObject.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/TestCollectionEndingWithWordListObject.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Triangle.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Triangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Triangle.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Triangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/TriangleInterface.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/TriangleInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/TriangleInterface.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/TriangleInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/User.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/User.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/User.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/User.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/UserApi.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/UserApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/UserApi.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/UserApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Whale.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Whale.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Whale.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Whale.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Zebra.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Zebra.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/Zebra.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/Zebra.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ZeroBasedEnum.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ZeroBasedEnum.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ZeroBasedEnum.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ZeroBasedEnum.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ZeroBasedEnumClass.md b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ZeroBasedEnumClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/docs/ZeroBasedEnumClass.md rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/docs/ZeroBasedEnumClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/git_push.sh b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/git_push.sh similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/git_push.sh rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/git_push.sh diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/PetApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/PetApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/PetApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/UserApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/UserApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Api/UserApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ActivityTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ActivityTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ActivityTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ActivityTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AnimalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AnimalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AppleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AppleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/AppleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BananaTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BananaTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BananaTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CatTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CatTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CatTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CategoryTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CategoryTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/CategoryTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DogTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DogTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DogTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DrawingTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DrawingTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DrawingTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/DrawingTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FileTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FileTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FileTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FooTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FooTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FooTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FooTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FruitTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FruitTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/FruitTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ListTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ListTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ListTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MammalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MammalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MammalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MapTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MapTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MapTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NameTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NameTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NameTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OrderTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OrderTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OrderTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PetTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PetTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PetTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ReturnTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ReturnTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ReturnTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ShapeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TagTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TagTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TagTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/TriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/UserTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/UserTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/UserTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/WhaleTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/WhaleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/WhaleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/WhaleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZebraTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZebraTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZebraTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZebraTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.asmdef b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.asmdef similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.asmdef rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.asmdef diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/AnotherFakeApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/AnotherFakeApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/AnotherFakeApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/FakeApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/FakeApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/FakeApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/PetApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/PetApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/PetApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/StoreApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/StoreApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/StoreApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/UserApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/UserApi.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Api/UserApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ApiResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/Configuration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/Configuration.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/Configuration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ConnectionException.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ConnectionException.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ConnectionException.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ConnectionException.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ExceptionFactory.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ExceptionFactory.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ExceptionFactory.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/GlobalConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/GlobalConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/GlobalConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IApiAccessor.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IApiAccessor.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IApiAccessor.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IAsynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IAsynchronousClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IAsynchronousClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IReadableConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IReadableConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/IReadableConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ISynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ISynchronousClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/ISynchronousClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/Multimap.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/Multimap.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/Multimap.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/RequestOptions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/RequestOptions.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/RequestOptions.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/UnexpectedResponseException.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/UnexpectedResponseException.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/UnexpectedResponseException.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/UnexpectedResponseException.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/WebRequestPathBuilder.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/WebRequestPathBuilder.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/WebRequestPathBuilder.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Client/WebRequestPathBuilder.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Activity.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Activity.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Activity.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Animal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Animal.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Animal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ApiResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ApiResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Apple.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Apple.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Apple.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AppleReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AppleReq.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/AppleReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ArrayTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Banana.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Banana.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Banana.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/BananaReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/BananaReq.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/BananaReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/BasquePig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/BasquePig.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/BasquePig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Capitalization.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Capitalization.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Capitalization.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Cat.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Cat.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Cat.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/CatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/CatAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/CatAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Category.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Category.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Category.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ChildCat.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ChildCat.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ChildCat.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ChildCatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ChildCatAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ChildCatAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ClassModel.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ClassModel.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ClassModel.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DanishPig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DanishPig.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DanishPig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DateOnlyClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DateOnlyClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DateOnlyClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DeprecatedObject.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DeprecatedObject.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DeprecatedObject.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Dog.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Dog.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Dog.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DogAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DogAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/DogAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Drawing.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Drawing.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Drawing.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumArrays.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumArrays.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumArrays.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EnumTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EquilateralTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EquilateralTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/EquilateralTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/File.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/File.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/File.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Foo.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Foo.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Foo.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FormatTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FormatTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FormatTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Fruit.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Fruit.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FruitReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FruitReq.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FruitReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/GmFruit.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/GmFruit.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/GmFruit.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/GrandparentAnimal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/GrandparentAnimal.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/GrandparentAnimal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/HealthCheckResult.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/HealthCheckResult.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/HealthCheckResult.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/List.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/List.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/List.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/LiteralStringClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/LiteralStringClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/LiteralStringClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Mammal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Mammal.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Mammal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MapTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MapTest.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MapTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Model200Response.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Model200Response.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Model200Response.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ModelClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ModelClient.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ModelClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Name.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Name.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Name.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableGuidClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableGuidClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableGuidClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableShape.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableShape.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableShape.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OneOfString.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OneOfString.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OneOfString.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Order.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Order.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Order.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterComposite.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterComposite.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterComposite.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnum.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnum.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnum.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumInteger.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumInteger.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumInteger.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ParentPet.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ParentPet.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ParentPet.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pet.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pet.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pet.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pig.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/PolymorphicProperty.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/PolymorphicProperty.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/PolymorphicProperty.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Quadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Quadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Quadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Return.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Return.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Return.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ScaleneTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ScaleneTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ScaleneTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Shape.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Shape.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Shape.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ShapeInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ShapeInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ShapeInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ShapeOrNull.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ShapeOrNull.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ShapeOrNull.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/SpecialModelName.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/SpecialModelName.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/SpecialModelName.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Tag.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Tag.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Tag.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Triangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Triangle.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Triangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TriangleInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TriangleInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/TriangleInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/User.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/User.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Whale.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Whale.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Whale.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Zebra.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Zebra.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Zebra.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Org.OpenAPITools.asmdef b/samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Org.OpenAPITools.asmdef similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Org.OpenAPITools.asmdef rename to samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Org.OpenAPITools.asmdef diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/.gitignore b/samples/client/petstore/csharp/OpenAPIClient/.gitignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/.gitignore rename to samples/client/petstore/csharp/OpenAPIClient/.gitignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator-ignore b/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator-ignore rename to samples/client/petstore/csharp/OpenAPIClient/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES b/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES rename to samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION rename to samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/Org.OpenAPITools.sln b/samples/client/petstore/csharp/OpenAPIClient/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/OpenAPIClient/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/README.md b/samples/client/petstore/csharp/OpenAPIClient/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/README.md rename to samples/client/petstore/csharp/OpenAPIClient/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/api/openapi.yaml b/samples/client/petstore/csharp/OpenAPIClient/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/api/openapi.yaml rename to samples/client/petstore/csharp/OpenAPIClient/api/openapi.yaml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/appveyor.yml b/samples/client/petstore/csharp/OpenAPIClient/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/appveyor.yml rename to samples/client/petstore/csharp/OpenAPIClient/appveyor.yml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Activity.md b/samples/client/petstore/csharp/OpenAPIClient/docs/Activity.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Activity.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/Activity.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ActivityOutputElementRepresentation.md b/samples/client/petstore/csharp/OpenAPIClient/docs/ActivityOutputElementRepresentation.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ActivityOutputElementRepresentation.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/AdditionalPropertiesClass.md b/samples/client/petstore/csharp/OpenAPIClient/docs/AdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/AdditionalPropertiesClass.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/AdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Animal.md b/samples/client/petstore/csharp/OpenAPIClient/docs/Animal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Animal.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/Animal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/AnotherFakeApi.md b/samples/client/petstore/csharp/OpenAPIClient/docs/AnotherFakeApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/AnotherFakeApi.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/AnotherFakeApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ApiResponse.md b/samples/client/petstore/csharp/OpenAPIClient/docs/ApiResponse.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ApiResponse.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/ApiResponse.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Apple.md b/samples/client/petstore/csharp/OpenAPIClient/docs/Apple.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Apple.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/Apple.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/AppleReq.md b/samples/client/petstore/csharp/OpenAPIClient/docs/AppleReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/AppleReq.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/AppleReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient/docs/ArrayOfArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ArrayOfArrayOfNumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/ArrayOfArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ArrayOfNumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient/docs/ArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ArrayOfNumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/ArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ArrayTest.md b/samples/client/petstore/csharp/OpenAPIClient/docs/ArrayTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ArrayTest.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/ArrayTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Banana.md b/samples/client/petstore/csharp/OpenAPIClient/docs/Banana.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Banana.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/Banana.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/BananaReq.md b/samples/client/petstore/csharp/OpenAPIClient/docs/BananaReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/BananaReq.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/BananaReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/BasquePig.md b/samples/client/petstore/csharp/OpenAPIClient/docs/BasquePig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/BasquePig.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/BasquePig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Capitalization.md b/samples/client/petstore/csharp/OpenAPIClient/docs/Capitalization.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Capitalization.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/Capitalization.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Cat.md b/samples/client/petstore/csharp/OpenAPIClient/docs/Cat.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Cat.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/Cat.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/CatAllOf.md b/samples/client/petstore/csharp/OpenAPIClient/docs/CatAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/CatAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/CatAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Category.md b/samples/client/petstore/csharp/OpenAPIClient/docs/Category.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Category.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/Category.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ChildCat.md b/samples/client/petstore/csharp/OpenAPIClient/docs/ChildCat.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ChildCat.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/ChildCat.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ChildCatAllOf.md b/samples/client/petstore/csharp/OpenAPIClient/docs/ChildCatAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ChildCatAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/ChildCatAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ClassModel.md b/samples/client/petstore/csharp/OpenAPIClient/docs/ClassModel.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ClassModel.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/ClassModel.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ComplexQuadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient/docs/ComplexQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ComplexQuadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/ComplexQuadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/DanishPig.md b/samples/client/petstore/csharp/OpenAPIClient/docs/DanishPig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/DanishPig.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/DanishPig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/DateOnlyClass.md b/samples/client/petstore/csharp/OpenAPIClient/docs/DateOnlyClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/DateOnlyClass.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/DateOnlyClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/DefaultApi.md b/samples/client/petstore/csharp/OpenAPIClient/docs/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/DefaultApi.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/DefaultApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/DeprecatedObject.md b/samples/client/petstore/csharp/OpenAPIClient/docs/DeprecatedObject.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/DeprecatedObject.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/DeprecatedObject.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Dog.md b/samples/client/petstore/csharp/OpenAPIClient/docs/Dog.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Dog.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/Dog.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/DogAllOf.md b/samples/client/petstore/csharp/OpenAPIClient/docs/DogAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/DogAllOf.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/DogAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Drawing.md b/samples/client/petstore/csharp/OpenAPIClient/docs/Drawing.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Drawing.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/Drawing.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumArrays.md b/samples/client/petstore/csharp/OpenAPIClient/docs/EnumArrays.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumArrays.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/EnumArrays.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumClass.md b/samples/client/petstore/csharp/OpenAPIClient/docs/EnumClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumClass.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/EnumClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumTest.md b/samples/client/petstore/csharp/OpenAPIClient/docs/EnumTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumTest.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/EnumTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EquilateralTriangle.md b/samples/client/petstore/csharp/OpenAPIClient/docs/EquilateralTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EquilateralTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/EquilateralTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FakeApi.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FakeClassnameTags123Api.md b/samples/client/petstore/csharp/OpenAPIClient/docs/FakeClassnameTags123Api.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FakeClassnameTags123Api.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/FakeClassnameTags123Api.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/File.md b/samples/client/petstore/csharp/OpenAPIClient/docs/File.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/File.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/File.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FileSchemaTestClass.md b/samples/client/petstore/csharp/OpenAPIClient/docs/FileSchemaTestClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FileSchemaTestClass.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/FileSchemaTestClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Foo.md b/samples/client/petstore/csharp/OpenAPIClient/docs/Foo.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Foo.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/Foo.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FooGetDefaultResponse.md b/samples/client/petstore/csharp/OpenAPIClient/docs/FooGetDefaultResponse.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FooGetDefaultResponse.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/FooGetDefaultResponse.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClient/docs/FormatTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FormatTest.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/FormatTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Fruit.md b/samples/client/petstore/csharp/OpenAPIClient/docs/Fruit.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Fruit.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/Fruit.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FruitReq.md b/samples/client/petstore/csharp/OpenAPIClient/docs/FruitReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FruitReq.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/FruitReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/GmFruit.md b/samples/client/petstore/csharp/OpenAPIClient/docs/GmFruit.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/GmFruit.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/GmFruit.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/GrandparentAnimal.md b/samples/client/petstore/csharp/OpenAPIClient/docs/GrandparentAnimal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/GrandparentAnimal.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/GrandparentAnimal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/HasOnlyReadOnly.md b/samples/client/petstore/csharp/OpenAPIClient/docs/HasOnlyReadOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/HasOnlyReadOnly.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/HasOnlyReadOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/HealthCheckResult.md b/samples/client/petstore/csharp/OpenAPIClient/docs/HealthCheckResult.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/HealthCheckResult.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/HealthCheckResult.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/IsoscelesTriangle.md b/samples/client/petstore/csharp/OpenAPIClient/docs/IsoscelesTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/IsoscelesTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/IsoscelesTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/List.md b/samples/client/petstore/csharp/OpenAPIClient/docs/List.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/List.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/List.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/LiteralStringClass.md b/samples/client/petstore/csharp/OpenAPIClient/docs/LiteralStringClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/LiteralStringClass.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/LiteralStringClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Mammal.md b/samples/client/petstore/csharp/OpenAPIClient/docs/Mammal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Mammal.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/Mammal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/MapTest.md b/samples/client/petstore/csharp/OpenAPIClient/docs/MapTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/MapTest.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/MapTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp/OpenAPIClient/docs/MixedPropertiesAndAdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/MixedPropertiesAndAdditionalPropertiesClass.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/MixedPropertiesAndAdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Model200Response.md b/samples/client/petstore/csharp/OpenAPIClient/docs/Model200Response.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Model200Response.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/Model200Response.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ModelClient.md b/samples/client/petstore/csharp/OpenAPIClient/docs/ModelClient.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ModelClient.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/ModelClient.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Name.md b/samples/client/petstore/csharp/OpenAPIClient/docs/Name.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Name.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/Name.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/NullableClass.md b/samples/client/petstore/csharp/OpenAPIClient/docs/NullableClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/NullableClass.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/NullableClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/NullableGuidClass.md b/samples/client/petstore/csharp/OpenAPIClient/docs/NullableGuidClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/NullableGuidClass.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/NullableGuidClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/NullableShape.md b/samples/client/petstore/csharp/OpenAPIClient/docs/NullableShape.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/NullableShape.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/NullableShape.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/NumberOnly.md b/samples/client/petstore/csharp/OpenAPIClient/docs/NumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/NumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/NumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp/OpenAPIClient/docs/ObjectWithDeprecatedFields.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ObjectWithDeprecatedFields.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/ObjectWithDeprecatedFields.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OneOfString.md b/samples/client/petstore/csharp/OpenAPIClient/docs/OneOfString.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OneOfString.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/OneOfString.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Order.md b/samples/client/petstore/csharp/OpenAPIClient/docs/Order.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Order.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/Order.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterComposite.md b/samples/client/petstore/csharp/OpenAPIClient/docs/OuterComposite.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterComposite.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/OuterComposite.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterEnum.md b/samples/client/petstore/csharp/OpenAPIClient/docs/OuterEnum.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterEnum.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/OuterEnum.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterEnumDefaultValue.md b/samples/client/petstore/csharp/OpenAPIClient/docs/OuterEnumDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterEnumDefaultValue.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/OuterEnumDefaultValue.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterEnumInteger.md b/samples/client/petstore/csharp/OpenAPIClient/docs/OuterEnumInteger.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterEnumInteger.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/OuterEnumInteger.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp/OpenAPIClient/docs/OuterEnumIntegerDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterEnumIntegerDefaultValue.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/OuterEnumIntegerDefaultValue.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ParentPet.md b/samples/client/petstore/csharp/OpenAPIClient/docs/ParentPet.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ParentPet.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/ParentPet.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Pet.md b/samples/client/petstore/csharp/OpenAPIClient/docs/Pet.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Pet.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/Pet.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/PetApi.md b/samples/client/petstore/csharp/OpenAPIClient/docs/PetApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/PetApi.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/PetApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Pig.md b/samples/client/petstore/csharp/OpenAPIClient/docs/Pig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Pig.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/Pig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/PolymorphicProperty.md b/samples/client/petstore/csharp/OpenAPIClient/docs/PolymorphicProperty.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/PolymorphicProperty.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/PolymorphicProperty.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Quadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient/docs/Quadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Quadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/Quadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/QuadrilateralInterface.md b/samples/client/petstore/csharp/OpenAPIClient/docs/QuadrilateralInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/QuadrilateralInterface.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/QuadrilateralInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ReadOnlyFirst.md b/samples/client/petstore/csharp/OpenAPIClient/docs/ReadOnlyFirst.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ReadOnlyFirst.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/ReadOnlyFirst.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Return.md b/samples/client/petstore/csharp/OpenAPIClient/docs/Return.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Return.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/Return.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ScaleneTriangle.md b/samples/client/petstore/csharp/OpenAPIClient/docs/ScaleneTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ScaleneTriangle.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/ScaleneTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Shape.md b/samples/client/petstore/csharp/OpenAPIClient/docs/Shape.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Shape.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/Shape.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ShapeInterface.md b/samples/client/petstore/csharp/OpenAPIClient/docs/ShapeInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ShapeInterface.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/ShapeInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ShapeOrNull.md b/samples/client/petstore/csharp/OpenAPIClient/docs/ShapeOrNull.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ShapeOrNull.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/ShapeOrNull.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/SimpleQuadrilateral.md b/samples/client/petstore/csharp/OpenAPIClient/docs/SimpleQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/SimpleQuadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/SimpleQuadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/SpecialModelName.md b/samples/client/petstore/csharp/OpenAPIClient/docs/SpecialModelName.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/SpecialModelName.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/SpecialModelName.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/StoreApi.md b/samples/client/petstore/csharp/OpenAPIClient/docs/StoreApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/StoreApi.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/StoreApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Tag.md b/samples/client/petstore/csharp/OpenAPIClient/docs/Tag.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Tag.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/Tag.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp/OpenAPIClient/docs/TestCollectionEndingWithWordList.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/TestCollectionEndingWithWordList.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/TestCollectionEndingWithWordList.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp/OpenAPIClient/docs/TestCollectionEndingWithWordListObject.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/TestCollectionEndingWithWordListObject.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/TestCollectionEndingWithWordListObject.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Triangle.md b/samples/client/petstore/csharp/OpenAPIClient/docs/Triangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Triangle.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/Triangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/TriangleInterface.md b/samples/client/petstore/csharp/OpenAPIClient/docs/TriangleInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/TriangleInterface.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/TriangleInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/User.md b/samples/client/petstore/csharp/OpenAPIClient/docs/User.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/User.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/User.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/UserApi.md b/samples/client/petstore/csharp/OpenAPIClient/docs/UserApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/UserApi.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/UserApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Whale.md b/samples/client/petstore/csharp/OpenAPIClient/docs/Whale.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Whale.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/Whale.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Zebra.md b/samples/client/petstore/csharp/OpenAPIClient/docs/Zebra.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Zebra.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/Zebra.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ZeroBasedEnum.md b/samples/client/petstore/csharp/OpenAPIClient/docs/ZeroBasedEnum.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ZeroBasedEnum.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/ZeroBasedEnum.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ZeroBasedEnumClass.md b/samples/client/petstore/csharp/OpenAPIClient/docs/ZeroBasedEnumClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ZeroBasedEnumClass.md rename to samples/client/petstore/csharp/OpenAPIClient/docs/ZeroBasedEnumClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/git_push.sh b/samples/client/petstore/csharp/OpenAPIClient/git_push.sh similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/git_push.sh rename to samples/client/petstore/csharp/OpenAPIClient/git_push.sh diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/UserApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/UserApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Api/UserApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/ApiClientTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/ApiClientTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/ApiClientTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/ApiClientTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/ConfigurationTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/ConfigurationTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/ConfigurationTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/ConfigurationTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ActivityTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ActivityTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ActivityTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ActivityTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AnimalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AnimalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AppleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AppleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/AppleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/BananaTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/BananaTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/BananaTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CatTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CatTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CatTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CategoryTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CategoryTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CategoryTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DogTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DogTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DogTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DrawingTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DrawingTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DrawingTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DrawingTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FileTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FooTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FooTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FooTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FooTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FruitTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FruitTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/FruitTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ListTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ListTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ListTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MammalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MammalTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MammalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MapTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MapTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MapTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NameTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NameTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NameTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OrderTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OrderTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OrderTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PetTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PetTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PetTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PigTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReturnTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReturnTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ReturnTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ShapeTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ShapeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TagTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TagTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TagTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/TriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/UserTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/UserTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/UserTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/WhaleTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/WhaleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/WhaleTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/WhaleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ZebraTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ZebraTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ZebraTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ZebraTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/linux-logo.png b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/linux-logo.png similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/linux-logo.png rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/linux-logo.png diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/AnotherFakeApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/PetApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/StoreApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/UserApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/UserApi.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/UserApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/Configuration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ExceptionFactory.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ExceptionFactory.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ExceptionFactory.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/GlobalConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/GlobalConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/GlobalConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/HttpMethod.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/HttpMethod.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/HttpMethod.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/HttpMethod.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/IApiAccessor.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/IApiAccessor.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/IApiAccessor.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/IAsynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/IAsynchronousClient.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/IAsynchronousClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/IReadableConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ISynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ISynchronousClient.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ISynchronousClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/Multimap.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Multimap.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/Multimap.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/RequestOptions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/RequestOptions.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/RequestOptions.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/RetryConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/RetryConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/RetryConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Activity.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Activity.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Activity.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ApiResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ApiResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Apple.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Apple.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Apple.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AppleReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/AppleReq.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/AppleReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayTest.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ArrayTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Banana.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Banana.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Banana.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/BananaReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/BananaReq.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/BananaReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/BasquePig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/BasquePig.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/BasquePig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Capitalization.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Capitalization.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Capitalization.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/CatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/CatAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/CatAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Category.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Category.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Category.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ChildCat.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ChildCat.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ChildCat.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ChildCatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ChildCatAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ChildCatAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ClassModel.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ClassModel.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ClassModel.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/DanishPig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DanishPig.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/DanishPig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/DateOnlyClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DateOnlyClass.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/DateOnlyClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/DeprecatedObject.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DeprecatedObject.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/DeprecatedObject.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/DogAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DogAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/DogAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Drawing.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Drawing.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Drawing.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EquilateralTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EquilateralTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EquilateralTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/File.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/File.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/File.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Foo.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Foo.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Foo.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Fruit.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Fruit.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FruitReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FruitReq.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FruitReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/GmFruit.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/GmFruit.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/GmFruit.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/GrandparentAnimal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/GrandparentAnimal.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/GrandparentAnimal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/HealthCheckResult.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/HealthCheckResult.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/HealthCheckResult.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/List.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/List.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/List.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/LiteralStringClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/LiteralStringClass.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/LiteralStringClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Mammal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Mammal.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Mammal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Model200Response.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Model200Response.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Model200Response.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ModelClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Name.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Name.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Name.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/NullableClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableClass.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/NullableClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/NullableGuidClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableGuidClass.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/NullableGuidClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/NullableShape.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableShape.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/NullableShape.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/NumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/NumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OneOfString.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OneOfString.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OneOfString.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Order.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterComposite.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterComposite.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterComposite.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnum.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumInteger.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ParentPet.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ParentPet.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ParentPet.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Pig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Pig.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Pig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/PolymorphicProperty.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/PolymorphicProperty.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/PolymorphicProperty.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Quadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Quadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Quadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Return.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Return.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Return.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ScaleneTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ScaleneTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ScaleneTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Shape.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Shape.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Shape.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeOrNull.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeOrNull.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeOrNull.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/SpecialModelName.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/SpecialModelName.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/SpecialModelName.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Tag.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Tag.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Tag.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Triangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Triangle.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Triangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/TriangleInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/TriangleInterface.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/TriangleInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/User.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/User.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Whale.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Whale.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Whale.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Zebra.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Zebra.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Zebra.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.nuspec b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.nuspec similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.nuspec rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.nuspec diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Properties/AssemblyInfo.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Properties/AssemblyInfo.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Properties/AssemblyInfo.cs rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Properties/AssemblyInfo.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/project.json b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/project.json similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/project.json rename to samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/project.json diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.gitignore b/samples/client/petstore/csharp/OpenAPIClientCore/.gitignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/.gitignore rename to samples/client/petstore/csharp/OpenAPIClientCore/.gitignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator-ignore b/samples/client/petstore/csharp/OpenAPIClientCore/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator-ignore rename to samples/client/petstore/csharp/OpenAPIClientCore/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES b/samples/client/petstore/csharp/OpenAPIClientCore/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES rename to samples/client/petstore/csharp/OpenAPIClientCore/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClientCore/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION rename to samples/client/petstore/csharp/OpenAPIClientCore/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.travis.yml b/samples/client/petstore/csharp/OpenAPIClientCore/.travis.yml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/.travis.yml rename to samples/client/petstore/csharp/OpenAPIClientCore/.travis.yml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/Org.OpenAPITools.sln b/samples/client/petstore/csharp/OpenAPIClientCore/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/OpenAPIClientCore/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md b/samples/client/petstore/csharp/OpenAPIClientCore/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md rename to samples/client/petstore/csharp/OpenAPIClientCore/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/api/openapi.yaml b/samples/client/petstore/csharp/OpenAPIClientCore/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/api/openapi.yaml rename to samples/client/petstore/csharp/OpenAPIClientCore/api/openapi.yaml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/appveyor.yml b/samples/client/petstore/csharp/OpenAPIClientCore/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/appveyor.yml rename to samples/client/petstore/csharp/OpenAPIClientCore/appveyor.yml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/build.bat b/samples/client/petstore/csharp/OpenAPIClientCore/build.bat similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/build.bat rename to samples/client/petstore/csharp/OpenAPIClientCore/build.bat diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/build.sh b/samples/client/petstore/csharp/OpenAPIClientCore/build.sh similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/build.sh rename to samples/client/petstore/csharp/OpenAPIClientCore/build.sh diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Activity.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Activity.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Activity.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/Activity.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ActivityOutputElementRepresentation.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/ActivityOutputElementRepresentation.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ActivityOutputElementRepresentation.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/ActivityOutputElementRepresentation.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesClass.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/AdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesClass.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/AdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Animal.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Animal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Animal.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/Animal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AnotherFakeApi.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/AnotherFakeApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AnotherFakeApi.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/AnotherFakeApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ApiResponse.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/ApiResponse.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ApiResponse.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/ApiResponse.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Apple.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Apple.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Apple.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/Apple.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AppleReq.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/AppleReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AppleReq.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/AppleReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/ArrayOfArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ArrayOfArrayOfNumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/ArrayOfArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ArrayOfNumberOnly.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/ArrayOfNumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ArrayOfNumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/ArrayOfNumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ArrayTest.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/ArrayTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ArrayTest.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/ArrayTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Banana.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Banana.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Banana.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/Banana.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/BananaReq.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/BananaReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/BananaReq.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/BananaReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/BasquePig.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/BasquePig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/BasquePig.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/BasquePig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Capitalization.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Capitalization.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Capitalization.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/Capitalization.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Cat.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Cat.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Cat.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/Cat.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/CatAllOf.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/CatAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/CatAllOf.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/CatAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Category.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Category.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Category.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/Category.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ChildCat.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/ChildCat.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ChildCat.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/ChildCat.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ChildCatAllOf.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/ChildCatAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ChildCatAllOf.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/ChildCatAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ClassModel.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/ClassModel.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ClassModel.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/ClassModel.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ComplexQuadrilateral.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/ComplexQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ComplexQuadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/ComplexQuadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DanishPig.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/DanishPig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DanishPig.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/DanishPig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DateOnlyClass.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/DateOnlyClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DateOnlyClass.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/DateOnlyClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DefaultApi.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/DefaultApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DefaultApi.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/DefaultApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DeprecatedObject.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/DeprecatedObject.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DeprecatedObject.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/DeprecatedObject.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Dog.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Dog.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Dog.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/Dog.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DogAllOf.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/DogAllOf.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DogAllOf.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/DogAllOf.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Drawing.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Drawing.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Drawing.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/Drawing.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumArrays.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/EnumArrays.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumArrays.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/EnumArrays.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumClass.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/EnumClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumClass.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/EnumClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumTest.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/EnumTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumTest.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/EnumTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EquilateralTriangle.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/EquilateralTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EquilateralTriangle.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/EquilateralTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/FakeApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FakeApi.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/FakeApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FakeClassnameTags123Api.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/FakeClassnameTags123Api.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FakeClassnameTags123Api.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/FakeClassnameTags123Api.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/File.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/File.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/File.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/File.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FileSchemaTestClass.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/FileSchemaTestClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FileSchemaTestClass.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/FileSchemaTestClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Foo.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Foo.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Foo.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/Foo.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FooGetDefaultResponse.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/FooGetDefaultResponse.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FooGetDefaultResponse.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/FooGetDefaultResponse.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FormatTest.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/FormatTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FormatTest.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/FormatTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Fruit.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Fruit.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Fruit.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/Fruit.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FruitReq.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/FruitReq.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FruitReq.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/FruitReq.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/GmFruit.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/GmFruit.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/GmFruit.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/GmFruit.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/GrandparentAnimal.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/GrandparentAnimal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/GrandparentAnimal.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/GrandparentAnimal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/HasOnlyReadOnly.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/HasOnlyReadOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/HasOnlyReadOnly.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/HasOnlyReadOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/HealthCheckResult.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/HealthCheckResult.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/HealthCheckResult.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/HealthCheckResult.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/IsoscelesTriangle.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/IsoscelesTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/IsoscelesTriangle.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/IsoscelesTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/List.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/List.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/List.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/List.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/LiteralStringClass.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/LiteralStringClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/LiteralStringClass.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/LiteralStringClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Mammal.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Mammal.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Mammal.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/Mammal.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/MapTest.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/MapTest.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/MapTest.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/MapTest.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/MixedPropertiesAndAdditionalPropertiesClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/MixedPropertiesAndAdditionalPropertiesClass.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/MixedPropertiesAndAdditionalPropertiesClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Model200Response.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Model200Response.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Model200Response.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/Model200Response.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ModelClient.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/ModelClient.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ModelClient.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/ModelClient.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Name.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Name.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Name.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/Name.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/NullableClass.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/NullableClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/NullableClass.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/NullableClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/NullableGuidClass.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/NullableGuidClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/NullableGuidClass.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/NullableGuidClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/NullableShape.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/NullableShape.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/NullableShape.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/NullableShape.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/NumberOnly.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/NumberOnly.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/NumberOnly.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/NumberOnly.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/ObjectWithDeprecatedFields.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ObjectWithDeprecatedFields.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/ObjectWithDeprecatedFields.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OneOfString.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/OneOfString.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OneOfString.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/OneOfString.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Order.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Order.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Order.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/Order.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterComposite.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/OuterComposite.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterComposite.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/OuterComposite.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterEnum.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/OuterEnum.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterEnum.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/OuterEnum.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterEnumDefaultValue.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/OuterEnumDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterEnumDefaultValue.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/OuterEnumDefaultValue.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterEnumInteger.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/OuterEnumInteger.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterEnumInteger.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/OuterEnumInteger.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/OuterEnumIntegerDefaultValue.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterEnumIntegerDefaultValue.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/OuterEnumIntegerDefaultValue.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ParentPet.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/ParentPet.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ParentPet.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/ParentPet.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Pet.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Pet.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Pet.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/Pet.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/PetApi.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/PetApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/PetApi.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/PetApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Pig.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Pig.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Pig.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/Pig.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/PolymorphicProperty.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/PolymorphicProperty.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/PolymorphicProperty.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/PolymorphicProperty.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Quadrilateral.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Quadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Quadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/Quadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/QuadrilateralInterface.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/QuadrilateralInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/QuadrilateralInterface.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/QuadrilateralInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ReadOnlyFirst.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/ReadOnlyFirst.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ReadOnlyFirst.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/ReadOnlyFirst.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Return.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Return.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Return.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/Return.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ScaleneTriangle.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/ScaleneTriangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ScaleneTriangle.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/ScaleneTriangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Shape.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Shape.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Shape.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/Shape.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ShapeInterface.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/ShapeInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ShapeInterface.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/ShapeInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ShapeOrNull.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/ShapeOrNull.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ShapeOrNull.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/ShapeOrNull.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/SimpleQuadrilateral.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/SimpleQuadrilateral.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/SimpleQuadrilateral.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/SimpleQuadrilateral.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/SpecialModelName.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/SpecialModelName.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/SpecialModelName.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/SpecialModelName.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/StoreApi.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/StoreApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/StoreApi.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/StoreApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Tag.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Tag.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Tag.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/Tag.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/TestCollectionEndingWithWordList.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/TestCollectionEndingWithWordList.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/TestCollectionEndingWithWordList.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/TestCollectionEndingWithWordList.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/TestCollectionEndingWithWordListObject.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/TestCollectionEndingWithWordListObject.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/TestCollectionEndingWithWordListObject.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/TestCollectionEndingWithWordListObject.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Triangle.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Triangle.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Triangle.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/Triangle.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/TriangleInterface.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/TriangleInterface.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/TriangleInterface.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/TriangleInterface.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/User.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/User.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/User.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/User.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/UserApi.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/UserApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/UserApi.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/UserApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Whale.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Whale.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Whale.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/Whale.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Zebra.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/Zebra.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Zebra.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/Zebra.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ZeroBasedEnum.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/ZeroBasedEnum.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ZeroBasedEnum.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/ZeroBasedEnum.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ZeroBasedEnumClass.md b/samples/client/petstore/csharp/OpenAPIClientCore/docs/ZeroBasedEnumClass.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ZeroBasedEnumClass.md rename to samples/client/petstore/csharp/OpenAPIClientCore/docs/ZeroBasedEnumClass.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/git_push.sh b/samples/client/petstore/csharp/OpenAPIClientCore/git_push.sh similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/git_push.sh rename to samples/client/petstore/csharp/OpenAPIClientCore/git_push.sh diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/mono_nunit_test.sh b/samples/client/petstore/csharp/OpenAPIClientCore/mono_nunit_test.sh similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/mono_nunit_test.sh rename to samples/client/petstore/csharp/OpenAPIClientCore/mono_nunit_test.sh diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ActivityOutputElementRepresentationTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ActivityTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ActivityTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ActivityTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ActivityTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AnimalTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AnimalTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AnimalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AppleReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AppleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AppleTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AppleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayOfArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayOfNumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ArrayTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/BananaReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/BananaTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/BananaTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/BananaTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/BasquePigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CapitalizationTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CatTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CatTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CatTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CatTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CategoryTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CategoryTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CategoryTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ChildCatAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ChildCatTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ClassModelTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ComplexQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DanishPigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DateOnlyClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DeprecatedObjectTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DogTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DogTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DogTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DogTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DrawingTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DrawingTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DrawingTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DrawingTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumArraysTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EnumTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/EquilateralTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FileSchemaTestClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FileTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FileTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FileTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FileTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FooGetDefaultResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FooTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FooTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FooTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FooTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FormatTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FruitReqTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FruitTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FruitTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/FruitTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/GmFruitTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/GrandparentAnimalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/HasOnlyReadOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/HealthCheckResultTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/IsoscelesTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ListTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ListTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ListTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ListTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/LiteralStringClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MammalTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MammalTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MammalTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MammalTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MapTestTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MapTestTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MapTestTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MapTestTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/MixedPropertiesAndAdditionalPropertiesClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/Model200ResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ModelClientTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NameTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NameTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NameTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NameTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NullableClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NullableGuidClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NullableShapeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/NumberOnlyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ObjectWithDeprecatedFieldsTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OneOfStringTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OrderTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OrderTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OrderTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterCompositeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumDefaultValueTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerDefaultValueTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumIntegerTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/OuterEnumTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ParentPetTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PetTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PetTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PetTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PigTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PigTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PigTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PigTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/PolymorphicPropertyTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/QuadrilateralInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/QuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ReadOnlyFirstTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ReturnTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ReturnTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ReturnTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ReturnTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ScaleneTriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ShapeInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ShapeOrNullTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ShapeTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ShapeTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ShapeTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ShapeTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/SimpleQuadrilateralTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/SpecialModelNameTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TagTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TagTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TagTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListObjectTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TestCollectionEndingWithWordListTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TriangleInterfaceTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TriangleTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TriangleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TriangleTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/TriangleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/UserTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/UserTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/UserTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/WhaleTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/WhaleTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/WhaleTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/WhaleTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ZebraTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ZebraTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ZebraTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ZebraTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumClassTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/ZeroBasedEnumTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/linux-logo.png b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/linux-logo.png similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/linux-logo.png rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools.Test/linux-logo.png diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/DefaultApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/DefaultApi.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/DefaultApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/PetApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/PetApi.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/PetApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/StoreApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/StoreApi.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/StoreApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/UserApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/UserApi.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Api/UserApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiResponse.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/ExceptionFactory.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ExceptionFactory.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/ExceptionFactory.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/GlobalConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/GlobalConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/GlobalConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpMethod.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpMethod.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpMethod.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpMethod.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/IApiAccessor.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IApiAccessor.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/IApiAccessor.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/IAsynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IAsynchronousClient.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/IAsynchronousClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/ISynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ISynchronousClient.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/ISynchronousClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/Multimap.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Multimap.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/Multimap.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/RequestOptions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/RequestOptions.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/RequestOptions.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/RetryConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/RetryConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/RetryConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Activity.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Activity.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Activity.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Activity.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Animal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Animal.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Animal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ApiResponse.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ApiResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Apple.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Apple.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Apple.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AppleReq.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/AppleReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AppleReq.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/AppleReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayTest.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Banana.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Banana.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Banana.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/BananaReq.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/BananaReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/BananaReq.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/BananaReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/BasquePig.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/BasquePig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/BasquePig.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/BasquePig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Capitalization.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Capitalization.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Capitalization.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/CatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/CatAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/CatAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Category.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Category.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Category.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ChildCat.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ChildCat.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ChildCat.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ChildCat.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ChildCatAllOf.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ChildCatAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ChildCatAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ChildCatAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ClassModel.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ClassModel.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ClassModel.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ComplexQuadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DanishPig.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/DanishPig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DanishPig.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/DanishPig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DateOnlyClass.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/DateOnlyClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DateOnlyClass.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/DateOnlyClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DeprecatedObject.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/DeprecatedObject.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DeprecatedObject.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/DeprecatedObject.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/DogAllOf.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DogAllOf.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/DogAllOf.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Drawing.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Drawing.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Drawing.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Drawing.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumArrays.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumArrays.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumArrays.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumClass.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumTest.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EquilateralTriangle.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/EquilateralTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EquilateralTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/EquilateralTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/File.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/File.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/File.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Foo.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Foo.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Foo.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Foo.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FooGetDefaultResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Fruit.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Fruit.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FruitReq.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FruitReq.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/FruitReq.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/GmFruit.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/GmFruit.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/GmFruit.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/GmFruit.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/GrandparentAnimal.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/GrandparentAnimal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/GrandparentAnimal.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/GrandparentAnimal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/HealthCheckResult.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/HealthCheckResult.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/HealthCheckResult.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/HealthCheckResult.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/IsoscelesTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/List.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/List.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/List.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/LiteralStringClass.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/LiteralStringClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/LiteralStringClass.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/LiteralStringClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Mammal.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Mammal.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Mammal.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/MapTest.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MapTest.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/MapTest.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Model200Response.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Model200Response.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Model200Response.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ModelClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ModelClient.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ModelClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Name.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Name.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Name.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableClass.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableClass.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableGuidClass.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableGuidClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableGuidClass.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableGuidClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableShape.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableShape.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableShape.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/NumberOnly.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NumberOnly.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/NumberOnly.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ObjectWithDeprecatedFields.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/OneOfString.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OneOfString.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/OneOfString.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterComposite.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterComposite.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterComposite.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnum.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnum.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnum.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumInteger.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ParentPet.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ParentPet.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ParentPet.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pet.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pet.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pet.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pig.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pig.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pig.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/PolymorphicProperty.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/PolymorphicProperty.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/PolymorphicProperty.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Quadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Quadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Quadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/QuadrilateralInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Return.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Return.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Return.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ScaleneTriangle.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ScaleneTriangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ScaleneTriangle.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ScaleneTriangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Shape.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Shape.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Shape.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeInterface.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeInterface.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeOrNull.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeOrNull.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeOrNull.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/SimpleQuadrilateral.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/SpecialModelName.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/SpecialModelName.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/SpecialModelName.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Tag.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Tag.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Tag.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Triangle.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Triangle.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Triangle.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TriangleInterface.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/TriangleInterface.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TriangleInterface.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/TriangleInterface.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/User.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/User.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Whale.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Whale.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Whale.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Whale.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Zebra.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Zebra.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Zebra.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/Zebra.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Model/ZeroBasedEnumClass.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.gitignore b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/.gitignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.gitignore rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/.gitignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.openapi-generator-ignore b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.openapi-generator-ignore rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/.openapi-generator-ignore diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.openapi-generator/FILES b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.openapi-generator/FILES rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/.openapi-generator/FILES diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.openapi-generator/VERSION rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/.openapi-generator/VERSION diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/Org.OpenAPITools.sln b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/Org.OpenAPITools.sln similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/Org.OpenAPITools.sln rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/Org.OpenAPITools.sln diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/README.md b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/README.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/README.md rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/README.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/api/openapi.yaml b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/api/openapi.yaml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/api/openapi.yaml rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/api/openapi.yaml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/appveyor.yml b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/appveyor.yml similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/appveyor.yml rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/appveyor.yml diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/docs/ApiResponse.md b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/ApiResponse.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/docs/ApiResponse.md rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/ApiResponse.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/docs/Category.md b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/Category.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/docs/Category.md rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/Category.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/docs/Order.md b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/Order.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/docs/Order.md rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/Order.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/docs/Pet.md b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/Pet.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/docs/Pet.md rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/Pet.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/docs/PetApi.md b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/PetApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/docs/PetApi.md rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/PetApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/docs/StoreApi.md b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/StoreApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/docs/StoreApi.md rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/StoreApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/docs/Tag.md b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/Tag.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/docs/Tag.md rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/Tag.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/docs/User.md b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/User.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/docs/User.md rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/User.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/docs/UserApi.md b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/UserApi.md similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/docs/UserApi.md rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/docs/UserApi.md diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/git_push.sh b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/git_push.sh similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/git_push.sh rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/git_push.sh diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Api/PetApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Api/PetApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Api/PetApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Api/UserApiTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Api/UserApiTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Api/UserApiTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/ApiResponseTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/CategoryTests.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/CategoryTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/CategoryTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/CategoryTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/OrderTests.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/OrderTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/OrderTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/OrderTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/PetTests.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/PetTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/PetTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/PetTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/TagTests.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/TagTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/TagTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/TagTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/UserTests.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/UserTests.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/UserTests.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Model/UserTests.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/PetApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/PetApi.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/PetApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/StoreApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/StoreApi.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/StoreApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/UserApi.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/UserApi.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Api/UserApi.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiClient.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiException.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiException.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiException.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiResponse.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/OAuthFlow.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/TokenResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ClientUtils.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ClientUtils.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ClientUtils.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Configuration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Configuration.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Configuration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ExceptionFactory.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ExceptionFactory.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ExceptionFactory.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/GlobalConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/GlobalConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/GlobalConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/HttpMethod.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/HttpMethod.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/HttpMethod.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/HttpMethod.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/IApiAccessor.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/IApiAccessor.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/IApiAccessor.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/IAsynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/IAsynchronousClient.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/IAsynchronousClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/IReadableConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/IReadableConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/IReadableConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ISynchronousClient.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ISynchronousClient.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ISynchronousClient.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Multimap.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Multimap.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Multimap.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/RequestOptions.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/RequestOptions.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/RequestOptions.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/RetryConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/RetryConfiguration.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/RetryConfiguration.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/RetryConfiguration.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/ApiResponse.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/ApiResponse.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/ApiResponse.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Category.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Category.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Category.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Order.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Order.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Order.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Pet.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Pet.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Pet.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Tag.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Tag.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/Tag.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/User.cs similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/User.cs rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Model/User.cs diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Org.OpenAPITools.csproj similarity index 100% rename from samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Org.OpenAPITools.csproj rename to samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Org.OpenAPITools.csproj