diff --git a/README.md b/README.md
index c73e47d79..69826473d 100644
--- a/README.md
+++ b/README.md
@@ -834,7 +834,7 @@ public interface DefaultApi { /* omitted */ }
 
 ## Additional Properties as Attribute
 
-If you want to map your models using composition instead inheretance for a better experience with Jackson, see the [Additional properties as attribute](./docs/modules/ROOT/pages/additional-properties-as-attribute.adoc) documentation.
+If you want to map your models using composition instead inheretance for a better experience with Jackson, see the [Additional properties as attribute](client/docs/modules/ROOT/pages/additional-properties-as-attribute.adoc) documentation.
 
 ## Template Customization
 
diff --git a/deployment/pom.xml b/client/deployment/pom.xml
similarity index 99%
rename from deployment/pom.xml
rename to client/deployment/pom.xml
index e3738a059..e80e9b677 100644
--- a/deployment/pom.xml
+++ b/client/deployment/pom.xml
@@ -5,6 +5,7 @@
     <groupId>io.quarkiverse.openapi.generator</groupId>
     <artifactId>quarkus-openapi-generator-parent</artifactId>
     <version>3.0.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>quarkus-openapi-generator-deployment</artifactId>
   <name>Quarkus - Openapi Generator - Deployment</name>
diff --git a/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/CodegenConfig.java b/client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/CodegenConfig.java
similarity index 100%
rename from deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/CodegenConfig.java
rename to client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/CodegenConfig.java
diff --git a/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/CommonItemConfig.java b/client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/CommonItemConfig.java
similarity index 100%
rename from deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/CommonItemConfig.java
rename to client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/CommonItemConfig.java
diff --git a/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/GlobalCodegenConfig.java b/client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/GlobalCodegenConfig.java
similarity index 100%
rename from deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/GlobalCodegenConfig.java
rename to client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/GlobalCodegenConfig.java
diff --git a/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/SpecItemConfig.java b/client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/SpecItemConfig.java
similarity index 100%
rename from deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/SpecItemConfig.java
rename to client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/SpecItemConfig.java
diff --git a/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/circuitbreaker/CircuitBreakerConfigurationParser.java b/client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/circuitbreaker/CircuitBreakerConfigurationParser.java
similarity index 100%
rename from deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/circuitbreaker/CircuitBreakerConfigurationParser.java
rename to client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/circuitbreaker/CircuitBreakerConfigurationParser.java
diff --git a/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/ClassCodegenConfigParser.java b/client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/ClassCodegenConfigParser.java
similarity index 100%
rename from deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/ClassCodegenConfigParser.java
rename to client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/ClassCodegenConfigParser.java
diff --git a/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiConfigValidator.java b/client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiConfigValidator.java
similarity index 100%
rename from deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiConfigValidator.java
rename to client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiConfigValidator.java
diff --git a/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorCodeGenBase.java b/client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorCodeGenBase.java
similarity index 100%
rename from deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorCodeGenBase.java
rename to client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorCodeGenBase.java
diff --git a/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorJsonCodeGen.java b/client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorJsonCodeGen.java
similarity index 100%
rename from deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorJsonCodeGen.java
rename to client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorJsonCodeGen.java
diff --git a/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorOutputPaths.java b/client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorOutputPaths.java
similarity index 100%
rename from deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorOutputPaths.java
rename to client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorOutputPaths.java
diff --git a/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorStreamCodeGen.java b/client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorStreamCodeGen.java
similarity index 100%
rename from deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorStreamCodeGen.java
rename to client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorStreamCodeGen.java
diff --git a/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorYamlCodeGen.java b/client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorYamlCodeGen.java
similarity index 100%
rename from deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorYamlCodeGen.java
rename to client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorYamlCodeGen.java
diff --git a/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorYmlCodeGen.java b/client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorYmlCodeGen.java
similarity index 100%
rename from deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorYmlCodeGen.java
rename to client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorYmlCodeGen.java
diff --git a/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiSpecInputProvider.java b/client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiSpecInputProvider.java
similarity index 100%
rename from deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiSpecInputProvider.java
rename to client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiSpecInputProvider.java
diff --git a/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/SpecInputModel.java b/client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/SpecInputModel.java
similarity index 100%
rename from deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/SpecInputModel.java
rename to client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/SpecInputModel.java
diff --git a/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/template/OpenApiNamespaceResolver.java b/client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/template/OpenApiNamespaceResolver.java
similarity index 100%
rename from deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/template/OpenApiNamespaceResolver.java
rename to client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/template/OpenApiNamespaceResolver.java
diff --git a/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/template/QuteTemplatingEngineAdapter.java b/client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/template/QuteTemplatingEngineAdapter.java
similarity index 100%
rename from deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/template/QuteTemplatingEngineAdapter.java
rename to client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/template/QuteTemplatingEngineAdapter.java
diff --git a/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/wrapper/OpenApiClassicClientGeneratorWrapper.java b/client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/wrapper/OpenApiClassicClientGeneratorWrapper.java
similarity index 100%
rename from deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/wrapper/OpenApiClassicClientGeneratorWrapper.java
rename to client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/wrapper/OpenApiClassicClientGeneratorWrapper.java
diff --git a/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/wrapper/OpenApiClientGeneratorWrapper.java b/client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/wrapper/OpenApiClientGeneratorWrapper.java
similarity index 100%
rename from deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/wrapper/OpenApiClientGeneratorWrapper.java
rename to client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/wrapper/OpenApiClientGeneratorWrapper.java
diff --git a/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/wrapper/OpenApiReactiveClientGeneratorWrapper.java b/client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/wrapper/OpenApiReactiveClientGeneratorWrapper.java
similarity index 100%
rename from deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/wrapper/OpenApiReactiveClientGeneratorWrapper.java
rename to client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/wrapper/OpenApiReactiveClientGeneratorWrapper.java
diff --git a/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/wrapper/QuarkusCodegenConfigurator.java b/client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/wrapper/QuarkusCodegenConfigurator.java
similarity index 100%
rename from deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/wrapper/QuarkusCodegenConfigurator.java
rename to client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/wrapper/QuarkusCodegenConfigurator.java
diff --git a/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/wrapper/QuarkusJavaClientCodegen.java b/client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/wrapper/QuarkusJavaClientCodegen.java
similarity index 100%
rename from deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/wrapper/QuarkusJavaClientCodegen.java
rename to client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/wrapper/QuarkusJavaClientCodegen.java
diff --git a/deployment/src/main/resources/META-INF/services/io.quarkus.deployment.CodeGenProvider b/client/deployment/src/main/resources/META-INF/services/io.quarkus.deployment.CodeGenProvider
similarity index 100%
rename from deployment/src/main/resources/META-INF/services/io.quarkus.deployment.CodeGenProvider
rename to client/deployment/src/main/resources/META-INF/services/io.quarkus.deployment.CodeGenProvider
diff --git a/deployment/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig b/client/deployment/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig
similarity index 100%
rename from deployment/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig
rename to client/deployment/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig
diff --git a/deployment/src/main/resources/META-INF/services/org.openapitools.codegen.api.TemplatingEngineAdapter b/client/deployment/src/main/resources/META-INF/services/org.openapitools.codegen.api.TemplatingEngineAdapter
similarity index 100%
rename from deployment/src/main/resources/META-INF/services/org.openapitools.codegen.api.TemplatingEngineAdapter
rename to client/deployment/src/main/resources/META-INF/services/org.openapitools.codegen.api.TemplatingEngineAdapter
diff --git a/deployment/src/main/resources/application.properties b/client/deployment/src/main/resources/application.properties
similarity index 100%
rename from deployment/src/main/resources/application.properties
rename to client/deployment/src/main/resources/application.properties
diff --git a/deployment/src/main/resources/templates/libraries/microprofile/additionalEnumTypeAnnotations.qute b/client/deployment/src/main/resources/templates/libraries/microprofile/additionalEnumTypeAnnotations.qute
similarity index 100%
rename from deployment/src/main/resources/templates/libraries/microprofile/additionalEnumTypeAnnotations.qute
rename to client/deployment/src/main/resources/templates/libraries/microprofile/additionalEnumTypeAnnotations.qute
diff --git a/deployment/src/main/resources/templates/libraries/microprofile/additionalModelTypeAnnotations.qute b/client/deployment/src/main/resources/templates/libraries/microprofile/additionalModelTypeAnnotations.qute
similarity index 100%
rename from deployment/src/main/resources/templates/libraries/microprofile/additionalModelTypeAnnotations.qute
rename to client/deployment/src/main/resources/templates/libraries/microprofile/additionalModelTypeAnnotations.qute
diff --git a/deployment/src/main/resources/templates/libraries/microprofile/api.qute b/client/deployment/src/main/resources/templates/libraries/microprofile/api.qute
similarity index 100%
rename from deployment/src/main/resources/templates/libraries/microprofile/api.qute
rename to client/deployment/src/main/resources/templates/libraries/microprofile/api.qute
diff --git a/deployment/src/main/resources/templates/libraries/microprofile/auth/compositeAuthenticationProvider.qute b/client/deployment/src/main/resources/templates/libraries/microprofile/auth/compositeAuthenticationProvider.qute
similarity index 100%
rename from deployment/src/main/resources/templates/libraries/microprofile/auth/compositeAuthenticationProvider.qute
rename to client/deployment/src/main/resources/templates/libraries/microprofile/auth/compositeAuthenticationProvider.qute
diff --git a/deployment/src/main/resources/templates/libraries/microprofile/auth/headersFactory.qute b/client/deployment/src/main/resources/templates/libraries/microprofile/auth/headersFactory.qute
similarity index 100%
rename from deployment/src/main/resources/templates/libraries/microprofile/auth/headersFactory.qute
rename to client/deployment/src/main/resources/templates/libraries/microprofile/auth/headersFactory.qute
diff --git a/deployment/src/main/resources/templates/libraries/microprofile/beanValidation.qute b/client/deployment/src/main/resources/templates/libraries/microprofile/beanValidation.qute
similarity index 100%
rename from deployment/src/main/resources/templates/libraries/microprofile/beanValidation.qute
rename to client/deployment/src/main/resources/templates/libraries/microprofile/beanValidation.qute
diff --git a/deployment/src/main/resources/templates/libraries/microprofile/beanValidationCore.qute b/client/deployment/src/main/resources/templates/libraries/microprofile/beanValidationCore.qute
similarity index 100%
rename from deployment/src/main/resources/templates/libraries/microprofile/beanValidationCore.qute
rename to client/deployment/src/main/resources/templates/libraries/microprofile/beanValidationCore.qute
diff --git a/deployment/src/main/resources/templates/libraries/microprofile/beanValidationHeaderParams.qute b/client/deployment/src/main/resources/templates/libraries/microprofile/beanValidationHeaderParams.qute
similarity index 100%
rename from deployment/src/main/resources/templates/libraries/microprofile/beanValidationHeaderParams.qute
rename to client/deployment/src/main/resources/templates/libraries/microprofile/beanValidationHeaderParams.qute
diff --git a/deployment/src/main/resources/templates/libraries/microprofile/bodyParams.qute b/client/deployment/src/main/resources/templates/libraries/microprofile/bodyParams.qute
similarity index 100%
rename from deployment/src/main/resources/templates/libraries/microprofile/bodyParams.qute
rename to client/deployment/src/main/resources/templates/libraries/microprofile/bodyParams.qute
diff --git a/deployment/src/main/resources/templates/libraries/microprofile/enumClass.qute b/client/deployment/src/main/resources/templates/libraries/microprofile/enumClass.qute
similarity index 100%
rename from deployment/src/main/resources/templates/libraries/microprofile/enumClass.qute
rename to client/deployment/src/main/resources/templates/libraries/microprofile/enumClass.qute
diff --git a/deployment/src/main/resources/templates/libraries/microprofile/enumOuterClass.qute b/client/deployment/src/main/resources/templates/libraries/microprofile/enumOuterClass.qute
similarity index 100%
rename from deployment/src/main/resources/templates/libraries/microprofile/enumOuterClass.qute
rename to client/deployment/src/main/resources/templates/libraries/microprofile/enumOuterClass.qute
diff --git a/deployment/src/main/resources/templates/libraries/microprofile/headerParams.qute b/client/deployment/src/main/resources/templates/libraries/microprofile/headerParams.qute
similarity index 100%
rename from deployment/src/main/resources/templates/libraries/microprofile/headerParams.qute
rename to client/deployment/src/main/resources/templates/libraries/microprofile/headerParams.qute
diff --git a/deployment/src/main/resources/templates/libraries/microprofile/model.qute b/client/deployment/src/main/resources/templates/libraries/microprofile/model.qute
similarity index 100%
rename from deployment/src/main/resources/templates/libraries/microprofile/model.qute
rename to client/deployment/src/main/resources/templates/libraries/microprofile/model.qute
diff --git a/deployment/src/main/resources/templates/libraries/microprofile/multipartFormdataPojo.qute b/client/deployment/src/main/resources/templates/libraries/microprofile/multipartFormdataPojo.qute
similarity index 100%
rename from deployment/src/main/resources/templates/libraries/microprofile/multipartFormdataPojo.qute
rename to client/deployment/src/main/resources/templates/libraries/microprofile/multipartFormdataPojo.qute
diff --git a/deployment/src/main/resources/templates/libraries/microprofile/pathParams.qute b/client/deployment/src/main/resources/templates/libraries/microprofile/pathParams.qute
similarity index 100%
rename from deployment/src/main/resources/templates/libraries/microprofile/pathParams.qute
rename to client/deployment/src/main/resources/templates/libraries/microprofile/pathParams.qute
diff --git a/deployment/src/main/resources/templates/libraries/microprofile/pojo.qute b/client/deployment/src/main/resources/templates/libraries/microprofile/pojo.qute
similarity index 100%
rename from deployment/src/main/resources/templates/libraries/microprofile/pojo.qute
rename to client/deployment/src/main/resources/templates/libraries/microprofile/pojo.qute
diff --git a/deployment/src/main/resources/templates/libraries/microprofile/pojoAdditionalProperties.qute b/client/deployment/src/main/resources/templates/libraries/microprofile/pojoAdditionalProperties.qute
similarity index 100%
rename from deployment/src/main/resources/templates/libraries/microprofile/pojoAdditionalProperties.qute
rename to client/deployment/src/main/resources/templates/libraries/microprofile/pojoAdditionalProperties.qute
diff --git a/deployment/src/main/resources/templates/libraries/microprofile/pojoQueryParam.qute b/client/deployment/src/main/resources/templates/libraries/microprofile/pojoQueryParam.qute
similarity index 100%
rename from deployment/src/main/resources/templates/libraries/microprofile/pojoQueryParam.qute
rename to client/deployment/src/main/resources/templates/libraries/microprofile/pojoQueryParam.qute
diff --git a/deployment/src/main/resources/templates/libraries/microprofile/queryParams.qute b/client/deployment/src/main/resources/templates/libraries/microprofile/queryParams.qute
similarity index 100%
rename from deployment/src/main/resources/templates/libraries/microprofile/queryParams.qute
rename to client/deployment/src/main/resources/templates/libraries/microprofile/queryParams.qute
diff --git a/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/CodegenConfigTest.java b/client/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/CodegenConfigTest.java
similarity index 100%
rename from deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/CodegenConfigTest.java
rename to client/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/CodegenConfigTest.java
diff --git a/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/MockConfigUtils.java b/client/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/MockConfigUtils.java
similarity index 100%
rename from deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/MockConfigUtils.java
rename to client/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/MockConfigUtils.java
diff --git a/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/OpenApiConfigValidatorTest.java b/client/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/OpenApiConfigValidatorTest.java
similarity index 100%
rename from deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/OpenApiConfigValidatorTest.java
rename to client/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/OpenApiConfigValidatorTest.java
diff --git a/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/assertions/Assertions.java b/client/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/assertions/Assertions.java
similarity index 100%
rename from deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/assertions/Assertions.java
rename to client/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/assertions/Assertions.java
diff --git a/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/circuitbreaker/CircuitBreakerConfigurationParserTest.java b/client/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/circuitbreaker/CircuitBreakerConfigurationParserTest.java
similarity index 100%
rename from deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/circuitbreaker/CircuitBreakerConfigurationParserTest.java
rename to client/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/circuitbreaker/CircuitBreakerConfigurationParserTest.java
diff --git a/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/template/QuteTemplatingEngineAdapterTest.java b/client/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/template/QuteTemplatingEngineAdapterTest.java
similarity index 100%
rename from deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/template/QuteTemplatingEngineAdapterTest.java
rename to client/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/template/QuteTemplatingEngineAdapterTest.java
diff --git a/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/wrapper/OpenApiClientGeneratorWrapperTest.java b/client/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/wrapper/OpenApiClientGeneratorWrapperTest.java
similarity index 100%
rename from deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/wrapper/OpenApiClientGeneratorWrapperTest.java
rename to client/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/wrapper/OpenApiClientGeneratorWrapperTest.java
diff --git a/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/wrapper/QuarkusJavaClientCodegenTest.java b/client/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/wrapper/QuarkusJavaClientCodegenTest.java
similarity index 100%
rename from deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/wrapper/QuarkusJavaClientCodegenTest.java
rename to client/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/wrapper/QuarkusJavaClientCodegenTest.java
diff --git a/deployment/src/test/resources/circuitbreaker/application.properties b/client/deployment/src/test/resources/circuitbreaker/application.properties
similarity index 100%
rename from deployment/src/test/resources/circuitbreaker/application.properties
rename to client/deployment/src/test/resources/circuitbreaker/application.properties
diff --git a/deployment/src/test/resources/circuitbreaker/circuit_breaker_disabled_application.properties b/client/deployment/src/test/resources/circuitbreaker/circuit_breaker_disabled_application.properties
similarity index 100%
rename from deployment/src/test/resources/circuitbreaker/circuit_breaker_disabled_application.properties
rename to client/deployment/src/test/resources/circuitbreaker/circuit_breaker_disabled_application.properties
diff --git a/deployment/src/test/resources/circuitbreaker/missing_circuit_breaker_enabled_application.properties b/client/deployment/src/test/resources/circuitbreaker/missing_circuit_breaker_enabled_application.properties
similarity index 100%
rename from deployment/src/test/resources/circuitbreaker/missing_circuit_breaker_enabled_application.properties
rename to client/deployment/src/test/resources/circuitbreaker/missing_circuit_breaker_enabled_application.properties
diff --git a/deployment/src/test/resources/codegen/application.properties b/client/deployment/src/test/resources/codegen/application.properties
similarity index 100%
rename from deployment/src/test/resources/codegen/application.properties
rename to client/deployment/src/test/resources/codegen/application.properties
diff --git a/deployment/src/test/resources/deprecated/application.properties b/client/deployment/src/test/resources/deprecated/application.properties
similarity index 100%
rename from deployment/src/test/resources/deprecated/application.properties
rename to client/deployment/src/test/resources/deprecated/application.properties
diff --git a/deployment/src/test/resources/openapi/datetime-regression.yml b/client/deployment/src/test/resources/openapi/datetime-regression.yml
similarity index 100%
rename from deployment/src/test/resources/openapi/datetime-regression.yml
rename to client/deployment/src/test/resources/openapi/datetime-regression.yml
diff --git a/deployment/src/test/resources/openapi/deprecated.json b/client/deployment/src/test/resources/openapi/deprecated.json
similarity index 100%
rename from deployment/src/test/resources/openapi/deprecated.json
rename to client/deployment/src/test/resources/openapi/deprecated.json
diff --git a/deployment/src/test/resources/openapi/issue-28.yaml b/client/deployment/src/test/resources/openapi/issue-28.yaml
similarity index 100%
rename from deployment/src/test/resources/openapi/issue-28.yaml
rename to client/deployment/src/test/resources/openapi/issue-28.yaml
diff --git a/deployment/src/test/resources/openapi/issue-38.yaml b/client/deployment/src/test/resources/openapi/issue-38.yaml
similarity index 100%
rename from deployment/src/test/resources/openapi/issue-38.yaml
rename to client/deployment/src/test/resources/openapi/issue-38.yaml
diff --git a/deployment/src/test/resources/openapi/multipart-openapi.yml b/client/deployment/src/test/resources/openapi/multipart-openapi.yml
similarity index 100%
rename from deployment/src/test/resources/openapi/multipart-openapi.yml
rename to client/deployment/src/test/resources/openapi/multipart-openapi.yml
diff --git a/deployment/src/test/resources/openapi/open-api-normalizer.json b/client/deployment/src/test/resources/openapi/open-api-normalizer.json
similarity index 100%
rename from deployment/src/test/resources/openapi/open-api-normalizer.json
rename to client/deployment/src/test/resources/openapi/open-api-normalizer.json
diff --git a/deployment/src/test/resources/openapi/petstore-openapi-bearer.json b/client/deployment/src/test/resources/openapi/petstore-openapi-bearer.json
similarity index 100%
rename from deployment/src/test/resources/openapi/petstore-openapi-bearer.json
rename to client/deployment/src/test/resources/openapi/petstore-openapi-bearer.json
diff --git a/deployment/src/test/resources/openapi/petstore-openapi-custom-register-provider.json b/client/deployment/src/test/resources/openapi/petstore-openapi-custom-register-provider.json
similarity index 100%
rename from deployment/src/test/resources/openapi/petstore-openapi-custom-register-provider.json
rename to client/deployment/src/test/resources/openapi/petstore-openapi-custom-register-provider.json
diff --git a/deployment/src/test/resources/openapi/petstore-openapi-httpbasic.json b/client/deployment/src/test/resources/openapi/petstore-openapi-httpbasic.json
similarity index 100%
rename from deployment/src/test/resources/openapi/petstore-openapi-httpbasic.json
rename to client/deployment/src/test/resources/openapi/petstore-openapi-httpbasic.json
diff --git a/deployment/src/test/resources/openapi/petstore-openapi.json b/client/deployment/src/test/resources/openapi/petstore-openapi.json
similarity index 100%
rename from deployment/src/test/resources/openapi/petstore-openapi.json
rename to client/deployment/src/test/resources/openapi/petstore-openapi.json
diff --git a/deployment/src/test/resources/openapi/simple-openapi.json b/client/deployment/src/test/resources/openapi/simple-openapi.json
similarity index 100%
rename from deployment/src/test/resources/openapi/simple-openapi.json
rename to client/deployment/src/test/resources/openapi/simple-openapi.json
diff --git a/deployment/src/test/resources/openapi/suffix-prefix-openapi.json b/client/deployment/src/test/resources/openapi/suffix-prefix-openapi.json
similarity index 100%
rename from deployment/src/test/resources/openapi/suffix-prefix-openapi.json
rename to client/deployment/src/test/resources/openapi/suffix-prefix-openapi.json
diff --git a/deployment/src/test/resources/templates/hello.qute b/client/deployment/src/test/resources/templates/hello.qute
similarity index 100%
rename from deployment/src/test/resources/templates/hello.qute
rename to client/deployment/src/test/resources/templates/hello.qute
diff --git a/docs/antora.yml b/client/docs/antora.yml
similarity index 100%
rename from docs/antora.yml
rename to client/docs/antora.yml
diff --git a/docs/modules/ROOT/nav.adoc b/client/docs/modules/ROOT/nav.adoc
similarity index 100%
rename from docs/modules/ROOT/nav.adoc
rename to client/docs/modules/ROOT/nav.adoc
diff --git a/docs/modules/ROOT/pages/additional-properties-as-attribute.adoc b/client/docs/modules/ROOT/pages/additional-properties-as-attribute.adoc
similarity index 100%
rename from docs/modules/ROOT/pages/additional-properties-as-attribute.adoc
rename to client/docs/modules/ROOT/pages/additional-properties-as-attribute.adoc
diff --git a/docs/modules/ROOT/pages/config.adoc b/client/docs/modules/ROOT/pages/config.adoc
similarity index 100%
rename from docs/modules/ROOT/pages/config.adoc
rename to client/docs/modules/ROOT/pages/config.adoc
diff --git a/docs/modules/ROOT/pages/index.adoc b/client/docs/modules/ROOT/pages/index.adoc
similarity index 100%
rename from docs/modules/ROOT/pages/index.adoc
rename to client/docs/modules/ROOT/pages/index.adoc
diff --git a/integration-tests/additional-properties/pom.xml b/client/integration-tests/additional-properties/pom.xml
similarity index 100%
rename from integration-tests/additional-properties/pom.xml
rename to client/integration-tests/additional-properties/pom.xml
diff --git a/integration-tests/additional-properties/src/main/openapi/no-additional-properties-as-attr.yaml b/client/integration-tests/additional-properties/src/main/openapi/no-additional-properties-as-attr.yaml
similarity index 100%
rename from integration-tests/additional-properties/src/main/openapi/no-additional-properties-as-attr.yaml
rename to client/integration-tests/additional-properties/src/main/openapi/no-additional-properties-as-attr.yaml
diff --git a/integration-tests/additional-properties/src/main/openapi/with-additional-properties-as-attr.yaml b/client/integration-tests/additional-properties/src/main/openapi/with-additional-properties-as-attr.yaml
similarity index 100%
rename from integration-tests/additional-properties/src/main/openapi/with-additional-properties-as-attr.yaml
rename to client/integration-tests/additional-properties/src/main/openapi/with-additional-properties-as-attr.yaml
diff --git a/integration-tests/additional-properties/src/main/resources/application.properties b/client/integration-tests/additional-properties/src/main/resources/application.properties
similarity index 100%
rename from integration-tests/additional-properties/src/main/resources/application.properties
rename to client/integration-tests/additional-properties/src/main/resources/application.properties
diff --git a/integration-tests/additional-properties/src/test/java/io/quarkiverse/openapi/generator/additionalproperties/QuarkusAdditionalPropertiesAsAttributeAsFalseTest.java b/client/integration-tests/additional-properties/src/test/java/io/quarkiverse/openapi/generator/additionalproperties/QuarkusAdditionalPropertiesAsAttributeAsFalseTest.java
similarity index 100%
rename from integration-tests/additional-properties/src/test/java/io/quarkiverse/openapi/generator/additionalproperties/QuarkusAdditionalPropertiesAsAttributeAsFalseTest.java
rename to client/integration-tests/additional-properties/src/test/java/io/quarkiverse/openapi/generator/additionalproperties/QuarkusAdditionalPropertiesAsAttributeAsFalseTest.java
diff --git a/integration-tests/additional-properties/src/test/java/io/quarkiverse/openapi/generator/additionalproperties/QuarkusAdditionalPropertiesAsAttributeTrueTest.java b/client/integration-tests/additional-properties/src/test/java/io/quarkiverse/openapi/generator/additionalproperties/QuarkusAdditionalPropertiesAsAttributeTrueTest.java
similarity index 100%
rename from integration-tests/additional-properties/src/test/java/io/quarkiverse/openapi/generator/additionalproperties/QuarkusAdditionalPropertiesAsAttributeTrueTest.java
rename to client/integration-tests/additional-properties/src/test/java/io/quarkiverse/openapi/generator/additionalproperties/QuarkusAdditionalPropertiesAsAttributeTrueTest.java
diff --git a/integration-tests/array-enum/pom.xml b/client/integration-tests/array-enum/pom.xml
similarity index 100%
rename from integration-tests/array-enum/pom.xml
rename to client/integration-tests/array-enum/pom.xml
diff --git a/integration-tests/array-enum/src/main/openapi/array-enum.yaml b/client/integration-tests/array-enum/src/main/openapi/array-enum.yaml
similarity index 100%
rename from integration-tests/array-enum/src/main/openapi/array-enum.yaml
rename to client/integration-tests/array-enum/src/main/openapi/array-enum.yaml
diff --git a/integration-tests/array-enum/src/main/resources/application.properties b/client/integration-tests/array-enum/src/main/resources/application.properties
similarity index 100%
rename from integration-tests/array-enum/src/main/resources/application.properties
rename to client/integration-tests/array-enum/src/main/resources/application.properties
diff --git a/integration-tests/array-enum/src/test/java/io/quarkiverse/openapi/generator/it/ArrayEnumTest.java b/client/integration-tests/array-enum/src/test/java/io/quarkiverse/openapi/generator/it/ArrayEnumTest.java
similarity index 100%
rename from integration-tests/array-enum/src/test/java/io/quarkiverse/openapi/generator/it/ArrayEnumTest.java
rename to client/integration-tests/array-enum/src/test/java/io/quarkiverse/openapi/generator/it/ArrayEnumTest.java
diff --git a/integration-tests/beanparam/pom.xml b/client/integration-tests/beanparam/pom.xml
similarity index 100%
rename from integration-tests/beanparam/pom.xml
rename to client/integration-tests/beanparam/pom.xml
diff --git a/integration-tests/beanparam/src/main/openapi/openapi.yaml b/client/integration-tests/beanparam/src/main/openapi/openapi.yaml
similarity index 100%
rename from integration-tests/beanparam/src/main/openapi/openapi.yaml
rename to client/integration-tests/beanparam/src/main/openapi/openapi.yaml
diff --git a/integration-tests/beanparam/src/test/java/io/quarkiverse/openapi/generator/it/BeanParamOpenApiTest.java b/client/integration-tests/beanparam/src/test/java/io/quarkiverse/openapi/generator/it/BeanParamOpenApiTest.java
similarity index 100%
rename from integration-tests/beanparam/src/test/java/io/quarkiverse/openapi/generator/it/BeanParamOpenApiTest.java
rename to client/integration-tests/beanparam/src/test/java/io/quarkiverse/openapi/generator/it/BeanParamOpenApiTest.java
diff --git a/integration-tests/beanparam/src/test/java/io/quarkiverse/openapi/generator/it/WiremockBeanParam.java b/client/integration-tests/beanparam/src/test/java/io/quarkiverse/openapi/generator/it/WiremockBeanParam.java
similarity index 100%
rename from integration-tests/beanparam/src/test/java/io/quarkiverse/openapi/generator/it/WiremockBeanParam.java
rename to client/integration-tests/beanparam/src/test/java/io/quarkiverse/openapi/generator/it/WiremockBeanParam.java
diff --git a/integration-tests/change-directory/openapi-definitions/simple-openapi.yaml b/client/integration-tests/change-directory/openapi-definitions/simple-openapi.yaml
similarity index 100%
rename from integration-tests/change-directory/openapi-definitions/simple-openapi.yaml
rename to client/integration-tests/change-directory/openapi-definitions/simple-openapi.yaml
diff --git a/integration-tests/change-directory/pom.xml b/client/integration-tests/change-directory/pom.xml
similarity index 100%
rename from integration-tests/change-directory/pom.xml
rename to client/integration-tests/change-directory/pom.xml
diff --git a/integration-tests/change-directory/src/main/resources/application.properties b/client/integration-tests/change-directory/src/main/resources/application.properties
similarity index 100%
rename from integration-tests/change-directory/src/main/resources/application.properties
rename to client/integration-tests/change-directory/src/main/resources/application.properties
diff --git a/integration-tests/change-directory/src/test/java/it/ChangeDirectoryTest.java b/client/integration-tests/change-directory/src/test/java/it/ChangeDirectoryTest.java
similarity index 100%
rename from integration-tests/change-directory/src/test/java/it/ChangeDirectoryTest.java
rename to client/integration-tests/change-directory/src/test/java/it/ChangeDirectoryTest.java
diff --git a/integration-tests/circuit-breaker/pom.xml b/client/integration-tests/circuit-breaker/pom.xml
similarity index 100%
rename from integration-tests/circuit-breaker/pom.xml
rename to client/integration-tests/circuit-breaker/pom.xml
diff --git a/integration-tests/circuit-breaker/src/main/openapi/simple-openapi.json b/client/integration-tests/circuit-breaker/src/main/openapi/simple-openapi.json
similarity index 100%
rename from integration-tests/circuit-breaker/src/main/openapi/simple-openapi.json
rename to client/integration-tests/circuit-breaker/src/main/openapi/simple-openapi.json
diff --git a/integration-tests/circuit-breaker/src/main/resources/application.properties b/client/integration-tests/circuit-breaker/src/main/resources/application.properties
similarity index 100%
rename from integration-tests/circuit-breaker/src/main/resources/application.properties
rename to client/integration-tests/circuit-breaker/src/main/resources/application.properties
diff --git a/integration-tests/circuit-breaker/src/test/java/io/quarkiverse/openapi/generator/it/circuit/breaker/SimpleOpenApiTest.java b/client/integration-tests/circuit-breaker/src/test/java/io/quarkiverse/openapi/generator/it/circuit/breaker/SimpleOpenApiTest.java
similarity index 100%
rename from integration-tests/circuit-breaker/src/test/java/io/quarkiverse/openapi/generator/it/circuit/breaker/SimpleOpenApiTest.java
rename to client/integration-tests/circuit-breaker/src/test/java/io/quarkiverse/openapi/generator/it/circuit/breaker/SimpleOpenApiTest.java
diff --git a/integration-tests/circuit-breaker/src/test/java/io/quarkiverse/openapi/generator/it/circuit/breaker/assertions/Assertions.java b/client/integration-tests/circuit-breaker/src/test/java/io/quarkiverse/openapi/generator/it/circuit/breaker/assertions/Assertions.java
similarity index 100%
rename from integration-tests/circuit-breaker/src/test/java/io/quarkiverse/openapi/generator/it/circuit/breaker/assertions/Assertions.java
rename to client/integration-tests/circuit-breaker/src/test/java/io/quarkiverse/openapi/generator/it/circuit/breaker/assertions/Assertions.java
diff --git a/integration-tests/config-key/pom.xml b/client/integration-tests/config-key/pom.xml
similarity index 100%
rename from integration-tests/config-key/pom.xml
rename to client/integration-tests/config-key/pom.xml
diff --git a/integration-tests/config-key/src/main/java/io/quarkiverse/openapi/generator/configkey/AnotherCustomAnnotation.java b/client/integration-tests/config-key/src/main/java/io/quarkiverse/openapi/generator/configkey/AnotherCustomAnnotation.java
similarity index 100%
rename from integration-tests/config-key/src/main/java/io/quarkiverse/openapi/generator/configkey/AnotherCustomAnnotation.java
rename to client/integration-tests/config-key/src/main/java/io/quarkiverse/openapi/generator/configkey/AnotherCustomAnnotation.java
diff --git a/integration-tests/config-key/src/main/java/io/quarkiverse/openapi/generator/configkey/CustomAnnotation.java b/client/integration-tests/config-key/src/main/java/io/quarkiverse/openapi/generator/configkey/CustomAnnotation.java
similarity index 100%
rename from integration-tests/config-key/src/main/java/io/quarkiverse/openapi/generator/configkey/CustomAnnotation.java
rename to client/integration-tests/config-key/src/main/java/io/quarkiverse/openapi/generator/configkey/CustomAnnotation.java
diff --git a/integration-tests/config-key/src/main/openapi/config-key-openapi.yaml b/client/integration-tests/config-key/src/main/openapi/config-key-openapi.yaml
similarity index 100%
rename from integration-tests/config-key/src/main/openapi/config-key-openapi.yaml
rename to client/integration-tests/config-key/src/main/openapi/config-key-openapi.yaml
diff --git a/integration-tests/config-key/src/main/openapi/empty-config-key.yaml b/client/integration-tests/config-key/src/main/openapi/empty-config-key.yaml
similarity index 100%
rename from integration-tests/config-key/src/main/openapi/empty-config-key.yaml
rename to client/integration-tests/config-key/src/main/openapi/empty-config-key.yaml
diff --git a/integration-tests/config-key/src/main/resources/application.properties b/client/integration-tests/config-key/src/main/resources/application.properties
similarity index 100%
rename from integration-tests/config-key/src/main/resources/application.properties
rename to client/integration-tests/config-key/src/main/resources/application.properties
diff --git a/integration-tests/config-key/src/test/java/io/quarkiverse/openapi/generator/configkey/QuarkusConfigKeyOpenApiTest.java b/client/integration-tests/config-key/src/test/java/io/quarkiverse/openapi/generator/configkey/QuarkusConfigKeyOpenApiTest.java
similarity index 100%
rename from integration-tests/config-key/src/test/java/io/quarkiverse/openapi/generator/configkey/QuarkusConfigKeyOpenApiTest.java
rename to client/integration-tests/config-key/src/test/java/io/quarkiverse/openapi/generator/configkey/QuarkusConfigKeyOpenApiTest.java
diff --git a/integration-tests/custom-templates/pom.xml b/client/integration-tests/custom-templates/pom.xml
similarity index 100%
rename from integration-tests/custom-templates/pom.xml
rename to client/integration-tests/custom-templates/pom.xml
diff --git a/integration-tests/custom-templates/src/main/openapi/quarkus-simple-openapi.yaml b/client/integration-tests/custom-templates/src/main/openapi/quarkus-simple-openapi.yaml
similarity index 100%
rename from integration-tests/custom-templates/src/main/openapi/quarkus-simple-openapi.yaml
rename to client/integration-tests/custom-templates/src/main/openapi/quarkus-simple-openapi.yaml
diff --git a/integration-tests/custom-templates/src/main/resources/application.properties b/client/integration-tests/custom-templates/src/main/resources/application.properties
similarity index 100%
rename from integration-tests/custom-templates/src/main/resources/application.properties
rename to client/integration-tests/custom-templates/src/main/resources/application.properties
diff --git a/integration-tests/custom-templates/src/main/resources/templates/api.qute b/client/integration-tests/custom-templates/src/main/resources/templates/api.qute
similarity index 100%
rename from integration-tests/custom-templates/src/main/resources/templates/api.qute
rename to client/integration-tests/custom-templates/src/main/resources/templates/api.qute
diff --git a/integration-tests/custom-templates/src/main/resources/templates/pojoQueryParam.qute b/client/integration-tests/custom-templates/src/main/resources/templates/pojoQueryParam.qute
similarity index 100%
rename from integration-tests/custom-templates/src/main/resources/templates/pojoQueryParam.qute
rename to client/integration-tests/custom-templates/src/main/resources/templates/pojoQueryParam.qute
diff --git a/integration-tests/custom-templates/src/test/java/io/quarkiverse/openapi/generator/it/QuarkusSimpleOpenApiTest.java b/client/integration-tests/custom-templates/src/test/java/io/quarkiverse/openapi/generator/it/QuarkusSimpleOpenApiTest.java
similarity index 100%
rename from integration-tests/custom-templates/src/test/java/io/quarkiverse/openapi/generator/it/QuarkusSimpleOpenApiTest.java
rename to client/integration-tests/custom-templates/src/test/java/io/quarkiverse/openapi/generator/it/QuarkusSimpleOpenApiTest.java
diff --git a/integration-tests/enum-property/pom.xml b/client/integration-tests/enum-property/pom.xml
similarity index 100%
rename from integration-tests/enum-property/pom.xml
rename to client/integration-tests/enum-property/pom.xml
diff --git a/integration-tests/enum-property/src/main/openapi/enum-property.yaml b/client/integration-tests/enum-property/src/main/openapi/enum-property.yaml
similarity index 100%
rename from integration-tests/enum-property/src/main/openapi/enum-property.yaml
rename to client/integration-tests/enum-property/src/main/openapi/enum-property.yaml
diff --git a/integration-tests/enum-property/src/test/java/io/quarkiverse/openapi/generator/it/EnumPropertyTest.java b/client/integration-tests/enum-property/src/test/java/io/quarkiverse/openapi/generator/it/EnumPropertyTest.java
similarity index 100%
rename from integration-tests/enum-property/src/test/java/io/quarkiverse/openapi/generator/it/EnumPropertyTest.java
rename to client/integration-tests/enum-property/src/test/java/io/quarkiverse/openapi/generator/it/EnumPropertyTest.java
diff --git a/integration-tests/exclude/pom.xml b/client/integration-tests/exclude/pom.xml
similarity index 100%
rename from integration-tests/exclude/pom.xml
rename to client/integration-tests/exclude/pom.xml
diff --git a/integration-tests/exclude/src/main/openapi/exclude-openapi.yaml b/client/integration-tests/exclude/src/main/openapi/exclude-openapi.yaml
similarity index 100%
rename from integration-tests/exclude/src/main/openapi/exclude-openapi.yaml
rename to client/integration-tests/exclude/src/main/openapi/exclude-openapi.yaml
diff --git a/integration-tests/exclude/src/main/openapi/openapi.yaml b/client/integration-tests/exclude/src/main/openapi/openapi.yaml
similarity index 100%
rename from integration-tests/exclude/src/main/openapi/openapi.yaml
rename to client/integration-tests/exclude/src/main/openapi/openapi.yaml
diff --git a/integration-tests/exclude/src/main/resources/application.properties b/client/integration-tests/exclude/src/main/resources/application.properties
similarity index 100%
rename from integration-tests/exclude/src/main/resources/application.properties
rename to client/integration-tests/exclude/src/main/resources/application.properties
diff --git a/integration-tests/exclude/src/test/java/io/quarkiverse/openapi/generator/it/ExcludeTest.java b/client/integration-tests/exclude/src/test/java/io/quarkiverse/openapi/generator/it/ExcludeTest.java
similarity index 100%
rename from integration-tests/exclude/src/test/java/io/quarkiverse/openapi/generator/it/ExcludeTest.java
rename to client/integration-tests/exclude/src/test/java/io/quarkiverse/openapi/generator/it/ExcludeTest.java
diff --git a/integration-tests/generation-input/README.md b/client/integration-tests/generation-input/README.md
similarity index 100%
rename from integration-tests/generation-input/README.md
rename to client/integration-tests/generation-input/README.md
diff --git a/integration-tests/generation-input/pom.xml b/client/integration-tests/generation-input/pom.xml
similarity index 100%
rename from integration-tests/generation-input/pom.xml
rename to client/integration-tests/generation-input/pom.xml
diff --git a/integration-tests/generation-input/src/main/java/io/quarkiverse/openapi/generator/codegen/ClassPathPetstoreOpenApiSpecInputProvider.java b/client/integration-tests/generation-input/src/main/java/io/quarkiverse/openapi/generator/codegen/ClassPathPetstoreOpenApiSpecInputProvider.java
similarity index 100%
rename from integration-tests/generation-input/src/main/java/io/quarkiverse/openapi/generator/codegen/ClassPathPetstoreOpenApiSpecInputProvider.java
rename to client/integration-tests/generation-input/src/main/java/io/quarkiverse/openapi/generator/codegen/ClassPathPetstoreOpenApiSpecInputProvider.java
diff --git a/integration-tests/generation-input/src/main/resources/META-INF/services/io.quarkiverse.openapi.generator.deployment.codegen.OpenApiSpecInputProvider b/client/integration-tests/generation-input/src/main/resources/META-INF/services/io.quarkiverse.openapi.generator.deployment.codegen.OpenApiSpecInputProvider
similarity index 100%
rename from integration-tests/generation-input/src/main/resources/META-INF/services/io.quarkiverse.openapi.generator.deployment.codegen.OpenApiSpecInputProvider
rename to client/integration-tests/generation-input/src/main/resources/META-INF/services/io.quarkiverse.openapi.generator.deployment.codegen.OpenApiSpecInputProvider
diff --git a/integration-tests/generation-input/src/main/resources/specs/README.md b/client/integration-tests/generation-input/src/main/resources/specs/README.md
similarity index 100%
rename from integration-tests/generation-input/src/main/resources/specs/README.md
rename to client/integration-tests/generation-input/src/main/resources/specs/README.md
diff --git a/integration-tests/generation-input/src/main/resources/specs/petstore.json b/client/integration-tests/generation-input/src/main/resources/specs/petstore.json
similarity index 100%
rename from integration-tests/generation-input/src/main/resources/specs/petstore.json
rename to client/integration-tests/generation-input/src/main/resources/specs/petstore.json
diff --git a/integration-tests/generation-input/src/main/resources/specs/subtraction.yaml b/client/integration-tests/generation-input/src/main/resources/specs/subtraction.yaml
similarity index 100%
rename from integration-tests/generation-input/src/main/resources/specs/subtraction.yaml
rename to client/integration-tests/generation-input/src/main/resources/specs/subtraction.yaml
diff --git a/integration-tests/generation-tests/README.md b/client/integration-tests/generation-tests/README.md
similarity index 100%
rename from integration-tests/generation-tests/README.md
rename to client/integration-tests/generation-tests/README.md
diff --git a/integration-tests/generation-tests/pom.xml b/client/integration-tests/generation-tests/pom.xml
similarity index 100%
rename from integration-tests/generation-tests/pom.xml
rename to client/integration-tests/generation-tests/pom.xml
diff --git a/integration-tests/generation-tests/src/main/resources/application.properties b/client/integration-tests/generation-tests/src/main/resources/application.properties
similarity index 100%
rename from integration-tests/generation-tests/src/main/resources/application.properties
rename to client/integration-tests/generation-tests/src/main/resources/application.properties
diff --git a/integration-tests/generation-tests/src/test/java/io/quarkiverse/openapi/generator/it/PetStoreTest.java b/client/integration-tests/generation-tests/src/test/java/io/quarkiverse/openapi/generator/it/PetStoreTest.java
similarity index 100%
rename from integration-tests/generation-tests/src/test/java/io/quarkiverse/openapi/generator/it/PetStoreTest.java
rename to client/integration-tests/generation-tests/src/test/java/io/quarkiverse/openapi/generator/it/PetStoreTest.java
diff --git a/integration-tests/generation-tests/src/test/java/io/quarkiverse/openapi/generator/it/WiremockPetStore.java b/client/integration-tests/generation-tests/src/test/java/io/quarkiverse/openapi/generator/it/WiremockPetStore.java
similarity index 100%
rename from integration-tests/generation-tests/src/test/java/io/quarkiverse/openapi/generator/it/WiremockPetStore.java
rename to client/integration-tests/generation-tests/src/test/java/io/quarkiverse/openapi/generator/it/WiremockPetStore.java
diff --git a/integration-tests/github/pom.xml b/client/integration-tests/github/pom.xml
similarity index 100%
rename from integration-tests/github/pom.xml
rename to client/integration-tests/github/pom.xml
diff --git a/integration-tests/github/src/main/openapi/ghes-3.10.json b/client/integration-tests/github/src/main/openapi/ghes-3.10.json
similarity index 100%
rename from integration-tests/github/src/main/openapi/ghes-3.10.json
rename to client/integration-tests/github/src/main/openapi/ghes-3.10.json
diff --git a/integration-tests/include/pom.xml b/client/integration-tests/include/pom.xml
similarity index 100%
rename from integration-tests/include/pom.xml
rename to client/integration-tests/include/pom.xml
diff --git a/integration-tests/include/src/main/openapi/ignore-openapi.yaml b/client/integration-tests/include/src/main/openapi/ignore-openapi.yaml
similarity index 100%
rename from integration-tests/include/src/main/openapi/ignore-openapi.yaml
rename to client/integration-tests/include/src/main/openapi/ignore-openapi.yaml
diff --git a/integration-tests/include/src/main/openapi/include-openapi.yaml b/client/integration-tests/include/src/main/openapi/include-openapi.yaml
similarity index 100%
rename from integration-tests/include/src/main/openapi/include-openapi.yaml
rename to client/integration-tests/include/src/main/openapi/include-openapi.yaml
diff --git a/integration-tests/include/src/main/resources/application.properties b/client/integration-tests/include/src/main/resources/application.properties
similarity index 100%
rename from integration-tests/include/src/main/resources/application.properties
rename to client/integration-tests/include/src/main/resources/application.properties
diff --git a/integration-tests/include/src/test/java/io/quarkiverse/openapi/generator/it/IncludeTest.java b/client/integration-tests/include/src/test/java/io/quarkiverse/openapi/generator/it/IncludeTest.java
similarity index 100%
rename from integration-tests/include/src/test/java/io/quarkiverse/openapi/generator/it/IncludeTest.java
rename to client/integration-tests/include/src/test/java/io/quarkiverse/openapi/generator/it/IncludeTest.java
diff --git a/integration-tests/multipart-request/pom.xml b/client/integration-tests/multipart-request/pom.xml
similarity index 100%
rename from integration-tests/multipart-request/pom.xml
rename to client/integration-tests/multipart-request/pom.xml
diff --git a/integration-tests/multipart-request/src/main/openapi/multipart-requests.yml b/client/integration-tests/multipart-request/src/main/openapi/multipart-requests.yml
similarity index 100%
rename from integration-tests/multipart-request/src/main/openapi/multipart-requests.yml
rename to client/integration-tests/multipart-request/src/main/openapi/multipart-requests.yml
diff --git a/integration-tests/multipart-request/src/main/resources/application.properties b/client/integration-tests/multipart-request/src/main/resources/application.properties
similarity index 100%
rename from integration-tests/multipart-request/src/main/resources/application.properties
rename to client/integration-tests/multipart-request/src/main/resources/application.properties
diff --git a/integration-tests/multipart-request/src/test/java/io/quarkiverse/openapi/generator/it/multipart/request/MultipartRestEasyClassicTest.java b/client/integration-tests/multipart-request/src/test/java/io/quarkiverse/openapi/generator/it/multipart/request/MultipartRestEasyClassicTest.java
similarity index 100%
rename from integration-tests/multipart-request/src/test/java/io/quarkiverse/openapi/generator/it/multipart/request/MultipartRestEasyClassicTest.java
rename to client/integration-tests/multipart-request/src/test/java/io/quarkiverse/openapi/generator/it/multipart/request/MultipartRestEasyClassicTest.java
diff --git a/integration-tests/multipart-request/src/test/java/io/quarkiverse/openapi/generator/it/multipart/request/MultipartRestEasyReactiveTest.java b/client/integration-tests/multipart-request/src/test/java/io/quarkiverse/openapi/generator/it/multipart/request/MultipartRestEasyReactiveTest.java
similarity index 100%
rename from integration-tests/multipart-request/src/test/java/io/quarkiverse/openapi/generator/it/multipart/request/MultipartRestEasyReactiveTest.java
rename to client/integration-tests/multipart-request/src/test/java/io/quarkiverse/openapi/generator/it/multipart/request/MultipartRestEasyReactiveTest.java
diff --git a/integration-tests/multipart-request/src/test/java/io/quarkiverse/openapi/generator/it/multipart/request/WiremockMultipart.java b/client/integration-tests/multipart-request/src/test/java/io/quarkiverse/openapi/generator/it/multipart/request/WiremockMultipart.java
similarity index 100%
rename from integration-tests/multipart-request/src/test/java/io/quarkiverse/openapi/generator/it/multipart/request/WiremockMultipart.java
rename to client/integration-tests/multipart-request/src/test/java/io/quarkiverse/openapi/generator/it/multipart/request/WiremockMultipart.java
diff --git a/integration-tests/mutiny/pom.xml b/client/integration-tests/mutiny/pom.xml
similarity index 100%
rename from integration-tests/mutiny/pom.xml
rename to client/integration-tests/mutiny/pom.xml
diff --git a/integration-tests/mutiny/src/main/openapi/quarkus-simple-openapi.yaml b/client/integration-tests/mutiny/src/main/openapi/quarkus-simple-openapi.yaml
similarity index 100%
rename from integration-tests/mutiny/src/main/openapi/quarkus-simple-openapi.yaml
rename to client/integration-tests/mutiny/src/main/openapi/quarkus-simple-openapi.yaml
diff --git a/integration-tests/mutiny/src/main/resources/application.properties b/client/integration-tests/mutiny/src/main/resources/application.properties
similarity index 100%
rename from integration-tests/mutiny/src/main/resources/application.properties
rename to client/integration-tests/mutiny/src/main/resources/application.properties
diff --git a/integration-tests/mutiny/src/test/java/io/quarkiverse/openapi/generator/it/MutinyTest.java b/client/integration-tests/mutiny/src/test/java/io/quarkiverse/openapi/generator/it/MutinyTest.java
similarity index 100%
rename from integration-tests/mutiny/src/test/java/io/quarkiverse/openapi/generator/it/MutinyTest.java
rename to client/integration-tests/mutiny/src/test/java/io/quarkiverse/openapi/generator/it/MutinyTest.java
diff --git a/integration-tests/open-api-normalizer/pom.xml b/client/integration-tests/open-api-normalizer/pom.xml
similarity index 100%
rename from integration-tests/open-api-normalizer/pom.xml
rename to client/integration-tests/open-api-normalizer/pom.xml
diff --git a/integration-tests/open-api-normalizer/src/main/openapi/open-api-normalizer.json b/client/integration-tests/open-api-normalizer/src/main/openapi/open-api-normalizer.json
similarity index 100%
rename from integration-tests/open-api-normalizer/src/main/openapi/open-api-normalizer.json
rename to client/integration-tests/open-api-normalizer/src/main/openapi/open-api-normalizer.json
diff --git a/integration-tests/open-api-normalizer/src/main/resources/application.properties b/client/integration-tests/open-api-normalizer/src/main/resources/application.properties
similarity index 100%
rename from integration-tests/open-api-normalizer/src/main/resources/application.properties
rename to client/integration-tests/open-api-normalizer/src/main/resources/application.properties
diff --git a/integration-tests/open-api-normalizer/src/test/java/io/quarkiverse/openapi/generator/it/QuarkusOpenApiNormalizerTest.java b/client/integration-tests/open-api-normalizer/src/test/java/io/quarkiverse/openapi/generator/it/QuarkusOpenApiNormalizerTest.java
similarity index 100%
rename from integration-tests/open-api-normalizer/src/test/java/io/quarkiverse/openapi/generator/it/QuarkusOpenApiNormalizerTest.java
rename to client/integration-tests/open-api-normalizer/src/test/java/io/quarkiverse/openapi/generator/it/QuarkusOpenApiNormalizerTest.java
diff --git a/integration-tests/open-api-normalizer/src/test/java/io/quarkiverse/openapi/generator/it/WiremockTestResource.java b/client/integration-tests/open-api-normalizer/src/test/java/io/quarkiverse/openapi/generator/it/WiremockTestResource.java
similarity index 100%
rename from integration-tests/open-api-normalizer/src/test/java/io/quarkiverse/openapi/generator/it/WiremockTestResource.java
rename to client/integration-tests/open-api-normalizer/src/test/java/io/quarkiverse/openapi/generator/it/WiremockTestResource.java
diff --git a/integration-tests/open-api-normalizer/src/test/resources/primate.json b/client/integration-tests/open-api-normalizer/src/test/resources/primate.json
similarity index 100%
rename from integration-tests/open-api-normalizer/src/test/resources/primate.json
rename to client/integration-tests/open-api-normalizer/src/test/resources/primate.json
diff --git a/integration-tests/part-filename/pom.xml b/client/integration-tests/part-filename/pom.xml
similarity index 100%
rename from integration-tests/part-filename/pom.xml
rename to client/integration-tests/part-filename/pom.xml
diff --git a/integration-tests/part-filename/src/main/openapi/do-not-generate-part-filename.yml b/client/integration-tests/part-filename/src/main/openapi/do-not-generate-part-filename.yml
similarity index 100%
rename from integration-tests/part-filename/src/main/openapi/do-not-generate-part-filename.yml
rename to client/integration-tests/part-filename/src/main/openapi/do-not-generate-part-filename.yml
diff --git a/integration-tests/part-filename/src/main/openapi/do-not-use-field-name-in-part-filename.yml b/client/integration-tests/part-filename/src/main/openapi/do-not-use-field-name-in-part-filename.yml
similarity index 100%
rename from integration-tests/part-filename/src/main/openapi/do-not-use-field-name-in-part-filename.yml
rename to client/integration-tests/part-filename/src/main/openapi/do-not-use-field-name-in-part-filename.yml
diff --git a/integration-tests/part-filename/src/main/openapi/generate-part-filename.yml b/client/integration-tests/part-filename/src/main/openapi/generate-part-filename.yml
similarity index 100%
rename from integration-tests/part-filename/src/main/openapi/generate-part-filename.yml
rename to client/integration-tests/part-filename/src/main/openapi/generate-part-filename.yml
diff --git a/integration-tests/part-filename/src/main/openapi/global-generate-part-filename.yml b/client/integration-tests/part-filename/src/main/openapi/global-generate-part-filename.yml
similarity index 100%
rename from integration-tests/part-filename/src/main/openapi/global-generate-part-filename.yml
rename to client/integration-tests/part-filename/src/main/openapi/global-generate-part-filename.yml
diff --git a/integration-tests/part-filename/src/main/openapi/part-filename-value.yml b/client/integration-tests/part-filename/src/main/openapi/part-filename-value.yml
similarity index 100%
rename from integration-tests/part-filename/src/main/openapi/part-filename-value.yml
rename to client/integration-tests/part-filename/src/main/openapi/part-filename-value.yml
diff --git a/integration-tests/part-filename/src/main/resources/application.properties b/client/integration-tests/part-filename/src/main/resources/application.properties
similarity index 100%
rename from integration-tests/part-filename/src/main/resources/application.properties
rename to client/integration-tests/part-filename/src/main/resources/application.properties
diff --git a/integration-tests/part-filename/src/test/java/io/quarkiverse/openapi/generator/it/BasePartFilenameTest.java b/client/integration-tests/part-filename/src/test/java/io/quarkiverse/openapi/generator/it/BasePartFilenameTest.java
similarity index 100%
rename from integration-tests/part-filename/src/test/java/io/quarkiverse/openapi/generator/it/BasePartFilenameTest.java
rename to client/integration-tests/part-filename/src/test/java/io/quarkiverse/openapi/generator/it/BasePartFilenameTest.java
diff --git a/integration-tests/part-filename/src/test/java/io/quarkiverse/openapi/generator/it/PartFilenameRestEasyClassicTest.java b/client/integration-tests/part-filename/src/test/java/io/quarkiverse/openapi/generator/it/PartFilenameRestEasyClassicTest.java
similarity index 100%
rename from integration-tests/part-filename/src/test/java/io/quarkiverse/openapi/generator/it/PartFilenameRestEasyClassicTest.java
rename to client/integration-tests/part-filename/src/test/java/io/quarkiverse/openapi/generator/it/PartFilenameRestEasyClassicTest.java
diff --git a/integration-tests/part-filename/src/test/java/io/quarkiverse/openapi/generator/it/PartFilenameRestEasyReactiveTest.java b/client/integration-tests/part-filename/src/test/java/io/quarkiverse/openapi/generator/it/PartFilenameRestEasyReactiveTest.java
similarity index 100%
rename from integration-tests/part-filename/src/test/java/io/quarkiverse/openapi/generator/it/PartFilenameRestEasyReactiveTest.java
rename to client/integration-tests/part-filename/src/test/java/io/quarkiverse/openapi/generator/it/PartFilenameRestEasyReactiveTest.java
diff --git a/integration-tests/pom.xml b/client/integration-tests/pom.xml
similarity index 98%
rename from integration-tests/pom.xml
rename to client/integration-tests/pom.xml
index 870fb57c1..badba3592 100644
--- a/integration-tests/pom.xml
+++ b/client/integration-tests/pom.xml
@@ -5,11 +5,13 @@
     <groupId>io.quarkiverse.openapi.generator</groupId>
     <artifactId>quarkus-openapi-generator-parent</artifactId>
     <version>3.0.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>quarkus-openapi-generator-integration-tests</artifactId>
   <name>Quarkus - Openapi Generator - Integration Tests</name>
   <packaging>pom</packaging>
   <modules>
+    <module>additional-properties</module>
     <module>array-enum</module>
     <module>beanparam</module>
     <module>change-directory</module>
@@ -32,7 +34,6 @@
     <module>type-mapping</module>
     <module>config-key</module>
     <module>github</module>
-    <module>additional-properties</module>
   </modules>
   <dependencyManagement>
     <dependencies>
diff --git a/integration-tests/return-response/pom.xml b/client/integration-tests/return-response/pom.xml
similarity index 100%
rename from integration-tests/return-response/pom.xml
rename to client/integration-tests/return-response/pom.xml
diff --git a/integration-tests/return-response/src/main/openapi/mutiny-return-response-false-string-simple-openapi.yaml b/client/integration-tests/return-response/src/main/openapi/mutiny-return-response-false-string-simple-openapi.yaml
similarity index 100%
rename from integration-tests/return-response/src/main/openapi/mutiny-return-response-false-string-simple-openapi.yaml
rename to client/integration-tests/return-response/src/main/openapi/mutiny-return-response-false-string-simple-openapi.yaml
diff --git a/integration-tests/return-response/src/main/openapi/mutiny-return-response-false-void-simple-openapi.yaml b/client/integration-tests/return-response/src/main/openapi/mutiny-return-response-false-void-simple-openapi.yaml
similarity index 100%
rename from integration-tests/return-response/src/main/openapi/mutiny-return-response-false-void-simple-openapi.yaml
rename to client/integration-tests/return-response/src/main/openapi/mutiny-return-response-false-void-simple-openapi.yaml
diff --git a/integration-tests/return-response/src/main/openapi/mutiny-return-response-true-string-simple-openapi.yaml b/client/integration-tests/return-response/src/main/openapi/mutiny-return-response-true-string-simple-openapi.yaml
similarity index 100%
rename from integration-tests/return-response/src/main/openapi/mutiny-return-response-true-string-simple-openapi.yaml
rename to client/integration-tests/return-response/src/main/openapi/mutiny-return-response-true-string-simple-openapi.yaml
diff --git a/integration-tests/return-response/src/main/openapi/mutiny-return-response-true-void-simple-openapi.yaml b/client/integration-tests/return-response/src/main/openapi/mutiny-return-response-true-void-simple-openapi.yaml
similarity index 100%
rename from integration-tests/return-response/src/main/openapi/mutiny-return-response-true-void-simple-openapi.yaml
rename to client/integration-tests/return-response/src/main/openapi/mutiny-return-response-true-void-simple-openapi.yaml
diff --git a/integration-tests/return-response/src/main/openapi/return-response-false-string-simple-openapi.yaml b/client/integration-tests/return-response/src/main/openapi/return-response-false-string-simple-openapi.yaml
similarity index 100%
rename from integration-tests/return-response/src/main/openapi/return-response-false-string-simple-openapi.yaml
rename to client/integration-tests/return-response/src/main/openapi/return-response-false-string-simple-openapi.yaml
diff --git a/integration-tests/return-response/src/main/openapi/return-response-false-void-simple-openapi.yaml b/client/integration-tests/return-response/src/main/openapi/return-response-false-void-simple-openapi.yaml
similarity index 100%
rename from integration-tests/return-response/src/main/openapi/return-response-false-void-simple-openapi.yaml
rename to client/integration-tests/return-response/src/main/openapi/return-response-false-void-simple-openapi.yaml
diff --git a/integration-tests/return-response/src/main/openapi/return-response-true-string-simple-openapi.yaml b/client/integration-tests/return-response/src/main/openapi/return-response-true-string-simple-openapi.yaml
similarity index 100%
rename from integration-tests/return-response/src/main/openapi/return-response-true-string-simple-openapi.yaml
rename to client/integration-tests/return-response/src/main/openapi/return-response-true-string-simple-openapi.yaml
diff --git a/integration-tests/return-response/src/main/openapi/return-response-true-void-simple-openapi.yaml b/client/integration-tests/return-response/src/main/openapi/return-response-true-void-simple-openapi.yaml
similarity index 100%
rename from integration-tests/return-response/src/main/openapi/return-response-true-void-simple-openapi.yaml
rename to client/integration-tests/return-response/src/main/openapi/return-response-true-void-simple-openapi.yaml
diff --git a/integration-tests/return-response/src/main/resources/application.properties b/client/integration-tests/return-response/src/main/resources/application.properties
similarity index 100%
rename from integration-tests/return-response/src/main/resources/application.properties
rename to client/integration-tests/return-response/src/main/resources/application.properties
diff --git a/integration-tests/return-response/src/test/java/io/quarkiverse/openapi/generator/it/ReturnResponseTest.java b/client/integration-tests/return-response/src/test/java/io/quarkiverse/openapi/generator/it/ReturnResponseTest.java
similarity index 100%
rename from integration-tests/return-response/src/test/java/io/quarkiverse/openapi/generator/it/ReturnResponseTest.java
rename to client/integration-tests/return-response/src/test/java/io/quarkiverse/openapi/generator/it/ReturnResponseTest.java
diff --git a/integration-tests/security/pom.xml b/client/integration-tests/security/pom.xml
similarity index 100%
rename from integration-tests/security/pom.xml
rename to client/integration-tests/security/pom.xml
diff --git a/integration-tests/security/src/main/java/io/quarkiverse/openapi/generator/it/security/TokenPropagationResource.java b/client/integration-tests/security/src/main/java/io/quarkiverse/openapi/generator/it/security/TokenPropagationResource.java
similarity index 100%
rename from integration-tests/security/src/main/java/io/quarkiverse/openapi/generator/it/security/TokenPropagationResource.java
rename to client/integration-tests/security/src/main/java/io/quarkiverse/openapi/generator/it/security/TokenPropagationResource.java
diff --git a/integration-tests/security/src/main/java/io/quarkiverse/openapi/generator/it/security/auth/DummyApiKeyAuthenticationProvider.java b/client/integration-tests/security/src/main/java/io/quarkiverse/openapi/generator/it/security/auth/DummyApiKeyAuthenticationProvider.java
similarity index 100%
rename from integration-tests/security/src/main/java/io/quarkiverse/openapi/generator/it/security/auth/DummyApiKeyAuthenticationProvider.java
rename to client/integration-tests/security/src/main/java/io/quarkiverse/openapi/generator/it/security/auth/DummyApiKeyAuthenticationProvider.java
diff --git a/integration-tests/security/src/main/openapi/fooopenapi.json b/client/integration-tests/security/src/main/openapi/fooopenapi.json
similarity index 100%
rename from integration-tests/security/src/main/openapi/fooopenapi.json
rename to client/integration-tests/security/src/main/openapi/fooopenapi.json
diff --git a/integration-tests/security/src/main/openapi/open weather custom security.yaml b/client/integration-tests/security/src/main/openapi/open weather custom security.yaml
similarity index 100%
rename from integration-tests/security/src/main/openapi/open weather custom security.yaml
rename to client/integration-tests/security/src/main/openapi/open weather custom security.yaml
diff --git a/integration-tests/security/src/main/openapi/open weather no security.yaml b/client/integration-tests/security/src/main/openapi/open weather no security.yaml
similarity index 100%
rename from integration-tests/security/src/main/openapi/open weather no security.yaml
rename to client/integration-tests/security/src/main/openapi/open weather no security.yaml
diff --git a/integration-tests/security/src/main/openapi/open weather.yaml b/client/integration-tests/security/src/main/openapi/open weather.yaml
similarity index 100%
rename from integration-tests/security/src/main/openapi/open weather.yaml
rename to client/integration-tests/security/src/main/openapi/open weather.yaml
diff --git a/integration-tests/security/src/main/openapi/token-propagation-external-service1.yaml b/client/integration-tests/security/src/main/openapi/token-propagation-external-service1.yaml
similarity index 100%
rename from integration-tests/security/src/main/openapi/token-propagation-external-service1.yaml
rename to client/integration-tests/security/src/main/openapi/token-propagation-external-service1.yaml
diff --git a/integration-tests/security/src/main/openapi/token-propagation-external-service2.yaml b/client/integration-tests/security/src/main/openapi/token-propagation-external-service2.yaml
similarity index 100%
rename from integration-tests/security/src/main/openapi/token-propagation-external-service2.yaml
rename to client/integration-tests/security/src/main/openapi/token-propagation-external-service2.yaml
diff --git a/integration-tests/security/src/main/openapi/token-propagation-external-service3.yaml b/client/integration-tests/security/src/main/openapi/token-propagation-external-service3.yaml
similarity index 100%
rename from integration-tests/security/src/main/openapi/token-propagation-external-service3.yaml
rename to client/integration-tests/security/src/main/openapi/token-propagation-external-service3.yaml
diff --git a/integration-tests/security/src/main/openapi/token-propagation-external-service4.yaml b/client/integration-tests/security/src/main/openapi/token-propagation-external-service4.yaml
similarity index 100%
rename from integration-tests/security/src/main/openapi/token-propagation-external-service4.yaml
rename to client/integration-tests/security/src/main/openapi/token-propagation-external-service4.yaml
diff --git a/integration-tests/security/src/main/openapi/token-propagation-external-service5.yaml b/client/integration-tests/security/src/main/openapi/token-propagation-external-service5.yaml
similarity index 100%
rename from integration-tests/security/src/main/openapi/token-propagation-external-service5.yaml
rename to client/integration-tests/security/src/main/openapi/token-propagation-external-service5.yaml
diff --git a/integration-tests/security/src/main/resources/application.properties b/client/integration-tests/security/src/main/resources/application.properties
similarity index 100%
rename from integration-tests/security/src/main/resources/application.properties
rename to client/integration-tests/security/src/main/resources/application.properties
diff --git a/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/AuthorizationHeaderApiKeyCanFilterWithoutDuplicateAuthorizationTest.java b/client/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/AuthorizationHeaderApiKeyCanFilterWithoutDuplicateAuthorizationTest.java
similarity index 100%
rename from integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/AuthorizationHeaderApiKeyCanFilterWithoutDuplicateAuthorizationTest.java
rename to client/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/AuthorizationHeaderApiKeyCanFilterWithoutDuplicateAuthorizationTest.java
diff --git a/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/KeycloakServiceMock.java b/client/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/KeycloakServiceMock.java
similarity index 100%
rename from integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/KeycloakServiceMock.java
rename to client/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/KeycloakServiceMock.java
diff --git a/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/OpenWeatherCustomSecurityTest.java b/client/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/OpenWeatherCustomSecurityTest.java
similarity index 100%
rename from integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/OpenWeatherCustomSecurityTest.java
rename to client/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/OpenWeatherCustomSecurityTest.java
diff --git a/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/OpenWeatherDefaultSecurityTest.java b/client/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/OpenWeatherDefaultSecurityTest.java
similarity index 100%
rename from integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/OpenWeatherDefaultSecurityTest.java
rename to client/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/OpenWeatherDefaultSecurityTest.java
diff --git a/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/OpenWeatherTest.java b/client/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/OpenWeatherTest.java
similarity index 100%
rename from integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/OpenWeatherTest.java
rename to client/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/OpenWeatherTest.java
diff --git a/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/TokenPropagationExternalServicesMock.java b/client/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/TokenPropagationExternalServicesMock.java
similarity index 100%
rename from integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/TokenPropagationExternalServicesMock.java
rename to client/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/TokenPropagationExternalServicesMock.java
diff --git a/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/TokenPropagationTest.java b/client/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/TokenPropagationTest.java
similarity index 100%
rename from integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/TokenPropagationTest.java
rename to client/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/TokenPropagationTest.java
diff --git a/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/WiremockFoo.java b/client/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/WiremockFoo.java
similarity index 100%
rename from integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/WiremockFoo.java
rename to client/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/WiremockFoo.java
diff --git a/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/WiremockOpenWeather.java b/client/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/WiremockOpenWeather.java
similarity index 100%
rename from integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/WiremockOpenWeather.java
rename to client/integration-tests/security/src/test/java/io/quarkiverse/openapi/generator/it/security/WiremockOpenWeather.java
diff --git a/integration-tests/simple/pom.xml b/client/integration-tests/simple/pom.xml
similarity index 100%
rename from integration-tests/simple/pom.xml
rename to client/integration-tests/simple/pom.xml
diff --git a/integration-tests/simple/src/main/openapi/quarkus-simple-openapi.yaml b/client/integration-tests/simple/src/main/openapi/quarkus-simple-openapi.yaml
similarity index 100%
rename from integration-tests/simple/src/main/openapi/quarkus-simple-openapi.yaml
rename to client/integration-tests/simple/src/main/openapi/quarkus-simple-openapi.yaml
diff --git a/integration-tests/simple/src/main/resources/application.properties b/client/integration-tests/simple/src/main/resources/application.properties
similarity index 100%
rename from integration-tests/simple/src/main/resources/application.properties
rename to client/integration-tests/simple/src/main/resources/application.properties
diff --git a/integration-tests/simple/src/test/java/io/quarkiverse/openapi/generator/it/QuarkusSimpleOpenApiTest.java b/client/integration-tests/simple/src/test/java/io/quarkiverse/openapi/generator/it/QuarkusSimpleOpenApiTest.java
similarity index 100%
rename from integration-tests/simple/src/test/java/io/quarkiverse/openapi/generator/it/QuarkusSimpleOpenApiTest.java
rename to client/integration-tests/simple/src/test/java/io/quarkiverse/openapi/generator/it/QuarkusSimpleOpenApiTest.java
diff --git a/integration-tests/skip-validation/pom.xml b/client/integration-tests/skip-validation/pom.xml
similarity index 100%
rename from integration-tests/skip-validation/pom.xml
rename to client/integration-tests/skip-validation/pom.xml
diff --git a/integration-tests/skip-validation/src/main/openapi/awx.json b/client/integration-tests/skip-validation/src/main/openapi/awx.json
similarity index 100%
rename from integration-tests/skip-validation/src/main/openapi/awx.json
rename to client/integration-tests/skip-validation/src/main/openapi/awx.json
diff --git a/integration-tests/skip-validation/src/main/resources/application.properties b/client/integration-tests/skip-validation/src/main/resources/application.properties
similarity index 100%
rename from integration-tests/skip-validation/src/main/resources/application.properties
rename to client/integration-tests/skip-validation/src/main/resources/application.properties
diff --git a/integration-tests/skip-validation/src/test/java/io/quarkiverse/openapi/generator/it/AWXTest.java b/client/integration-tests/skip-validation/src/test/java/io/quarkiverse/openapi/generator/it/AWXTest.java
similarity index 100%
rename from integration-tests/skip-validation/src/test/java/io/quarkiverse/openapi/generator/it/AWXTest.java
rename to client/integration-tests/skip-validation/src/test/java/io/quarkiverse/openapi/generator/it/AWXTest.java
diff --git a/integration-tests/skip-validation/src/test/java/io/quarkiverse/openapi/generator/it/WiremockAWX.java b/client/integration-tests/skip-validation/src/test/java/io/quarkiverse/openapi/generator/it/WiremockAWX.java
similarity index 100%
rename from integration-tests/skip-validation/src/test/java/io/quarkiverse/openapi/generator/it/WiremockAWX.java
rename to client/integration-tests/skip-validation/src/test/java/io/quarkiverse/openapi/generator/it/WiremockAWX.java
diff --git a/integration-tests/suffix-prefix/pom.xml b/client/integration-tests/suffix-prefix/pom.xml
similarity index 100%
rename from integration-tests/suffix-prefix/pom.xml
rename to client/integration-tests/suffix-prefix/pom.xml
diff --git a/integration-tests/suffix-prefix/src/main/openapi/quarkus-suffix-prefix-openapi.yaml b/client/integration-tests/suffix-prefix/src/main/openapi/quarkus-suffix-prefix-openapi.yaml
similarity index 100%
rename from integration-tests/suffix-prefix/src/main/openapi/quarkus-suffix-prefix-openapi.yaml
rename to client/integration-tests/suffix-prefix/src/main/openapi/quarkus-suffix-prefix-openapi.yaml
diff --git a/integration-tests/suffix-prefix/src/main/resources/application.properties b/client/integration-tests/suffix-prefix/src/main/resources/application.properties
similarity index 100%
rename from integration-tests/suffix-prefix/src/main/resources/application.properties
rename to client/integration-tests/suffix-prefix/src/main/resources/application.properties
diff --git a/integration-tests/suffix-prefix/src/test/java/io/quarkiverse/openapi/generator/it/QuarkusSuffixPrefixOpenApiTest.java b/client/integration-tests/suffix-prefix/src/test/java/io/quarkiverse/openapi/generator/it/QuarkusSuffixPrefixOpenApiTest.java
similarity index 100%
rename from integration-tests/suffix-prefix/src/test/java/io/quarkiverse/openapi/generator/it/QuarkusSuffixPrefixOpenApiTest.java
rename to client/integration-tests/suffix-prefix/src/test/java/io/quarkiverse/openapi/generator/it/QuarkusSuffixPrefixOpenApiTest.java
diff --git a/integration-tests/type-mapping/pom.xml b/client/integration-tests/type-mapping/pom.xml
similarity index 100%
rename from integration-tests/type-mapping/pom.xml
rename to client/integration-tests/type-mapping/pom.xml
diff --git a/integration-tests/type-mapping/src/main/java/io/quarkiverse/openapi/generator/it/type/mapping/OffsetDateTimeParamConverter.java b/client/integration-tests/type-mapping/src/main/java/io/quarkiverse/openapi/generator/it/type/mapping/OffsetDateTimeParamConverter.java
similarity index 100%
rename from integration-tests/type-mapping/src/main/java/io/quarkiverse/openapi/generator/it/type/mapping/OffsetDateTimeParamConverter.java
rename to client/integration-tests/type-mapping/src/main/java/io/quarkiverse/openapi/generator/it/type/mapping/OffsetDateTimeParamConverter.java
diff --git a/integration-tests/type-mapping/src/main/java/io/quarkiverse/openapi/generator/it/type/mapping/OffsetDateTimeParamConverterProvider.java b/client/integration-tests/type-mapping/src/main/java/io/quarkiverse/openapi/generator/it/type/mapping/OffsetDateTimeParamConverterProvider.java
similarity index 100%
rename from integration-tests/type-mapping/src/main/java/io/quarkiverse/openapi/generator/it/type/mapping/OffsetDateTimeParamConverterProvider.java
rename to client/integration-tests/type-mapping/src/main/java/io/quarkiverse/openapi/generator/it/type/mapping/OffsetDateTimeParamConverterProvider.java
diff --git a/integration-tests/type-mapping/src/main/openapi/type-mappings-testing.yml b/client/integration-tests/type-mapping/src/main/openapi/type-mappings-testing.yml
similarity index 100%
rename from integration-tests/type-mapping/src/main/openapi/type-mappings-testing.yml
rename to client/integration-tests/type-mapping/src/main/openapi/type-mappings-testing.yml
diff --git a/integration-tests/type-mapping/src/main/resources/application.properties b/client/integration-tests/type-mapping/src/main/resources/application.properties
similarity index 100%
rename from integration-tests/type-mapping/src/main/resources/application.properties
rename to client/integration-tests/type-mapping/src/main/resources/application.properties
diff --git a/integration-tests/type-mapping/src/test/java/io/quarkiverse/openapi/generator/it/type/mapping/TypeAndImportMappingRestEasyClassicTest.java b/client/integration-tests/type-mapping/src/test/java/io/quarkiverse/openapi/generator/it/type/mapping/TypeAndImportMappingRestEasyClassicTest.java
similarity index 100%
rename from integration-tests/type-mapping/src/test/java/io/quarkiverse/openapi/generator/it/type/mapping/TypeAndImportMappingRestEasyClassicTest.java
rename to client/integration-tests/type-mapping/src/test/java/io/quarkiverse/openapi/generator/it/type/mapping/TypeAndImportMappingRestEasyClassicTest.java
diff --git a/integration-tests/type-mapping/src/test/java/io/quarkiverse/openapi/generator/it/type/mapping/TypeAndImportMappingRestEasyReactiveTest.java b/client/integration-tests/type-mapping/src/test/java/io/quarkiverse/openapi/generator/it/type/mapping/TypeAndImportMappingRestEasyReactiveTest.java
similarity index 100%
rename from integration-tests/type-mapping/src/test/java/io/quarkiverse/openapi/generator/it/type/mapping/TypeAndImportMappingRestEasyReactiveTest.java
rename to client/integration-tests/type-mapping/src/test/java/io/quarkiverse/openapi/generator/it/type/mapping/TypeAndImportMappingRestEasyReactiveTest.java
diff --git a/integration-tests/type-mapping/src/test/java/io/quarkiverse/openapi/generator/it/type/mapping/WiremockTypeAndImportMapping.java b/client/integration-tests/type-mapping/src/test/java/io/quarkiverse/openapi/generator/it/type/mapping/WiremockTypeAndImportMapping.java
similarity index 100%
rename from integration-tests/type-mapping/src/test/java/io/quarkiverse/openapi/generator/it/type/mapping/WiremockTypeAndImportMapping.java
rename to client/integration-tests/type-mapping/src/test/java/io/quarkiverse/openapi/generator/it/type/mapping/WiremockTypeAndImportMapping.java
diff --git a/runtime/pom.xml b/client/runtime/pom.xml
similarity index 98%
rename from runtime/pom.xml
rename to client/runtime/pom.xml
index 80f11fb53..6a3ef818b 100644
--- a/runtime/pom.xml
+++ b/client/runtime/pom.xml
@@ -5,6 +5,7 @@
     <groupId>io.quarkiverse.openapi.generator</groupId>
     <artifactId>quarkus-openapi-generator-parent</artifactId>
     <version>3.0.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>quarkus-openapi-generator</artifactId>
   <name>Quarkus - Openapi Generator - Runtime</name>
diff --git a/runtime/src/main/java/io/quarkiverse/openapi/generator/AuthConfig.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/AuthConfig.java
similarity index 100%
rename from runtime/src/main/java/io/quarkiverse/openapi/generator/AuthConfig.java
rename to client/runtime/src/main/java/io/quarkiverse/openapi/generator/AuthConfig.java
diff --git a/runtime/src/main/java/io/quarkiverse/openapi/generator/AuthsConfig.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/AuthsConfig.java
similarity index 100%
rename from runtime/src/main/java/io/quarkiverse/openapi/generator/AuthsConfig.java
rename to client/runtime/src/main/java/io/quarkiverse/openapi/generator/AuthsConfig.java
diff --git a/runtime/src/main/java/io/quarkiverse/openapi/generator/OpenApiGeneratorConfig.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/OpenApiGeneratorConfig.java
similarity index 100%
rename from runtime/src/main/java/io/quarkiverse/openapi/generator/OpenApiGeneratorConfig.java
rename to client/runtime/src/main/java/io/quarkiverse/openapi/generator/OpenApiGeneratorConfig.java
diff --git a/runtime/src/main/java/io/quarkiverse/openapi/generator/OpenApiGeneratorException.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/OpenApiGeneratorException.java
similarity index 100%
rename from runtime/src/main/java/io/quarkiverse/openapi/generator/OpenApiGeneratorException.java
rename to client/runtime/src/main/java/io/quarkiverse/openapi/generator/OpenApiGeneratorException.java
diff --git a/runtime/src/main/java/io/quarkiverse/openapi/generator/SpecItemConfig.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/SpecItemConfig.java
similarity index 100%
rename from runtime/src/main/java/io/quarkiverse/openapi/generator/SpecItemConfig.java
rename to client/runtime/src/main/java/io/quarkiverse/openapi/generator/SpecItemConfig.java
diff --git a/runtime/src/main/java/io/quarkiverse/openapi/generator/annotations/GeneratedClass.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/annotations/GeneratedClass.java
similarity index 100%
rename from runtime/src/main/java/io/quarkiverse/openapi/generator/annotations/GeneratedClass.java
rename to client/runtime/src/main/java/io/quarkiverse/openapi/generator/annotations/GeneratedClass.java
diff --git a/runtime/src/main/java/io/quarkiverse/openapi/generator/annotations/GeneratedMethod.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/annotations/GeneratedMethod.java
similarity index 100%
rename from runtime/src/main/java/io/quarkiverse/openapi/generator/annotations/GeneratedMethod.java
rename to client/runtime/src/main/java/io/quarkiverse/openapi/generator/annotations/GeneratedMethod.java
diff --git a/runtime/src/main/java/io/quarkiverse/openapi/generator/annotations/GeneratedParam.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/annotations/GeneratedParam.java
similarity index 100%
rename from runtime/src/main/java/io/quarkiverse/openapi/generator/annotations/GeneratedParam.java
rename to client/runtime/src/main/java/io/quarkiverse/openapi/generator/annotations/GeneratedParam.java
diff --git a/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/AbstractAuthProvider.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/AbstractAuthProvider.java
similarity index 100%
rename from runtime/src/main/java/io/quarkiverse/openapi/generator/providers/AbstractAuthProvider.java
rename to client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/AbstractAuthProvider.java
diff --git a/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/AbstractAuthenticationPropagationHeadersFactory.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/AbstractAuthenticationPropagationHeadersFactory.java
similarity index 100%
rename from runtime/src/main/java/io/quarkiverse/openapi/generator/providers/AbstractAuthenticationPropagationHeadersFactory.java
rename to client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/AbstractAuthenticationPropagationHeadersFactory.java
diff --git a/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/AbstractCompositeAuthenticationProvider.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/AbstractCompositeAuthenticationProvider.java
similarity index 100%
rename from runtime/src/main/java/io/quarkiverse/openapi/generator/providers/AbstractCompositeAuthenticationProvider.java
rename to client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/AbstractCompositeAuthenticationProvider.java
diff --git a/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/ApiKeyAuthenticationProvider.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/ApiKeyAuthenticationProvider.java
similarity index 100%
rename from runtime/src/main/java/io/quarkiverse/openapi/generator/providers/ApiKeyAuthenticationProvider.java
rename to client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/ApiKeyAuthenticationProvider.java
diff --git a/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/ApiKeyIn.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/ApiKeyIn.java
similarity index 100%
rename from runtime/src/main/java/io/quarkiverse/openapi/generator/providers/ApiKeyIn.java
rename to client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/ApiKeyIn.java
diff --git a/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/AuthProvider.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/AuthProvider.java
similarity index 100%
rename from runtime/src/main/java/io/quarkiverse/openapi/generator/providers/AuthProvider.java
rename to client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/AuthProvider.java
diff --git a/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/AuthUtils.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/AuthUtils.java
similarity index 100%
rename from runtime/src/main/java/io/quarkiverse/openapi/generator/providers/AuthUtils.java
rename to client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/AuthUtils.java
diff --git a/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/BasicAuthenticationProvider.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/BasicAuthenticationProvider.java
similarity index 100%
rename from runtime/src/main/java/io/quarkiverse/openapi/generator/providers/BasicAuthenticationProvider.java
rename to client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/BasicAuthenticationProvider.java
diff --git a/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/BearerAuthenticationProvider.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/BearerAuthenticationProvider.java
similarity index 100%
rename from runtime/src/main/java/io/quarkiverse/openapi/generator/providers/BearerAuthenticationProvider.java
rename to client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/BearerAuthenticationProvider.java
diff --git a/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/DefaultHeadersProvider.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/DefaultHeadersProvider.java
similarity index 100%
rename from runtime/src/main/java/io/quarkiverse/openapi/generator/providers/DefaultHeadersProvider.java
rename to client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/DefaultHeadersProvider.java
diff --git a/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/HeadersProvider.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/HeadersProvider.java
similarity index 100%
rename from runtime/src/main/java/io/quarkiverse/openapi/generator/providers/HeadersProvider.java
rename to client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/HeadersProvider.java
diff --git a/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/OAuth2AuthenticationProvider.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/OAuth2AuthenticationProvider.java
similarity index 100%
rename from runtime/src/main/java/io/quarkiverse/openapi/generator/providers/OAuth2AuthenticationProvider.java
rename to client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/OAuth2AuthenticationProvider.java
diff --git a/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/OperationAuthInfo.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/OperationAuthInfo.java
similarity index 100%
rename from runtime/src/main/java/io/quarkiverse/openapi/generator/providers/OperationAuthInfo.java
rename to client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/OperationAuthInfo.java
diff --git a/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/UrlPatternMatcher.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/UrlPatternMatcher.java
similarity index 100%
rename from runtime/src/main/java/io/quarkiverse/openapi/generator/providers/UrlPatternMatcher.java
rename to client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/UrlPatternMatcher.java
diff --git a/runtime/src/main/resources/META-INF/beans.xml b/client/runtime/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from runtime/src/main/resources/META-INF/beans.xml
rename to client/runtime/src/main/resources/META-INF/beans.xml
diff --git a/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/client/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
rename from runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename to client/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/AbstractAuthenticationProviderTest.java b/client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/AbstractAuthenticationProviderTest.java
similarity index 100%
rename from runtime/src/test/java/io/quarkiverse/openapi/generator/providers/AbstractAuthenticationProviderTest.java
rename to client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/AbstractAuthenticationProviderTest.java
diff --git a/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/ApiKeyAuthenticationProviderTest.java b/client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/ApiKeyAuthenticationProviderTest.java
similarity index 100%
rename from runtime/src/test/java/io/quarkiverse/openapi/generator/providers/ApiKeyAuthenticationProviderTest.java
rename to client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/ApiKeyAuthenticationProviderTest.java
diff --git a/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/BasicAuthenticationProviderTest.java b/client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/BasicAuthenticationProviderTest.java
similarity index 100%
rename from runtime/src/test/java/io/quarkiverse/openapi/generator/providers/BasicAuthenticationProviderTest.java
rename to client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/BasicAuthenticationProviderTest.java
diff --git a/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/BearerAuthenticationProviderTest.java b/client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/BearerAuthenticationProviderTest.java
similarity index 100%
rename from runtime/src/test/java/io/quarkiverse/openapi/generator/providers/BearerAuthenticationProviderTest.java
rename to client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/BearerAuthenticationProviderTest.java
diff --git a/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/UrlPatternMatcherTest.java b/client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/UrlPatternMatcherTest.java
similarity index 100%
rename from runtime/src/test/java/io/quarkiverse/openapi/generator/providers/UrlPatternMatcherTest.java
rename to client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/UrlPatternMatcherTest.java
diff --git a/test-utils/pom.xml b/client/test-utils/pom.xml
similarity index 96%
rename from test-utils/pom.xml
rename to client/test-utils/pom.xml
index ec0455bbb..da8dadd6a 100644
--- a/test-utils/pom.xml
+++ b/client/test-utils/pom.xml
@@ -5,6 +5,7 @@
     <artifactId>quarkus-openapi-generator-parent</artifactId>
     <groupId>io.quarkiverse.openapi.generator</groupId>
     <version>3.0.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>quarkus-openapi-generator-test-utils</artifactId>
   <name>Quarkus - Openapi Generator - Test Utils</name>
diff --git a/test-utils/src/main/java/io/quarkiverse/openapi/generator/testutils/circuitbreaker/assertions/CircuitBreakerMethodAssert.java b/client/test-utils/src/main/java/io/quarkiverse/openapi/generator/testutils/circuitbreaker/assertions/CircuitBreakerMethodAssert.java
similarity index 100%
rename from test-utils/src/main/java/io/quarkiverse/openapi/generator/testutils/circuitbreaker/assertions/CircuitBreakerMethodAssert.java
rename to client/test-utils/src/main/java/io/quarkiverse/openapi/generator/testutils/circuitbreaker/assertions/CircuitBreakerMethodAssert.java
diff --git a/test-utils/src/main/java/io/quarkiverse/openapi/generator/testutils/keycloak/KeycloakRealmResourceManager.java b/client/test-utils/src/main/java/io/quarkiverse/openapi/generator/testutils/keycloak/KeycloakRealmResourceManager.java
similarity index 100%
rename from test-utils/src/main/java/io/quarkiverse/openapi/generator/testutils/keycloak/KeycloakRealmResourceManager.java
rename to client/test-utils/src/main/java/io/quarkiverse/openapi/generator/testutils/keycloak/KeycloakRealmResourceManager.java
diff --git a/pom.xml b/pom.xml
index 802147d8e..aae8852d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,9 +12,9 @@
   <packaging>pom</packaging>
   <name>Quarkus - Openapi Generator - Parent</name>
   <modules>
-    <module>deployment</module>
-    <module>runtime</module>
-    <module>test-utils</module>
+    <module>client/deployment</module>
+    <module>client/runtime</module>
+    <module>client/test-utils</module>
     <module>server</module>
   </modules>
   <scm>
@@ -126,7 +126,8 @@
         </property>
       </activation>
       <modules>
-        <module>integration-tests</module>
+        <module>client/integration-tests</module>
+        <module>server/integration-tests</module>
       </modules>
     </profile>
   </profiles>
diff --git a/server/deployment/src/main/java/io/quarkiverse/openapi/server/generator/deployment/codegen/ApicurioCodegenWrapper.java b/server/deployment/src/main/java/io/quarkiverse/openapi/server/generator/deployment/codegen/ApicurioCodegenWrapper.java
index 43e3ce7b3..a56005514 100755
--- a/server/deployment/src/main/java/io/quarkiverse/openapi/server/generator/deployment/codegen/ApicurioCodegenWrapper.java
+++ b/server/deployment/src/main/java/io/quarkiverse/openapi/server/generator/deployment/codegen/ApicurioCodegenWrapper.java
@@ -1,21 +1,25 @@
 package io.quarkiverse.openapi.server.generator.deployment.codegen;
 
-import static io.quarkiverse.openapi.server.generator.deployment.CodegenConfig.getBasePackagePropertyName;
+import io.apicurio.hub.api.codegen.JaxRsProjectSettings;
+import io.apicurio.hub.api.codegen.OpenApi2JaxRs;
+import io.quarkus.bootstrap.prebuild.CodeGenException;
+import org.apache.commons.io.IOUtils;
+import org.eclipse.microprofile.config.Config;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.nio.file.Path;
 import java.util.Enumeration;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import org.apache.commons.io.IOUtils;
-import org.eclipse.microprofile.config.Config;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.apicurio.hub.api.codegen.JaxRsProjectSettings;
-import io.apicurio.hub.api.codegen.OpenApi2JaxRs;
-import io.quarkus.bootstrap.prebuild.CodeGenException;
+import static io.quarkiverse.openapi.server.generator.deployment.CodegenConfig.getBasePackagePropertyName;
 
 public class ApicurioCodegenWrapper {
 
@@ -53,16 +57,20 @@ public void generate(Path openApiResource) throws CodeGenException {
 
         // Generate code - output a ZIP file.
         File zipFile = new File(outdir, "generated-code.zip");
-        try (FileOutputStream fos = new FileOutputStream(zipFile)) {
+
+        try (FileOutputStream fos = new FileOutputStream(zipFile);
+                FileInputStream openApiStream = new FileInputStream(openApiFile)) {
             OpenApi2JaxRs generator = new OpenApi2JaxRs();
             generator.setSettings(projectSettings);
             generator.setUpdateOnly(true);
-            generator.setOpenApiDocument(new FileInputStream(openApiFile));
+            generator.setOpenApiDocument(openApiStream);
             log.info("Generating code...");
             generator.generate(fos);
         } catch (Exception e) {
             log.error("Error generating code from openapi spec", e);
             throw new CodeGenException(e);
+        } finally {
+
         }
 
         // Unpack the temporary ZIP file
diff --git a/server/pom.xml b/server/pom.xml
index ce3a610e9..15f56e71b 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -16,6 +16,5 @@
     <modules>
         <module>deployment</module>
         <module>runtime</module>
-        <module>integration-tests</module>
     </modules>
 </project>
\ No newline at end of file