diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.gitignore b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/.gitignore
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.gitignore
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/.gitignore
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator-ignore b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator-ignore
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator-ignore
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator-ignore
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/FILES
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/FILES
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/FILES
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/VERSION b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/VERSION
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/VERSION
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/.openapi-generator/VERSION
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/Org.OpenAPITools.sln b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/Org.OpenAPITools.sln
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/Org.OpenAPITools.sln
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/Org.OpenAPITools.sln
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/README.md b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/README.md
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/README.md
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/README.md
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/api/openapi.yaml
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/api/openapi.yaml
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/api/openapi.yaml
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/appveyor.yml b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/appveyor.yml
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/appveyor.yml
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/appveyor.yml
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/apis/DefaultApi.md b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/docs/apis/DefaultApi.md
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/apis/DefaultApi.md
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/docs/apis/DefaultApi.md
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Apple.md b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Apple.md
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Apple.md
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Apple.md
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Banana.md b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Banana.md
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Banana.md
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Banana.md
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Fruit.md b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Fruit.md
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Fruit.md
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/docs/models/Fruit.md
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/scripts/git_push.ps1 b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/docs/scripts/git_push.ps1
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/scripts/git_push.ps1
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/docs/scripts/git_push.ps1
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/scripts/git_push.sh b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/docs/scripts/git_push.sh
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/docs/scripts/git_push.sh
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/docs/scripts/git_push.sh
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/AppleTests.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/BananaTests.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Model/FruitTests.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/README.md b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/README.md
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/README.md
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/README.md
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/DefaultApi.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/DefaultApi.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/DefaultApi.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/IApi.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/IApi.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/IApi.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/IApi.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiException.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiException.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiException.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiFactory.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiFactory.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiFactory.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiFactory.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ClientUtils.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ClientUtils.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ClientUtils.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/CookieContainer.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/CookieContainer.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/CookieContainer.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/CookieContainer.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateOnlyJsonConverter.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateOnlyNullableJsonConverter.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeJsonConverter.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/DateTimeNullableJsonConverter.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/JsonSerializerOptionsProvider.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/Option.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/Option.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/Option.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/Option.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenBase.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenBase.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenBase.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenContainer`1.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Apple.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Apple.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Apple.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Apple.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Banana.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Banana.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Banana.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Banana.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/README.md b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/README.md
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/README.md
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/README.md