diff --git a/bin/generate-samples.sh b/bin/generate-samples.sh
index a84ef4aa9ed..a92de09b4cb 100755
--- a/bin/generate-samples.sh
+++ b/bin/generate-samples.sh
@@ -10,6 +10,8 @@ if [ ! -f "$executable" ]; then
   (cd "${root}" && mvn -B --no-snapshot-updates clean package -DskipTests=true -Dmaven.javadoc.skip=true -Djacoco.skip=true)
 fi
 
+# -ea -> enable assertions
+# -server -> server version of the VM which has more complex optimizations, + is tuned to maximize performance
 export JAVA_OPTS="${JAVA_OPTS} -ea -server -Duser.timezone=UTC"
 export BATCH_OPTS="${BATCH_OPTS:-}"
 
@@ -53,10 +55,10 @@ if [[ ${#files[@]} -eq 1 && "${files[0]}" != *'*'* ]]; then
     java ${JAVA_OPTS} -jar "$executable" generate -c ${files[0]} ${args[@]}
 else
     echo "Please press CTRL+C to stop or the script will continue in 5 seconds."
-    sleep 5
     if [ ${#files[@]} -eq 0 ]; then
       files=("${root}"/bin/generate_samples_configs/*.yaml)
     fi
+    sleep 5
 
     # shellcheck disable=SC2086
     # shellcheck disable=SC2068
diff --git a/bin/generate_samples_configs/java_3_0_3_unit_test.yaml b/bin/generate_samples_configs/java_3_0_3_unit_test.yaml
index bdd4baf6ee9..fcf39643017 100644
--- a/bin/generate_samples_configs/java_3_0_3_unit_test.yaml
+++ b/bin/generate_samples_configs/java_3_0_3_unit_test.yaml
@@ -2,5 +2,5 @@ generatorName: java
 outputDir: samples/client/3_0_3_unit_test/java
 inputSpec: src/test/resources/3_0/unit_test_spec/3_0_3_unit_test_spec_nopaths.yaml
 additionalProperties:
-  artifactId: petstore
+  artifactId: unit-test-api
   hideGenerationTimestamp: "true"
\ No newline at end of file
diff --git a/bin/generate_samples_configs/java_3_1_0_unit_test.yaml b/bin/generate_samples_configs/java_3_1_0_unit_test.yaml
index 873e2514255..e171ce79a27 100644
--- a/bin/generate_samples_configs/java_3_1_0_unit_test.yaml
+++ b/bin/generate_samples_configs/java_3_1_0_unit_test.yaml
@@ -2,4 +2,4 @@ generatorName: java
 outputDir: samples/client/3_1_0_unit_test/java
 inputSpec: src/test/resources/3_1/unit_test_spec/3_1_0_unit_test_spec_nopaths.yaml
 additionalProperties:
-  packageName: unit_test_api
+  artifactId: unit-test-api
diff --git a/docs/generators/java.md b/docs/generators/java.md
index f9efbabe28f..93ff4abcfe7 100644
--- a/docs/generators/java.md
+++ b/docs/generators/java.md
@@ -12,7 +12,7 @@ title: Documentation for the java generator
 | generator language | Java | |
 | generator language version | 17 | |
 | generator default templating engine | handlebars | |
-| helpTxt | Generates a Java client library<br /><br />Features in this generator:<br />- v3.0.0 - [v3.1.0](#schema-feature) OpenAPI Specification support<br />- Very thorough documentation generated in the style of javadocs<br />- Input types constrained for a Schema in SomeSchema.validate<br />  - validate method can accept arbitrary List/Map/null/int/long/double/float/String json data<br />- Immutable List output classes generated and returned by validate for List&lt;?&gt; input<br />- Immutable Map output classes generated and returned by validate for Map&lt;?, ?&gt; input<br />- Strictly typed list input can be instantiated in client code using generated ListBuilders<br />- Strictly typed map input can be instantiated in client code using generated MapBuilders<br />  - Sequential map builders are generated ensuring that required properties are set before build is invoked. Looks like:<br />  - `new MapBuilder().requiredA("a").requiredB("b").build()`<br />  - `new MapBuilder().requiredA("a").requiredB("b").optionalProp("c").additionalProperty("someAddProp", "d").build()`<br />- Run time type checking and validation when<br />  - validating schema payloads<br />  - instantiating List output class (validation run)<br />  - instantiating Map output class (validation run)<br />  - Note: if needed, validation of json schema keywords can be deactivated via a SchemaConfiguration class<br />- Enums classes are generated and may be input into Schema.validate or the List/MapBuilder add/setter methods<br />- The [Checker-Framework's](https://github.com/typetools/checker-framework) NullnessChecker and @Nullable annotations are used in the java client<br />  - ensuring that null pointer exceptions will not happen<br />- Invalid (in java) property names supported like `class`, `1var`, `hi-there` etc in<br />  - component schema names<br />  - schema property names (a fallback setter is written in the MapBuilder)<br />- Generated interfaces are largely consistent with the python code<br />- Openapi spec inline schemas supported at any depth in any location<br />- Format support for: int32, int64, float, double, date, datetime, uuid<br />- Payload values are not coerced when validated, so a date/date-time value can pass other validations that describe the payload only as type string<br />- enum types are generated for enums of type string/integer/number/boolean/null<br />- String transmission of numbers supported with type: string, format: number | |
+| helpMsg | Generates a Java client library<br /><br />Features in this generator:<br />- v3.0.0 - [v3.1.0](#schema-feature) OpenAPI Specification support<br />- Very thorough documentation generated in the style of javadocs<br />- Input types constrained for a Schema in SomeSchema.validate<br />  - validate method can accept arbitrary List/Map/null/int/long/double/float/String json data<br />- Immutable List output classes generated and returned by validate for List&lt;?&gt; input<br />- Immutable Map output classes generated and returned by validate for Map&lt;?, ?&gt; input<br />- Strictly typed list input can be instantiated in client code using generated ListBuilders<br />- Strictly typed map input can be instantiated in client code using generated MapBuilders<br />  - Sequential map builders are generated ensuring that required properties are set before build is invoked. Looks like:<br />  - `new MapBuilder().requiredA("a").requiredB("b").build()`<br />  - `new MapBuilder().requiredA("a").requiredB("b").optionalProp("c").additionalProperty("someAddProp", "d").build()`<br />- Run time type checking and validation when<br />  - validating schema payloads<br />  - instantiating List output class (validation run)<br />  - instantiating Map output class (validation run)<br />  - Note: if needed, validation of json schema keywords can be deactivated via a SchemaConfiguration class<br />- Enums classes are generated and may be input into Schema.validate or the List/MapBuilder add/setter methods<br />- The [Checker-Framework's](https://github.com/typetools/checker-framework) NullnessChecker and @Nullable annotations are used in the java client<br />  - ensuring that null pointer exceptions will not happen<br />- Invalid (in java) property names supported like `class`, `1var`, `hi-there` etc in<br />  - component schema names<br />  - schema property names (a fallback setter is written in the MapBuilder)<br />- Generated interfaces are largely consistent with the python code<br />- Openapi spec inline schemas supported at any depth in any location<br />- Format support for: int32, int64, float, double, date, datetime, uuid<br />- Payload values are not coerced when validated, so a date/date-time value can pass other validations that describe the payload only as type string<br />- enum types are generated for enums of type string/integer/number/boolean/null<br />- String transmission of numbers supported with type: string, format: number | |
 
 ## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.
@@ -20,9 +20,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 | Option | Description | Values | Default |
 | ------ | ----------- | ------ | ------- |
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|apiPackage|package for generated api classes| |apis|
 |artifactDescription|artifact description in generated pom.xml| |OpenAPI Java|
-|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-java-client|
 |artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapi-json-schema-tools/openapi-json-schema-generator|
 |artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
 |developerEmail|developer email in generated pom.xml| |team@openapijsonschematools.org|
@@ -30,7 +28,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
 |developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapijsonschematools.org|
 |groupId|groupId in generated pom.xml| |org.openapijsonschematools|
-|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
 |invokerPackage|root package for generated code| |org.openapijsonschematools.client|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
diff --git a/docs/generators/python.md b/docs/generators/python.md
index 09e0602888b..b708155ae63 100644
--- a/docs/generators/python.md
+++ b/docs/generators/python.md
@@ -12,7 +12,7 @@ title: Documentation for the python generator
 | generator language | Python | |
 | generator language version | >=3.8 | |
 | generator default templating engine | handlebars | |
-| helpTxt | Generates a Python client library<br /><br />Features in this generator:<br />- type hints on endpoints and model creation<br />- model parameter names use the spec defined keys and cases<br />- robust composition (oneOf/anyOf/allOf/not) where payload data is stored in one instance only<br />- endpoint parameter names use the spec defined keys and cases<br />- inline schemas are supported at any location including composition<br />- multiple content types supported in request body and response bodies<br />- run time type checking + json schema validation<br />- json schema keyword validation may be selectively disabled with SchemaConfiguration<br />- enums of type string/integer/boolean typed using typing.Literal<br />- mypy static type checking run on generated sample<br />- Sending/receiving decimals as strings supported with type:string format: number -> DecimalSchema<br />- Sending/receiving uuids as strings supported with type:string format: uuid -> UUIDSchema<br />- quicker load time for python modules (a single endpoint can be imported and used without loading others)<br />- composed schemas with type constraints supported (type:object + oneOf/anyOf/allOf)<br />- schemas are not coerced/cast. For example string + date are both stored as string, and there is a date accessor | |
+| helpMsg | Generates a Python client library<br /><br />Features in this generator:<br />- type hints on endpoints and model creation<br />- model parameter names use the spec defined keys and cases<br />- robust composition (oneOf/anyOf/allOf/not) where payload data is stored in one instance only<br />- endpoint parameter names use the spec defined keys and cases<br />- inline schemas are supported at any location including composition<br />- multiple content types supported in request body and response bodies<br />- run time type checking + json schema validation<br />- json schema keyword validation may be selectively disabled with SchemaConfiguration<br />- enums of type string/integer/boolean typed using typing.Literal<br />- mypy static type checking run on generated sample<br />- Sending/receiving decimals as strings supported with type:string format: number -> DecimalSchema<br />- Sending/receiving uuids as strings supported with type:string format: uuid -> UUIDSchema<br />- quicker load time for python modules (a single endpoint can be imported and used without loading others)<br />- composed schemas with type constraints supported (type:object + oneOf/anyOf/allOf)<br />- schemas are not coerced/cast. For example string + date are both stored as string, and there is a date accessor | |
 
 ## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.
@@ -22,12 +22,10 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |generateSourceCodeOnly|Specifies that only a library source code is to be generated.| |false|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
 |nonCompliantUseDiscriminatorIfCompositionFails|When true, If the payload fails to validate against composed schemas (allOf/anyOf/oneOf/not) and a discriminator is present, then ignore the composition validation errors and attempt to use the discriminator to validate the payload.<br />Note: setting this to true makes the generated client not comply with json schema because it ignores composition validation errors. Please consider making your schemas more restrictive rather than setting this to true. You can do that by:<ul><li>defining the propertyName as an enum with only one value in the schemas that are in your discriminator map</li><li>setting additionalProperties: false in your schemas</li></ul>|<dl><dt>**true**</dt><dd>If composition fails and a discriminator exists, the composition errors will be ignored and validation will be attempted with the discriminator</dd><dt>**false**</dt><dd>Composition validation must succeed. Discriminator validation must succeed.</dd></dl>|false|
-|packageName|python package name (convention: snake_case).| |openapi_client|
 |packageUrl|python package URL.| |null|
 |packageVersion|python package version.| |1.0.0|
 |projectName|python project name in setup.py (e.g. petstore-api).| |null|
 |recursionLimit|Set the recursion limit. If not set, use the system default value.| |null|
-|templatingEngine|template engine|<dl><dt>**handlebars**</dt><dd>handlebars templating engine</dd></dl>|handlebars|
 |useNose|use the nose test framework| |false|
 
 ## SUPPORTED VENDOR EXTENSIONS
@@ -54,17 +52,16 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## LANGUAGE PRIMITIVES
 
 <ul class="column-ul">
+<li>None</li>
 <li>bool</li>
 <li>bytes</li>
 <li>date</li>
 <li>datetime</li>
 <li>dict</li>
 <li>file</li>
-<li>file_type</li>
 <li>float</li>
 <li>int</li>
 <li>list</li>
-<li>none_type</li>
 <li>object</li>
 <li>str</li>
 </ul>
@@ -72,6 +69,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS
 
 <ul class="column-ul">
+<li>@property</li>
 <li>and</li>
 <li>as</li>
 <li>assert</li>
@@ -81,6 +79,9 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>break</li>
 <li>class</li>
 <li>continue</li>
+<li>cookie_params</li>
+<li>datetime</li>
+<li>decimal</li>
 <li>def</li>
 <li>del</li>
 <li>dict</li>
@@ -93,12 +94,15 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>float</li>
 <li>for</li>
 <li>from</li>
+<li>functools</li>
 <li>global</li>
+<li>header_params</li>
 <li>if</li>
 <li>immutabledict</li>
 <li>import</li>
 <li>in</li>
 <li>int</li>
+<li>io</li>
 <li>is</li>
 <li>lambda</li>
 <li>list</li>
@@ -107,15 +111,23 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>not</li>
 <li>or</li>
 <li>pass</li>
+<li>path_params</li>
 <li>print</li>
 <li>property</li>
+<li>query_params</li>
 <li>raise</li>
+<li>re</li>
+<li>resource_path</li>
 <li>return</li>
+<li>schemas</li>
 <li>self</li>
 <li>str</li>
 <li>true</li>
 <li>try</li>
 <li>tuple</li>
+<li>typing</li>
+<li>typing_extensions</li>
+<li>uuid</li>
 <li>while</li>
 <li>with</li>
 <li>yield</li>
diff --git a/samples/client/3_0_3_unit_test/java/README.md b/samples/client/3_0_3_unit_test/java/README.md
index 181a1f40c9c..6d0d0cd6b04 100644
--- a/samples/client/3_0_3_unit_test/java/README.md
+++ b/samples/client/3_0_3_unit_test/java/README.md
@@ -1,4 +1,4 @@
-# petstore
+# unit-test-api
 sample spec for testing openapi functionality, built from json schema tests for draft6
 
 This Java package is automatically generated by the [OpenAPI JSON Schema Generator](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator) project:
@@ -35,7 +35,7 @@ Add this dependency to your project's POM:
 ```xml
 <dependency>
   <groupId>org.openapijsonschematools</groupId>
-  <artifactId>petstore</artifactId>
+  <artifactId>unit-test-api</artifactId>
   <version>0.0.1</version>
   <scope>compile</scope>
 </dependency>
@@ -51,7 +51,7 @@ mvn clean package
 
 Then manually install the following JARs:
 
-- `target/petstore-0.0.1.jar`
+- `target/unit-test-api-0.0.1.jar`
 - `target/lib/*.jar`
 
 
diff --git a/samples/client/3_0_3_unit_test/java/pom.xml b/samples/client/3_0_3_unit_test/java/pom.xml
index d67521577de..7bc3926409e 100644
--- a/samples/client/3_0_3_unit_test/java/pom.xml
+++ b/samples/client/3_0_3_unit_test/java/pom.xml
@@ -2,9 +2,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.openapijsonschematools</groupId>
-    <artifactId>petstore</artifactId>
+    <artifactId>unit-test-api</artifactId>
     <packaging>jar</packaging>
-    <name>petstore</name>
+    <name>unit-test-api</name>
     <version>0.0.1</version>
     <url>https://github.com/openapi-json-schema-tools/openapi-json-schema-generator</url>
     <description>OpenAPI Java</description>
diff --git a/samples/client/3_1_0_unit_test/java/README.md b/samples/client/3_1_0_unit_test/java/README.md
index d72c17316bd..e14c9cfe8ec 100644
--- a/samples/client/3_1_0_unit_test/java/README.md
+++ b/samples/client/3_1_0_unit_test/java/README.md
@@ -1,4 +1,4 @@
-# openapi-java-client
+# unit-test-api
 sample spec for testing openapi functionality, built from json schema tests for draft2020-12
 
 This Java package is automatically generated by the [OpenAPI JSON Schema Generator](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator) project:
@@ -35,7 +35,7 @@ Add this dependency to your project's POM:
 ```xml
 <dependency>
   <groupId>org.openapijsonschematools</groupId>
-  <artifactId>openapi-java-client</artifactId>
+  <artifactId>unit-test-api</artifactId>
   <version>0.0.1</version>
   <scope>compile</scope>
 </dependency>
@@ -51,7 +51,7 @@ mvn clean package
 
 Then manually install the following JARs:
 
-- `target/openapi-java-client-0.0.1.jar`
+- `target/unit-test-api-0.0.1.jar`
 - `target/lib/*.jar`
 
 
diff --git a/samples/client/3_1_0_unit_test/java/pom.xml b/samples/client/3_1_0_unit_test/java/pom.xml
index ebb2e4b2c11..7bc3926409e 100644
--- a/samples/client/3_1_0_unit_test/java/pom.xml
+++ b/samples/client/3_1_0_unit_test/java/pom.xml
@@ -2,9 +2,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.openapijsonschematools</groupId>
-    <artifactId>openapi-java-client</artifactId>
+    <artifactId>unit-test-api</artifactId>
     <packaging>jar</packaging>
-    <name>openapi-java-client</name>
+    <name>unit-test-api</name>
     <version>0.0.1</version>
     <url>https://github.com/openapi-json-schema-tools/openapi-json-schema-generator</url>
     <description>OpenAPI Java</description>
diff --git a/samples/client/petstore/python/docs/components/schema/any_type_and_format.md b/samples/client/petstore/python/docs/components/schema/any_type_and_format.md
index 5a26a5f883c..92b59d00fc6 100644
--- a/samples/client/petstore/python/docs/components/schema/any_type_and_format.md
+++ b/samples/client/petstore/python/docs/components/schema/any_type_and_format.md
@@ -34,7 +34,6 @@ base class: schemas.immutabledict[str, schemas.OUTPUT_BASE_TYPES]
 ### &lowbar;&lowbar;new&lowbar;&lowbar; method
 Keyword Argument | Type | Description | Notes
 ---------------- | ---- | ----------- | -----
-**uuid** | dict, schemas.immutabledict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset |  | [optional] value must be a uuid
 **date** | dict, schemas.immutabledict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset |  | [optional] value must conform to RFC-3339 full-date YYYY-MM-DD
 **number** | dict, schemas.immutabledict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset |  | [optional] value must be int or float numeric
 **binary** | dict, schemas.immutabledict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset |  | [optional]
@@ -46,7 +45,6 @@ Keyword Argument | Type | Description | Notes
 ### properties
 Property | Type | Description | Notes
 -------- | ---- | ----------- | -----
-**uuid** | schemas.immutabledict, str, float, int, bool, None, tuple, bytes, io.FileIO, schemas.Unset |  | [optional] value must be a uuid
 **date** | schemas.immutabledict, str, float, int, bool, None, tuple, bytes, io.FileIO, schemas.Unset |  | [optional] value must conform to RFC-3339 full-date YYYY-MM-DD
 **number** | schemas.immutabledict, str, float, int, bool, None, tuple, bytes, io.FileIO, schemas.Unset |  | [optional] value must be int or float numeric
 **binary** | schemas.immutabledict, str, float, int, bool, None, tuple, bytes, io.FileIO, schemas.Unset |  | [optional]
@@ -58,7 +56,7 @@ Property | Type | Description | Notes
 Method | Input Type | Return Type | Notes
 ------ | ---------- | ----------- | ------
 from_dict_ | [AnyTypeAndFormatDictInput](#anytypeandformatdictinput), [AnyTypeAndFormatDict](#anytypeandformatdict) | [AnyTypeAndFormatDict](#anytypeandformatdict) | a constructor
-&lowbar;&lowbar;getitem&lowbar;&lowbar; | str | schemas.immutabledict, str, float, int, bool, None, tuple, bytes, io.FileIO | This model has invalid python names so this method is used under the hood when you access instance["date-time"], instance["float"], 
+&lowbar;&lowbar;getitem&lowbar;&lowbar; | str | schemas.immutabledict, str, float, int, bool, None, tuple, bytes, io.FileIO | This model has invalid python names so this method is used under the hood when you access instance["uuid"], instance["date-time"], instance["float"], 
 get_additional_property_ | str | schemas.immutabledict, tuple, float, int, str, bool, None, bytes, schemas.FileIO, schemas.Unset | provides type safety for additional properties
 
 [[Back to top]](#top) [[Back to Component Schemas]](../../../README.md#Component-Schemas) [[Back to README]](../../../README.md)
diff --git a/samples/client/petstore/python/docs/components/schema/format_test.md b/samples/client/petstore/python/docs/components/schema/format_test.md
index 6882f72e0dc..592c8e34d8a 100644
--- a/samples/client/petstore/python/docs/components/schema/format_test.md
+++ b/samples/client/petstore/python/docs/components/schema/format_test.md
@@ -60,8 +60,6 @@ Keyword Argument | Type | Description | Notes
 **arrayWithUniqueItems** | [ArrayWithUniqueItemsTupleInput](#arraywithuniqueitemstupleinput), [ArrayWithUniqueItemsTuple](#arraywithuniqueitemstuple), schemas.Unset |  | [optional]
 **string** | str, schemas.Unset |  | [optional]
 **binary** | bytes, io.FileIO, io.BufferedReader, schemas.Unset |  | [optional]
-**dateTime** | str, datetime.datetime, schemas.Unset |  | [optional] value must conform to RFC-3339 date-time
-**uuid** | str, uuid.UUID, schemas.Unset |  | [optional] value must be a uuid
 **uuidNoExample** | str, uuid.UUID, schemas.Unset |  | [optional] value must be a uuid
 **pattern_with_digits** | str, schemas.Unset | A string that is a 10 digit number. Can have leading zeros. | [optional]
 **pattern_with_digits_and_delimiter** | str, schemas.Unset | A string starting with &#x27;image_&#x27; (case insensitive) and one to three digits following i.e. Image_01. | [optional]
@@ -85,8 +83,6 @@ Property | Type | Description | Notes
 **arrayWithUniqueItems** | [ArrayWithUniqueItemsTuple](#arraywithuniqueitemstuple), schemas.Unset |  | [optional]
 **string** | str, schemas.Unset |  | [optional]
 **binary** | bytes, io.FileIO, schemas.Unset |  | [optional]
-**dateTime** | str, schemas.Unset |  | [optional] value must conform to RFC-3339 date-time
-**uuid** | str, schemas.Unset |  | [optional] value must be a uuid
 **uuidNoExample** | str, schemas.Unset |  | [optional] value must be a uuid
 **pattern_with_digits** | str, schemas.Unset | A string that is a 10 digit number. Can have leading zeros. | [optional]
 **pattern_with_digits_and_delimiter** | str, schemas.Unset | A string starting with &#x27;image_&#x27; (case insensitive) and one to three digits following i.e. Image_01. | [optional]
@@ -96,7 +92,7 @@ Property | Type | Description | Notes
 Method | Input Type | Return Type | Notes
 ------ | ---------- | ----------- | ------
 from_dict_ | [FormatTestDictInput](#formattestdictinput), [FormatTestDict](#formattestdict) | [FormatTestDict](#formattestdict) | a constructor
-&lowbar;&lowbar;getitem&lowbar;&lowbar; | str | schemas.immutabledict, str, float, int, bool, None, tuple, bytes, io.FileIO | This model has invalid python names so this method is used under the hood when you access instance["float"], 
+&lowbar;&lowbar;getitem&lowbar;&lowbar; | str | schemas.immutabledict, str, float, int, bool, None, tuple, bytes, io.FileIO | This model has invalid python names so this method is used under the hood when you access instance["float"], instance["dateTime"], instance["uuid"], 
 get_additional_property_ | str | schemas.immutabledict, tuple, float, int, str, bool, None, bytes, schemas.FileIO, schemas.Unset | provides type safety for additional properties
 
 # ArrayWithUniqueItems
diff --git a/samples/client/petstore/python/docs/components/schema/mixed_properties_and_additional_properties_class.md b/samples/client/petstore/python/docs/components/schema/mixed_properties_and_additional_properties_class.md
index eb234501433..bda90d83669 100644
--- a/samples/client/petstore/python/docs/components/schema/mixed_properties_and_additional_properties_class.md
+++ b/samples/client/petstore/python/docs/components/schema/mixed_properties_and_additional_properties_class.md
@@ -28,22 +28,19 @@ base class: schemas.immutabledict[str, schemas.OUTPUT_BASE_TYPES]
 ### &lowbar;&lowbar;new&lowbar;&lowbar; method
 Keyword Argument | Type | Description | Notes
 ---------------- | ---- | ----------- | -----
-**uuid** | str, uuid.UUID, schemas.Unset |  | [optional] value must be a uuid
-**dateTime** | str, datetime.datetime, schemas.Unset |  | [optional] value must conform to RFC-3339 date-time
 **map** | [MapDictInput](#mapdictinput), [MapDict](#mapdict), schemas.Unset |  | [optional]
 **kwargs** | schemas.immutabledict, tuple, float, int, str, bool, None, bytes, schemas.FileIO | any string name can be used but the value must be the correct type | [optional] typed value is accessed with the get_additional_property_ method
 
 ### properties
 Property | Type | Description | Notes
 -------- | ---- | ----------- | -----
-**uuid** | str, schemas.Unset |  | [optional] value must be a uuid
-**dateTime** | str, schemas.Unset |  | [optional] value must conform to RFC-3339 date-time
 **map** | [MapDict](#mapdict), schemas.Unset |  | [optional]
 
 ### methods
 Method | Input Type | Return Type | Notes
 ------ | ---------- | ----------- | ------
 from_dict_ | [MixedPropertiesAndAdditionalPropertiesClassDictInput](#mixedpropertiesandadditionalpropertiesclassdictinput), [MixedPropertiesAndAdditionalPropertiesClassDict](#mixedpropertiesandadditionalpropertiesclassdict) | [MixedPropertiesAndAdditionalPropertiesClassDict](#mixedpropertiesandadditionalpropertiesclassdict) | a constructor
+&lowbar;&lowbar;getitem&lowbar;&lowbar; | str | schemas.immutabledict, str, float, int, bool, None, tuple, bytes, io.FileIO | This model has invalid python names so this method is used under the hood when you access instance["uuid"], instance["dateTime"], 
 get_additional_property_ | str | schemas.immutabledict, tuple, float, int, str, bool, None, bytes, schemas.FileIO, schemas.Unset | provides type safety for additional properties
 
 # Map
diff --git a/samples/client/petstore/python/docs/paths/fake/post.md b/samples/client/petstore/python/docs/paths/fake/post.md
index 27d2e95afdd..99cd828b2ab 100644
--- a/samples/client/petstore/python/docs/paths/fake/post.md
+++ b/samples/client/petstore/python/docs/paths/fake/post.md
@@ -92,7 +92,6 @@ Keyword Argument | Type | Description | Notes
 **string** | str, schemas.Unset | None | [optional]
 **binary** | bytes, io.FileIO, io.BufferedReader, schemas.Unset | None | [optional]
 **date** | str, datetime.date, schemas.Unset | None | [optional] value must conform to RFC-3339 full-date YYYY-MM-DD
-**dateTime** | str, datetime.datetime, schemas.Unset | None | [optional] if omitted the server will use the default value of 2010-02-01T10:20:10.111110+01:00 value must conform to RFC-3339 date-time
 **password** | str, schemas.Unset | None | [optional]
 **callback** | str, schemas.Unset | None | [optional]
 **kwargs** | schemas.immutabledict, tuple, float, int, str, bool, None, bytes, schemas.FileIO | any string name can be used but the value must be the correct type | [optional] typed value is accessed with the get_additional_property_ method
@@ -110,7 +109,6 @@ Property | Type | Description | Notes
 **string** | str, schemas.Unset | None | [optional]
 **binary** | bytes, io.FileIO, schemas.Unset | None | [optional]
 **date** | str, schemas.Unset | None | [optional] value must conform to RFC-3339 full-date YYYY-MM-DD
-**dateTime** | str, schemas.Unset | None | [optional] if omitted the server will use the default value of 2010-02-01T10:20:10.111110+01:00 value must conform to RFC-3339 date-time
 **password** | str, schemas.Unset | None | [optional]
 **callback** | str, schemas.Unset | None | [optional]
 
@@ -118,7 +116,7 @@ Property | Type | Description | Notes
 Method | Input Type | Return Type | Notes
 ------ | ---------- | ----------- | ------
 from_dict_ | [SchemaDictInput](#requestbody-content-applicationxwwwformurlencoded-schema-schemadictinput), [SchemaDict](#requestbody-content-applicationxwwwformurlencoded-schema-schemadict) | [SchemaDict](#requestbody-content-applicationxwwwformurlencoded-schema-schemadict) | a constructor
-&lowbar;&lowbar;getitem&lowbar;&lowbar; | str | schemas.immutabledict, str, float, int, bool, None, tuple, bytes, io.FileIO | This model has invalid python names so this method is used under the hood when you access instance["float"], 
+&lowbar;&lowbar;getitem&lowbar;&lowbar; | str | schemas.immutabledict, str, float, int, bool, None, tuple, bytes, io.FileIO | This model has invalid python names so this method is used under the hood when you access instance["float"], instance["dateTime"], 
 get_additional_property_ | str | schemas.immutabledict, tuple, float, int, str, bool, None, bytes, schemas.FileIO, schemas.Unset | provides type safety for additional properties
 
 ## Return Types
diff --git a/samples/client/petstore/python/docs/paths/fake/post/request_body/content/application_x_www_form_urlencoded/schema.md b/samples/client/petstore/python/docs/paths/fake/post/request_body/content/application_x_www_form_urlencoded/schema.md
index a23bacb0924..32e96d5f71b 100644
--- a/samples/client/petstore/python/docs/paths/fake/post/request_body/content/application_x_www_form_urlencoded/schema.md
+++ b/samples/client/petstore/python/docs/paths/fake/post/request_body/content/application_x_www_form_urlencoded/schema.md
@@ -48,7 +48,6 @@ Keyword Argument | Type | Description | Notes
 **string** | str, schemas.Unset | None | [optional]
 **binary** | bytes, io.FileIO, io.BufferedReader, schemas.Unset | None | [optional]
 **date** | str, datetime.date, schemas.Unset | None | [optional] value must conform to RFC-3339 full-date YYYY-MM-DD
-**dateTime** | str, datetime.datetime, schemas.Unset | None | [optional] if omitted the server will use the default value of 2010-02-01T10:20:10.111110+01:00 value must conform to RFC-3339 date-time
 **password** | str, schemas.Unset | None | [optional]
 **callback** | str, schemas.Unset | None | [optional]
 **kwargs** | schemas.immutabledict, tuple, float, int, str, bool, None, bytes, schemas.FileIO | any string name can be used but the value must be the correct type | [optional] typed value is accessed with the get_additional_property_ method
@@ -66,7 +65,6 @@ Property | Type | Description | Notes
 **string** | str, schemas.Unset | None | [optional]
 **binary** | bytes, io.FileIO, schemas.Unset | None | [optional]
 **date** | str, schemas.Unset | None | [optional] value must conform to RFC-3339 full-date YYYY-MM-DD
-**dateTime** | str, schemas.Unset | None | [optional] if omitted the server will use the default value of 2010-02-01T10:20:10.111110+01:00 value must conform to RFC-3339 date-time
 **password** | str, schemas.Unset | None | [optional]
 **callback** | str, schemas.Unset | None | [optional]
 
@@ -74,5 +72,5 @@ Property | Type | Description | Notes
 Method | Input Type | Return Type | Notes
 ------ | ---------- | ----------- | ------
 from_dict_ | [SchemaDictInput](#schemadictinput), [SchemaDict](#schemadict) | [SchemaDict](#schemadict) | a constructor
-&lowbar;&lowbar;getitem&lowbar;&lowbar; | str | schemas.immutabledict, str, float, int, bool, None, tuple, bytes, io.FileIO | This model has invalid python names so this method is used under the hood when you access instance["float"], 
+&lowbar;&lowbar;getitem&lowbar;&lowbar; | str | schemas.immutabledict, str, float, int, bool, None, tuple, bytes, io.FileIO | This model has invalid python names so this method is used under the hood when you access instance["float"], instance["dateTime"], 
 get_additional_property_ | str | schemas.immutabledict, tuple, float, int, str, bool, None, bytes, schemas.FileIO, schemas.Unset | provides type safety for additional properties
diff --git a/samples/client/petstore/python/src/petstore_api/components/schema/any_type_and_format.py b/samples/client/petstore/python/src/petstore_api/components/schema/any_type_and_format.py
index 1f27d49a6d2..88f923486c4 100644
--- a/samples/client/petstore/python/src/petstore_api/components/schema/any_type_and_format.py
+++ b/samples/client/petstore/python/src/petstore_api/components/schema/any_type_and_format.py
@@ -13,7 +13,7 @@
 
 
 @dataclasses.dataclass(frozen=True)
-class Uuid(
+class _Uuid(
     schemas.AnyTypeSchema[schemas.immutabledict[str, schemas.OUTPUT_BASE_TYPES], typing.Tuple[schemas.OUTPUT_BASE_TYPES, ...]],
 ):
     # any type
@@ -31,7 +31,7 @@ class Date(
 
 
 @dataclasses.dataclass(frozen=True)
-class DateTime(
+class _DateTime(
     schemas.AnyTypeSchema[schemas.immutabledict[str, schemas.OUTPUT_BASE_TYPES], typing.Tuple[schemas.OUTPUT_BASE_TYPES, ...]],
 ):
     # any type
@@ -94,9 +94,9 @@ class _Float(
 Properties = typing.TypedDict(
     'Properties',
     {
-        "uuid": typing.Type[Uuid],
+        "uuid": typing.Type[_Uuid],
         "date": typing.Type[Date],
-        "date-time": typing.Type[DateTime],
+        "date-time": typing.Type[_DateTime],
         "number": typing.Type[Number],
         "binary": typing.Type[Binary],
         "int32": typing.Type[Int32],
@@ -126,11 +126,6 @@ class AnyTypeAndFormatDict(schemas.immutabledict[str, schemas.OUTPUT_BASE_TYPES]
     def __new__(
         cls,
         *,
-        uuid: typing.Union[
-            schemas.INPUT_TYPES_ALL,
-            schemas.OUTPUT_BASE_TYPES,
-            schemas.Unset
-        ] = schemas.unset,
         date: typing.Union[
             schemas.INPUT_TYPES_ALL,
             schemas.OUTPUT_BASE_TYPES,
@@ -166,7 +161,6 @@ def __new__(
     ):
         arg_: typing.Dict[str, typing.Any] = {}
         for key_, val in (
-            ("uuid", uuid),
             ("date", date),
             ("number", number),
             ("binary", binary),
@@ -191,13 +185,6 @@ def from_dict_(
     ) -> AnyTypeAndFormatDict:
         return AnyTypeAndFormat.validate(arg, configuration=configuration)
     
-    @property
-    def uuid(self) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
-        val = self.get("uuid", schemas.unset)
-        if isinstance(val, schemas.Unset):
-            return val
-        return val
-    
     @property
     def date(self) -> typing.Union[schemas.OUTPUT_BASE_TYPES, schemas.Unset]:
         val = self.get("date", schemas.unset)
diff --git a/samples/client/petstore/python/src/petstore_api/components/schema/format_test.py b/samples/client/petstore/python/src/petstore_api/components/schema/format_test.py
index 700d407ecec..b8b0c0d990b 100644
--- a/samples/client/petstore/python/src/petstore_api/components/schema/format_test.py
+++ b/samples/client/petstore/python/src/petstore_api/components/schema/format_test.py
@@ -152,8 +152,8 @@ class String(
 Byte: typing_extensions.TypeAlias = schemas.StrSchema
 Binary: typing_extensions.TypeAlias = schemas.BinarySchema
 Date: typing_extensions.TypeAlias = schemas.DateSchema
-DateTime: typing_extensions.TypeAlias = schemas.DateTimeSchema
-Uuid: typing_extensions.TypeAlias = schemas.UUIDSchema
+_DateTime: typing_extensions.TypeAlias = schemas.DateTimeSchema
+_Uuid: typing_extensions.TypeAlias = schemas.UUIDSchema
 UuidNoExample: typing_extensions.TypeAlias = schemas.UUIDSchema
 
 
@@ -210,8 +210,8 @@ class PatternWithDigitsAndDelimiter(
         "byte": typing.Type[Byte],
         "binary": typing.Type[Binary],
         "date": typing.Type[Date],
-        "dateTime": typing.Type[DateTime],
-        "uuid": typing.Type[Uuid],
+        "dateTime": typing.Type[_DateTime],
+        "uuid": typing.Type[_Uuid],
         "uuidNoExample": typing.Type[UuidNoExample],
         "password": typing.Type[Password],
         "pattern_with_digits": typing.Type[PatternWithDigits],
@@ -309,16 +309,6 @@ def __new__(
             schemas.FileIO,
             schemas.Unset
         ] = schemas.unset,
-        dateTime: typing.Union[
-            str,
-            datetime.datetime,
-            schemas.Unset
-        ] = schemas.unset,
-        uuid: typing.Union[
-            str,
-            uuid.UUID,
-            schemas.Unset
-        ] = schemas.unset,
         uuidNoExample: typing.Union[
             str,
             uuid.UUID,
@@ -356,8 +346,6 @@ def __new__(
             ("arrayWithUniqueItems", arrayWithUniqueItems),
             ("string", string),
             ("binary", binary),
-            ("dateTime", dateTime),
-            ("uuid", uuid),
             ("uuidNoExample", uuidNoExample),
             ("pattern_with_digits", pattern_with_digits),
             ("pattern_with_digits_and_delimiter", pattern_with_digits_and_delimiter),
@@ -508,26 +496,6 @@ def binary(self) -> typing.Union[bytes, schemas.FileIO, schemas.Unset]:
             val
         )
     
-    @property
-    def dateTime(self) -> typing.Union[str, schemas.Unset]:
-        val = self.get("dateTime", schemas.unset)
-        if isinstance(val, schemas.Unset):
-            return val
-        return typing.cast(
-            str,
-            val
-        )
-    
-    @property
-    def uuid(self) -> typing.Union[str, schemas.Unset]:
-        val = self.get("uuid", schemas.unset)
-        if isinstance(val, schemas.Unset):
-            return val
-        return typing.cast(
-            str,
-            val
-        )
-    
     @property
     def uuidNoExample(self) -> typing.Union[str, schemas.Unset]:
         val = self.get("uuidNoExample", schemas.unset)
diff --git a/samples/client/petstore/python/src/petstore_api/components/schema/mixed_properties_and_additional_properties_class.py b/samples/client/petstore/python/src/petstore_api/components/schema/mixed_properties_and_additional_properties_class.py
index 1d318bc62a0..ab8a7225c20 100644
--- a/samples/client/petstore/python/src/petstore_api/components/schema/mixed_properties_and_additional_properties_class.py
+++ b/samples/client/petstore/python/src/petstore_api/components/schema/mixed_properties_and_additional_properties_class.py
@@ -10,8 +10,8 @@
 from __future__ import annotations
 from petstore_api.shared_imports.schema_imports import *  # pyright: ignore [reportWildcardImportFromLibrary]
 
-Uuid: typing_extensions.TypeAlias = schemas.UUIDSchema
-DateTime: typing_extensions.TypeAlias = schemas.DateTimeSchema
+_Uuid: typing_extensions.TypeAlias = schemas.UUIDSchema
+_DateTime: typing_extensions.TypeAlias = schemas.DateTimeSchema
 
 from petstore_api.components.schema import animal
 
@@ -93,8 +93,8 @@ def validate(
 Properties = typing.TypedDict(
     'Properties',
     {
-        "uuid": typing.Type[Uuid],
-        "dateTime": typing.Type[DateTime],
+        "uuid": typing.Type[_Uuid],
+        "dateTime": typing.Type[_DateTime],
         "map": typing.Type[Map],
     }
 )
@@ -113,16 +113,6 @@ class MixedPropertiesAndAdditionalPropertiesClassDict(schemas.immutabledict[str,
     def __new__(
         cls,
         *,
-        uuid: typing.Union[
-            str,
-            uuid.UUID,
-            schemas.Unset
-        ] = schemas.unset,
-        dateTime: typing.Union[
-            str,
-            datetime.datetime,
-            schemas.Unset
-        ] = schemas.unset,
         map: typing.Union[
             MapDictInput,
             MapDict,
@@ -133,8 +123,6 @@ def __new__(
     ):
         arg_: typing.Dict[str, typing.Any] = {}
         for key_, val in (
-            ("uuid", uuid),
-            ("dateTime", dateTime),
             ("map", map),
         ):
             if isinstance(val, schemas.Unset):
@@ -154,26 +142,6 @@ def from_dict_(
     ) -> MixedPropertiesAndAdditionalPropertiesClassDict:
         return MixedPropertiesAndAdditionalPropertiesClass.validate(arg, configuration=configuration)
     
-    @property
-    def uuid(self) -> typing.Union[str, schemas.Unset]:
-        val = self.get("uuid", schemas.unset)
-        if isinstance(val, schemas.Unset):
-            return val
-        return typing.cast(
-            str,
-            val
-        )
-    
-    @property
-    def dateTime(self) -> typing.Union[str, schemas.Unset]:
-        val = self.get("dateTime", schemas.unset)
-        if isinstance(val, schemas.Unset):
-            return val
-        return typing.cast(
-            str,
-            val
-        )
-    
     @property
     def map(self) -> typing.Union[MapDict, schemas.Unset]:
         val = self.get("map", schemas.unset)
diff --git a/samples/client/petstore/python/src/petstore_api/paths/fake/post/request_body/content/application_x_www_form_urlencoded/schema.py b/samples/client/petstore/python/src/petstore_api/paths/fake/post/request_body/content/application_x_www_form_urlencoded/schema.py
index fba8912dd7c..abe8330dc39 100644
--- a/samples/client/petstore/python/src/petstore_api/paths/fake/post/request_body/content/application_x_www_form_urlencoded/schema.py
+++ b/samples/client/petstore/python/src/petstore_api/paths/fake/post/request_body/content/application_x_www_form_urlencoded/schema.py
@@ -103,7 +103,7 @@ class PatternWithoutDelimiter(
 
 
 @dataclasses.dataclass(frozen=True)
-class DateTime(
+class _DateTime(
     schemas.DateTimeSchema
 ):
     types: typing.FrozenSet[typing.Type] = frozenset({
@@ -138,7 +138,7 @@ class Password(
         "byte": typing.Type[Byte],
         "binary": typing.Type[Binary],
         "date": typing.Type[Date],
-        "dateTime": typing.Type[DateTime],
+        "dateTime": typing.Type[_DateTime],
         "password": typing.Type[Password],
         "callback": typing.Type[Callback],
     }
@@ -207,11 +207,6 @@ def __new__(
             datetime.date,
             schemas.Unset
         ] = schemas.unset,
-        dateTime: typing.Union[
-            str,
-            datetime.datetime,
-            schemas.Unset
-        ] = schemas.unset,
         password: typing.Union[
             str,
             schemas.Unset
@@ -236,7 +231,6 @@ def __new__(
             ("string", string),
             ("binary", binary),
             ("date", date),
-            ("dateTime", dateTime),
             ("password", password),
             ("callback", callback),
         ):
@@ -345,16 +339,6 @@ def date(self) -> typing.Union[str, schemas.Unset]:
             val
         )
     
-    @property
-    def dateTime(self) -> typing.Union[str, schemas.Unset]:
-        val = self.get("dateTime", schemas.unset)
-        if isinstance(val, schemas.Unset):
-            return val
-        return typing.cast(
-            str,
-            val
-        )
-    
     @property
     def password(self) -> typing.Union[str, schemas.Unset]:
         val = self.get("password", schemas.unset)
diff --git a/samples/meta-codegen-kotlin/lib/src/main/kotlin/com/my/company/codegen/MyclientcodegenGenerator.kt b/samples/meta-codegen-kotlin/lib/src/main/kotlin/com/my/company/codegen/MyclientcodegenGenerator.kt
index 09732c854f1..89be26f4eea 100644
--- a/samples/meta-codegen-kotlin/lib/src/main/kotlin/com/my/company/codegen/MyclientcodegenGenerator.kt
+++ b/samples/meta-codegen-kotlin/lib/src/main/kotlin/com/my/company/codegen/MyclientcodegenGenerator.kt
@@ -144,19 +144,19 @@ open class MyclientcodegenGenerator() : DefaultCodegen(), CodegenConfig {
     }
 
     /**
-     * Location to write model files.  You can use the modelPackage() as defined when the class is
+     * Location to write model files.  You can use the modelPackage as defined when the class is
      * instantiated
      */
     override fun modelFileFolder(): String {
-        return """$outputFolder/$sourceFolder/${modelPackage().replace('.', File.separatorChar)}"""
+        return """$outputFolder/$sourceFolder/${modelPackage.replace('.', File.separatorChar)}"""
     }
 
     /**
-     * Location to write api files.  You can use the apiPackage() as defined when the class is
+     * Location to write api files.  You can use the apiPackage as defined when the class is
      * instantiated
      */
     override fun apiFileFolder(): String {
-        return """$outputFolder/$sourceFolder/${apiPackage().replace('.', File.separatorChar)}"""
+        return """$outputFolder/$sourceFolder/${generatorSettings().apiPackage.replace('.', File.separatorChar)}"""
     }
 
     /**
diff --git a/samples/meta-codegen/lib/src/main/java/com/my/company/codegen/MyclientcodegenGenerator.java b/samples/meta-codegen/lib/src/main/java/com/my/company/codegen/MyclientcodegenGenerator.java
index 63095788e46..b34e62a38bc 100644
--- a/samples/meta-codegen/lib/src/main/java/com/my/company/codegen/MyclientcodegenGenerator.java
+++ b/samples/meta-codegen/lib/src/main/java/com/my/company/codegen/MyclientcodegenGenerator.java
@@ -12,16 +12,6 @@ public class MyclientcodegenGenerator extends DefaultCodegen implements CodegenC
   protected String sourceFolder = "src";
   protected String apiVersion = "1.0.0";
 
-  /**
-   * Configures the type of generator.
-   *
-   * @return  the CodegenType for this generator
-   * @see     org.openapijsonschematools.codegen.CodegenType
-   */
-  public CodegenType getTag() {
-    return CodegenType.DOCUMENTATION;
-  }
-
   /**
    * Configures a friendly name for the generator.  This will be used by the generator
    * to select the library with the -g flag.
@@ -155,20 +145,20 @@ public String escapeReservedWord(String name) {
   }
 
   /**
-   * Location to write model files.  You can use the modelPackage() as defined when the class is
+   * Location to write model files.  You can use the modelPackage as defined when the class is
    * instantiated
    */
   public String modelFileFolder() {
-    return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
+    return outputFolder + "/" + sourceFolder + "/" + modelPackage.replace('.', File.separatorChar);
   }
 
   /**
-   * Location to write api files.  You can use the apiPackage() as defined when the class is
+   * Location to write api files.  You can use the apiPackage as defined when the class is
    * instantiated
    */
   @Override
   public String apiFileFolder() {
-    return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
+    return outputFolder + "/" + sourceFolder + "/" + generatorSettings().apiPackage.replace('.', File.separatorChar);
   }
 
   /**
diff --git a/src/main/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplate.java b/src/main/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplate.java
index 4ad3d07ac15..679087d254c 100644
--- a/src/main/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplate.java
+++ b/src/main/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplate.java
@@ -40,8 +40,8 @@ public class AuthorTemplate extends AbstractCommand {
 
     @Override
     void execute() {
-        Generator config = GeneratorLoader.forName(generatorName);
-        String templateDirectory = config.templateDir();
+        Generator config = GeneratorLoader.getGenerator(generatorName, null, null);
+        String templateDirectory = config.generatorSettings().embeddedTemplateDir;
 
         log("Requesting '{}' from embedded resource directory '{}'", generatorName, templateDirectory);
 
diff --git a/src/main/java/org/openapijsonschematools/codegen/clicommands/ConfigHelp.java b/src/main/java/org/openapijsonschematools/codegen/clicommands/ConfigHelp.java
index 51d77725ec5..eb4711909b7 100644
--- a/src/main/java/org/openapijsonschematools/codegen/clicommands/ConfigHelp.java
+++ b/src/main/java/org/openapijsonschematools/codegen/clicommands/ConfigHelp.java
@@ -20,6 +20,7 @@
 import io.airlift.airline.Command;
 import io.airlift.airline.Option;
 import org.apache.commons.lang3.StringUtils;
+import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorMetadata;
 import org.openapijsonschematools.codegen.generators.models.CliOption;
 import org.openapijsonschematools.codegen.generators.Generator;
 import org.openapijsonschematools.codegen.generators.generatorloader.GeneratorLoader;
@@ -106,7 +107,7 @@ public void execute() {
 
         try {
             StringBuilder sb = new StringBuilder();
-            Generator config = GeneratorLoader.forName(generatorName);
+            Generator config = GeneratorLoader.getGenerator(generatorName, null, null);
 
             String desiredFormat = StringUtils.defaultIfBlank(format, FORMAT_TEXT);
 
@@ -219,7 +220,7 @@ private void generateMdInstantiationTypes(StringBuilder sb, Generator config) {
         sb.append("| Type/Alias | Instantiated By |").append(newline);
         sb.append("| ---------- | --------------- |").append(newline);
 
-        config.instantiationTypes()
+        config.getGeneratorMetadata().getInstantiationTypes()
                 .entrySet()
                 .stream()
                 .sorted(Map.Entry.comparingByKey())
@@ -235,7 +236,7 @@ private void generateMdLanguageSpecificPrimitives(StringBuilder sb, Generator co
         sb.append(newline).append("## LANGUAGE PRIMITIVES").append(newline).append(newline);
 
         sb.append("<ul class=\"column-ul\">").append(newline);
-        config.languageSpecificPrimitives()
+        config.getGeneratorMetadata().getLanguageSpecificPrimitives()
                 .stream()
                 .sorted(String::compareTo)
                 .forEach(s -> sb.append("<li>").append(escapeHtml4(s)).append("</li>").append(newline));
@@ -246,7 +247,7 @@ private void generateMdReservedWords(StringBuilder sb, Generator config) {
         sb.append(newline).append("## RESERVED WORDS").append(newline).append(newline);
 
         sb.append("<ul class=\"column-ul\">").append(newline);
-        config.reservedWords()
+        config.getGeneratorMetadata().getReservedWords()
                 .stream()
                 .sorted(String::compareTo)
                 .forEach(s -> sb.append("<li>").append(escapeHtml4(s)).append("</li>").append(newline));
@@ -295,21 +296,22 @@ private void generateMdConfigOptionsHeader(StringBuilder sb, Generator config) {
     }
 
     private void generateMdMetadata(StringBuilder sb, Generator config) {
+        GeneratorMetadata meta = config.getGeneratorMetadata();
         sb.append("## METADATA").append(newline).append(newline);
 
         sb.append("| Property | Value | Notes |").append(newline);
         sb.append("| -------- | ----- | ----- |").append(newline);
-        sb.append("| generator name | "+config.getName()+" | pass this to the generate command after -g |").append(newline);
-        sb.append("| generator stability | "+config.getGeneratorMetadata().getStability()+" | |").append(newline);
-        sb.append("| generator type | "+config.getTag()+" | |").append(newline);
-        if (config.generatorLanguage() != null) {
-            sb.append("| generator language | "+config.generatorLanguage().toString()+" | |").append(newline);
+        sb.append("| generator name | "+meta.getName()+" | pass this to the generate command after -g |").append(newline);
+        sb.append("| generator stability | "+meta.getStability()+" | |").append(newline);
+        sb.append("| generator type | "+meta.getType()+" | |").append(newline);
+        if (meta.getLanguage() != null) {
+            sb.append("| generator language | "+meta.getLanguage().toString()+" | |").append(newline);
         }
-        if (config.generatorLanguageVersion() != null) {
-            sb.append("| generator language version | "+config.generatorLanguageVersion()+" | |").append(newline);
+        if (meta.getLanguageVersion() != null) {
+            sb.append("| generator language version | "+meta.getLanguageVersion()+" | |").append(newline);
         }
         sb.append("| generator default templating engine | "+config.defaultTemplatingEngine()+" | |").append(newline);
-        sb.append("| helpTxt | "+config.getHelp()+" | |").append(newline);
+        sb.append("| helpMsg | "+meta.getHelpMsg()+" | |").append(newline);
 
         sb.append(newline);
     }
@@ -399,7 +401,7 @@ private void generatePlainTextHelp(StringBuilder sb, Generator config) {
             sb.append(newline).append(newline);
         });
 
-        Map<String, String> instantiationTypes = config.instantiationTypes();
+        Map<String, String> instantiationTypes = config.getGeneratorMetadata().getInstantiationTypes();
         if (instantiationTypes != null) {
             sb.append(newline).append("INSTANTIATION TYPES").append(newline).append(newline);
             Map<String, String> map = instantiationTypes
@@ -414,14 +416,14 @@ private void generatePlainTextHelp(StringBuilder sb, Generator config) {
 
         {
             sb.append(newline).append("LANGUAGE PRIMITIVES").append(newline).append(newline);
-            String[] arr = config.languageSpecificPrimitives().stream().sorted().toArray(String[]::new);
+            String[] arr = config.getGeneratorMetadata().getLanguageSpecificPrimitives().stream().sorted().toArray(String[]::new);
             writePlainTextFromArray(sb, arr, optIndent);
             sb.append(newline);
         }
 
         if (Boolean.TRUE.equals(reservedWords)) {
             sb.append(newline).append("RESERVED WORDS").append(newline).append(newline);
-            String[] arr = config.reservedWords().stream().sorted().toArray(String[]::new);
+            String[] arr = config.getGeneratorMetadata().getReservedWords().stream().sorted().toArray(String[]::new);
             writePlainTextFromArray(sb, arr, optIndent);
             sb.append(newline);
         }
diff --git a/src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java b/src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java
index 761083b2975..f4274134479 100644
--- a/src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java
+++ b/src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java
@@ -30,13 +30,17 @@
 import org.openapijsonschematools.codegen.common.CodegenConstants;
 import org.openapijsonschematools.codegen.generatorrunner.DefaultGeneratorRunner;
 import org.openapijsonschematools.codegen.generatorrunner.GeneratorRunner;
+import org.openapijsonschematools.codegen.generators.DefaultGenerator;
 import org.openapijsonschematools.codegen.generators.generatorloader.GeneratorNotFoundException;
 import org.openapijsonschematools.codegen.config.CodegenConfigurator;
 import org.openapijsonschematools.codegen.config.CodegenConfiguratorUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"java:S106"})
 @Command(name = "generate", description = "Generate code with the specified generator.")
 public class Generate extends AbstractCommand {
+    private final Logger LOGGER = LoggerFactory.getLogger(Generate.class);
 
     CodegenConfigurator configurator;
     GeneratorRunner generatorRunner;
@@ -61,7 +65,7 @@ public class Generate extends AbstractCommand {
     private String templateDir;
 
     @Option(name = {"-e", "--engine"}, title = "templating engine",
-            description = "templating engine: \"mustache\" (default) or \"handlebars\" (beta)")
+            description = "templating engine: \"handlebars\"(default) or \"mustache\"")
     private String templatingEngine;
 
     @Option(
@@ -165,6 +169,10 @@ public class Generate extends AbstractCommand {
             description = CodegenConstants.REMOVE_OPERATION_ID_PREFIX_DESC)
     private Boolean removeOperationIdPrefix;
 
+    @Option(name = {"--remove-enum-value-prefix"}, title = "remove prefix of the enum values",
+        description = CodegenConstants.REMOVE_ENUM_VALUE_PREFIX_DESC)
+    private Boolean removeEnumValuePrefix;
+
     @Option(name = {"--skip-operation-example"}, title = "skip examples defined in the operation",
             description = CodegenConstants.SKIP_OPERATION_EXAMPLE_DESC)
     private Boolean skipOperationExample;
@@ -188,6 +196,10 @@ public class Generate extends AbstractCommand {
         description = "Only write output files that have changed.")
     private Boolean minimalUpdate;
 
+    @Option(name = {"--hide-generation-timestamp"}, title = "hides the generation timestamp in the generated files",
+        description = CodegenConstants.HIDE_GENERATION_TIMESTAMP_DESC)
+    private Boolean hideGenerationTimestamp;
+
     @Override
     public void execute() {
         // this initial check allows for field-level package private injection (for unit testing)
@@ -247,10 +259,6 @@ public void execute() {
             configurator.setTemplateDir(templateDir);
         }
 
-        if (isNotEmpty(packageName)) {
-            configurator.setPackageName(packageName);
-        }
-
         if (isNotEmpty(templatingEngine)) {
             configurator.setTemplatingEngineName(templatingEngine);
         }
@@ -315,6 +323,14 @@ public void execute() {
             configurator.setRemoveOperationIdPrefix(removeOperationIdPrefix);
         }
 
+        if (removeEnumValuePrefix != null) {
+            configurator.setRemoveEnumValuePrefix(removeEnumValuePrefix);
+        }
+
+        if (hideGenerationTimestamp != null) {
+            configurator.setHideGenerationTimestamp(hideGenerationTimestamp);
+        }
+
         if (skipOperationExample != null) {
             configurator.setSkipOperationExample(skipOperationExample);
         }
@@ -334,6 +350,11 @@ public void execute() {
         if (globalProperties != null && !globalProperties.isEmpty()) {
             CodegenConfiguratorUtils.applyGlobalPropertiesKvpList(globalProperties, configurator);
         }
+
+        if (isNotEmpty(packageName)) {
+            configurator.setPackageName(packageName);
+        }
+
         CodegenConfiguratorUtils.applyAdditionalPropertiesKvpList(additionalProperties, configurator);
 
         try {
diff --git a/src/main/java/org/openapijsonschematools/codegen/clicommands/GenerateBatch.java b/src/main/java/org/openapijsonschematools/codegen/clicommands/GenerateBatch.java
index 27b1408366c..3a7e250fd46 100644
--- a/src/main/java/org/openapijsonschematools/codegen/clicommands/GenerateBatch.java
+++ b/src/main/java/org/openapijsonschematools/codegen/clicommands/GenerateBatch.java
@@ -211,9 +211,8 @@ public void run() {
                 Generator config = opts.config;
                 name = config.getName();
                 
-                Path target = Paths.get(config.getOutputDir());
+                Path target = Paths.get(config.generatorSettings().outputFolder);
                 Path updated = rootDir.resolve(target);
-                config.setOutputDir(updated.toString());
 
                 if (this.clean) {
                     cleanPreviousFiles(name, updated);
diff --git a/src/main/java/org/openapijsonschematools/codegen/clicommands/ListGenerators.java b/src/main/java/org/openapijsonschematools/codegen/clicommands/ListGenerators.java
index ec7fb412d53..db410fc35fa 100644
--- a/src/main/java/org/openapijsonschematools/codegen/clicommands/ListGenerators.java
+++ b/src/main/java/org/openapijsonschematools/codegen/clicommands/ListGenerators.java
@@ -84,8 +84,8 @@ public void execute() {
 
     private void appendForType(StringBuilder sb, GeneratorType type, String typeName, List<Generator> generators) {
         List<Generator> list = generators.stream()
-                .filter(g -> Objects.equal(type, g.getTag()))
-                .sorted(Comparator.comparing(Generator::getName))
+                .filter(g -> Objects.equal(type, g.getGeneratorMetadata().getType()))
+                .sorted()
                 .collect(Collectors.toList());
 
         if(!list.isEmpty()) {
diff --git a/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java b/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java
index d97802172d4..7579588fd71 100644
--- a/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java
+++ b/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java
@@ -68,6 +68,7 @@ public class CodegenConfigurator {
     private String auth;
 
     private List<TemplateDefinition> userDefinedTemplates = new ArrayList<>();
+    private boolean fromFile = false;
 
     public CodegenConfigurator() {
 
@@ -104,6 +105,7 @@ public static CodegenConfigurator fromFile(String configFile, Module... modules)
                 configurator.userDefinedTemplates.addAll(userDefinedTemplateSettings);
             }
 
+            configurator.fromFile = true;
             return configurator;
         }
         return null;
@@ -319,6 +321,16 @@ public CodegenConfigurator setRemoveOperationIdPrefix(boolean removeOperationIdP
         return this;
     }
 
+    public CodegenConfigurator setRemoveEnumValuePrefix(boolean removeEnumValuePrefix) {
+        workflowSettingsBuilder.withRemoveEnumValuePrefix(removeEnumValuePrefix);
+        return this;
+    }
+
+    public CodegenConfigurator setHideGenerationTimestamp(boolean hideGenerationTimestamp) {
+        workflowSettingsBuilder.withHideGenerationTimestamp(hideGenerationTimestamp);
+        return this;
+    }
+
     public CodegenConfigurator setSkipOperationExample(boolean skipOperationExample) {
         workflowSettingsBuilder.withSkipOperationExample(skipOperationExample);
         return this;
@@ -366,13 +378,44 @@ public Context<?> toContext() {
         Validate.notEmpty(generatorName, "generator name must be specified");
         Validate.notEmpty(inputSpec, "input spec must be specified");
 
+        if (generatorSettingsBuilder.additionalProperties() != null && generatorSettingsBuilder.additionalProperties().containsKey("packageName")) {
+            // if packageName is passed as an additional property warn them
+            if (fromFile) {
+                LOGGER.warn("Deprecated additionalProperties arg: packageName should be passed in at the root level of the config file from now on");
+            } else {
+                LOGGER.warn("Deprecated --additional-properties command line arg: packageName should be passed in using --package-name from now on");
+            }
+            String packageName = (String) generatorSettingsBuilder.additionalProperties().get("packageName");
+            generatorSettingsBuilder.withPackageName(packageName);
+        }
+        if (generatorSettingsBuilder.additionalProperties() != null && generatorSettingsBuilder.additionalProperties().containsKey("artifactId")) {
+            // if artifactId is passed as an additional property warn them
+            if (fromFile) {
+                LOGGER.warn("Deprecated additionalProperties arg: artifactId should be passed in at the root level of the config file from now on");
+            } else {
+                LOGGER.warn("Deprecated --additional-properties command line arg: artifactId should be passed in using --artifact-id from now on");
+            }
+            String artifactId = (String) generatorSettingsBuilder.additionalProperties().get("artifactId");
+            generatorSettingsBuilder.withArtifactId(artifactId);
+        }
+        if (generatorSettingsBuilder.additionalProperties() != null && generatorSettingsBuilder.additionalProperties().containsKey("hideGenerationTimestamp")) {
+            // if hideGenerationTimestamp is passed as an additional property warn them
+            if (fromFile) {
+                LOGGER.warn("Deprecated additionalProperties arg: hideGenerationTimestamp should be passed in at the root level of the config file from now on");
+            } else {
+                LOGGER.warn("Deprecated --additional-properties command line arg: hideGenerationTimestamp should be passed in using --hide-generation-timestamp from now on");
+            }
+            Object value = generatorSettingsBuilder.additionalProperties().get("hideGenerationTimestamp");
+            Boolean hideGenerationTimestamp = null;
+            if (value instanceof String) {
+                hideGenerationTimestamp = Boolean.valueOf((String) value);
+            } else if (value instanceof Boolean) {
+                hideGenerationTimestamp = (Boolean) value;
+            }
+            workflowSettingsBuilder.withHideGenerationTimestamp(hideGenerationTimestamp);
+        }
         GeneratorSettings generatorSettings = generatorSettingsBuilder.build();
-        Generator config = GeneratorLoader.forName(generatorSettings.getGeneratorName());
-        if (isEmpty(templatingEngineName)) {
-            // if templatingEngineName is empty check the config for a default
-            String defaultTemplatingEngine = config.defaultTemplatingEngine();
-            workflowSettingsBuilder.withTemplatingEngineName(defaultTemplatingEngine);
-        } else {
+        if (!isEmpty(templatingEngineName)) {
             workflowSettingsBuilder.withTemplatingEngineName(templatingEngineName);
         }
 
@@ -463,6 +506,10 @@ public Context<?> toContext() {
         return new Context<>(specification, generatorSettings, workflowSettings);
     }
 
+    public Map<String, Object> getAdditionalProperties() {
+        return additionalProperties;
+    }
+
     public ClientOptInput toClientOptInput() {
         Context<?> context = toContext();
         WorkflowSettings workflowSettings = context.getWorkflowSettings();
@@ -470,29 +517,7 @@ public ClientOptInput toClientOptInput() {
 
         // We load the config via generatorSettings.getGeneratorName() because this is guaranteed to be set
         // regardless of entrypoint (CLI sets properties on this type, config deserialization sets on generatorSettings).
-        Generator config = GeneratorLoader.forName(generatorSettings.getGeneratorName());
-
-        // TODO: Work toward Generator having a "WorkflowSettings" property, or better a "Workflow" object which itself has a "WorkflowSettings" property.
-        config.setInputSpec(workflowSettings.getInputSpec());
-        config.setOutputDir(workflowSettings.getOutputDir());
-        config.setSkipOverwrite(workflowSettings.isSkipOverwrite());
-        config.setIgnoreFilePathOverride(workflowSettings.getIgnoreFileOverride());
-        config.setRemoveOperationIdPrefix(workflowSettings.isRemoveOperationIdPrefix());
-        config.setSkipOperationExample(workflowSettings.isSkipOperationExample());
-        config.setEnablePostProcessFile(workflowSettings.isEnablePostProcessFile());
-        config.setEnableMinimalUpdate(workflowSettings.isEnableMinimalUpdate());
-        config.setStrictSpecBehavior(workflowSettings.isStrictSpecBehavior());
-        config.setTemplateEngineName(workflowSettings.getTemplatingEngineName());
-        config.additionalProperties().put(CodegenConstants.TEMPLATING_ENGINE, workflowSettings.getTemplatingEngineName());
-
-        // TODO: Work toward Generator having a "GeneratorSettings" property.
-        config.additionalProperties().putAll(generatorSettings.getAdditionalProperties());
-
-        // any other additional properties?
-        String templateDir = workflowSettings.getTemplateDir();
-        if (templateDir != null) {
-            config.additionalProperties().put(CodegenConstants.TEMPLATE_DIR, workflowSettings.getTemplateDir());
-        }
+        Generator config = GeneratorLoader.getGenerator(generatorSettings.getGeneratorName(), generatorSettings, workflowSettings);
 
         return new ClientOptInput(
                 (OpenAPI)context.getSpecDocument(),
diff --git a/src/main/java/org/openapijsonschematools/codegen/config/DynamicSettings.java b/src/main/java/org/openapijsonschematools/codegen/config/DynamicSettings.java
index 384c239d1a9..1e8eff66498 100644
--- a/src/main/java/org/openapijsonschematools/codegen/config/DynamicSettings.java
+++ b/src/main/java/org/openapijsonschematools/codegen/config/DynamicSettings.java
@@ -6,8 +6,11 @@
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import org.apache.commons.lang3.StringUtils;
+import org.openapijsonschematools.codegen.clicommands.Generate;
 import org.openapijsonschematools.codegen.templating.TemplateDefinition;
 import org.openapijsonschematools.codegen.templating.TemplateFileType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.lang.reflect.Field;
 import java.util.*;
@@ -20,6 +23,7 @@
  */
 @SuppressWarnings({"unused", "WeakerAccess"})
 public class DynamicSettings {
+    private final Logger LOGGER = LoggerFactory.getLogger(DynamicSettings.class);
     @JsonAnySetter
     private Map<String, Object> dynamicProperties = new HashMap<>();
 
@@ -70,7 +74,6 @@ public GeneratorSettings getGeneratorSettings() {
         for (Map.Entry<String, Object> entry : dynamicProperties.entrySet()) {
             builder.withAdditionalProperty(entry.getKey(), entry.getValue());
         }
-
         return builder.build();
     }
 
@@ -81,8 +84,8 @@ public GeneratorSettings getGeneratorSettings() {
      */
     public WorkflowSettings getWorkflowSettings() {
         excludeSettingsFromDynamicProperties();
-        return WorkflowSettings.newBuilder(workflowSettings)
-                .build();
+        WorkflowSettings.Builder builder = WorkflowSettings.newBuilder(workflowSettings);
+        return builder.build();
     }
 
     /**
diff --git a/src/main/java/org/openapijsonschematools/codegen/config/GeneratorSettings.java b/src/main/java/org/openapijsonschematools/codegen/config/GeneratorSettings.java
index 48c6909a50b..cd2557cdc09 100644
--- a/src/main/java/org/openapijsonschematools/codegen/config/GeneratorSettings.java
+++ b/src/main/java/org/openapijsonschematools/codegen/config/GeneratorSettings.java
@@ -383,6 +383,10 @@ public static final class Builder {
         private String releaseNote;
         private String httpUserAgent;
 
+        public Map<String, Object> additionalProperties() {
+            return additionalProperties;
+        }
+
         /**
          * Instantiates a new Builder.
          */
diff --git a/src/main/java/org/openapijsonschematools/codegen/config/WorkflowSettings.java b/src/main/java/org/openapijsonschematools/codegen/config/WorkflowSettings.java
index 30deab3fab3..7768bb5ffdb 100644
--- a/src/main/java/org/openapijsonschematools/codegen/config/WorkflowSettings.java
+++ b/src/main/java/org/openapijsonschematools/codegen/config/WorkflowSettings.java
@@ -39,13 +39,16 @@ public class WorkflowSettings {
     public static final boolean DEFAULT_VERBOSE = false;
     public static final boolean DEFAULT_SKIP_OVERWRITE = false;
     public static final boolean DEFAULT_REMOVE_OPERATION_ID_PREFIX = false;
+    public static final boolean DEFAULT_REMOVE_ENUM_VALUE_PREFIX = false;
     public static final boolean DEFAULT_SKIP_OPERATION_EXAMPLE = false;
     public static final boolean DEFAULT_LOG_TO_STDERR = false;
     public static final boolean DEFAULT_VALIDATE_SPEC = true;
     public static final boolean DEFAULT_ENABLE_POST_PROCESS_FILE = false;
     public static final boolean DEFAULT_ENABLE_MINIMAL_UPDATE = false;
     public static final boolean DEFAULT_STRICT_SPEC_BEHAVIOR = true;
-    public static final String DEFAULT_TEMPLATING_ENGINE_NAME = null; // this is set by the generator
+    public static final String DEFAULT_TEMPLATING_ENGINE_NAME = "handlebars";
+
+    public static final boolean DEFAULT_HIDE_GENERATION_TIMESTAMP = true;
     public static final Map<String, String> DEFAULT_GLOBAL_PROPERTIES = Collections.unmodifiableMap(new HashMap<>());
 
     private String inputSpec;
@@ -63,6 +66,8 @@ public class WorkflowSettings {
     private String templatingEngineName = DEFAULT_TEMPLATING_ENGINE_NAME;
     private String ignoreFileOverride;
     private Map<String, ?> globalProperties = DEFAULT_GLOBAL_PROPERTIES;
+    private boolean removeEnumValuePrefix = DEFAULT_REMOVE_ENUM_VALUE_PREFIX;
+    private Boolean hideGenerationTimestamp = DEFAULT_HIDE_GENERATION_TIMESTAMP;
 
     private WorkflowSettings(Builder builder) {
         this.inputSpec = builder.inputSpec;
@@ -80,6 +85,8 @@ private WorkflowSettings(Builder builder) {
         this.templatingEngineName = builder.templatingEngineName;
         this.ignoreFileOverride = builder.ignoreFileOverride;
         this.globalProperties = Collections.unmodifiableMap(builder.globalProperties);
+        this.removeEnumValuePrefix = builder.removeEnumValuePrefix;
+        this.hideGenerationTimestamp = builder.hideGenerationTimestamp;
     }
 
     /**
@@ -112,6 +119,8 @@ public static Builder newBuilder(WorkflowSettings copy) {
 
         // this, and any other collections, must be mutable in the builder.
         builder.globalProperties = new HashMap<>(copy.getGlobalProperties());
+        builder.removeEnumValuePrefix = copy.isRemoveEnumValuePrefix();
+        builder.hideGenerationTimestamp = copy.isHideGenerationTimestamp();
 
         // force builder "with" methods to invoke side effects
         builder.withTemplateDir(copy.getTemplateDir());
@@ -166,6 +175,11 @@ public boolean isRemoveOperationIdPrefix() {
         return removeOperationIdPrefix;
     }
 
+    public boolean isRemoveEnumValuePrefix() {
+        return removeEnumValuePrefix;
+    }
+
+    public boolean isHideGenerationTimestamp() { return hideGenerationTimestamp; }
     /**
      * Indicates whether or not to skip examples defined in the operation.
      *
@@ -289,6 +303,8 @@ public static final class Builder {
         private Boolean verbose = DEFAULT_VERBOSE;
         private Boolean skipOverwrite = DEFAULT_SKIP_OVERWRITE;
         private Boolean removeOperationIdPrefix = DEFAULT_REMOVE_OPERATION_ID_PREFIX;
+
+        private Boolean removeEnumValuePrefix = DEFAULT_REMOVE_ENUM_VALUE_PREFIX;
         private Boolean skipOperationExample = DEFAULT_SKIP_OPERATION_EXAMPLE;
         private Boolean logToStderr = DEFAULT_LOG_TO_STDERR;
         private Boolean validateSpec = DEFAULT_VALIDATE_SPEC;
@@ -298,6 +314,7 @@ public static final class Builder {
         private String templateDir;
         private String templatingEngineName = DEFAULT_TEMPLATING_ENGINE_NAME;
         private String ignoreFileOverride;
+        private boolean hideGenerationTimestamp = DEFAULT_HIDE_GENERATION_TIMESTAMP;
 
         // NOTE: All collections must be mutable in the builder, and copied to a new immutable collection in .build()
         private Map<String, String> globalProperties = new HashMap<>();
@@ -367,6 +384,11 @@ public Builder withRemoveOperationIdPrefix(Boolean removeOperationIdPrefix) {
             return this;
         }
 
+        public Builder withRemoveEnumValuePrefix(Boolean removeEnumValuePrefix) {
+            this.removeEnumValuePrefix = removeEnumValuePrefix != null ? removeEnumValuePrefix : Boolean.valueOf(DEFAULT_REMOVE_ENUM_VALUE_PREFIX);
+            return this;
+        }
+
         /**
          * Sets the {@code skipOperationExample} and returns a reference to this Builder so that the methods can be chained together.
          *
@@ -501,6 +523,11 @@ public Builder withIgnoreFileOverride(String ignoreFileOverride) {
             return this;
         }
 
+        public Builder withHideGenerationTimestamp(boolean hideGenerationTimestamp) {
+            this.hideGenerationTimestamp = hideGenerationTimestamp;
+            return this;
+        }
+
         /**
          * Sets the {@code globalProperties} and returns a reference to this Builder so that the methods can be chained together.
          *
diff --git a/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java b/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java
index a3646916cc5..1ea91068f8e 100644
--- a/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java
+++ b/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java
@@ -54,6 +54,8 @@
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenList;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenTag;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenText;
+import org.openapijsonschematools.codegen.generators.models.GeneratedFileType;
+import org.openapijsonschematools.codegen.generators.models.ReportFileType;
 import org.openapijsonschematools.codegen.templating.DryRunTemplateManager;
 import org.openapijsonschematools.codegen.templating.SupportingFile;
 import org.openapijsonschematools.codegen.common.SerializerUtils;
@@ -121,18 +123,16 @@ public DefaultGeneratorRunner(Boolean dryRun) {
 
     private void setTemplateProcessor() {
         // must be called after processOptions
-        TemplateManagerOptions templateManagerOptions = new TemplateManagerOptions(this.generator.isEnableMinimalUpdate(), this.generator.isSkipOverwrite());
+        TemplateManagerOptions templateManagerOptions = new TemplateManagerOptions(
+            this.generator.generatorSettings().enableMinimalUpdate,
+            this.generator.generatorSettings().skipOverwrite
+        );
 
         if (this.dryRun) {
             this.templateProcessor = new DryRunTemplateManager(templateManagerOptions);
         } else {
             TemplatingEngineAdapter templatingEngine = this.generator.getTemplatingEngine();
 
-            if (templatingEngine instanceof MustacheEngineAdapter) {
-                MustacheEngineAdapter mustacheEngineAdapter = (MustacheEngineAdapter) templatingEngine;
-                mustacheEngineAdapter.setCompiler(this.generator.processCompiler(mustacheEngineAdapter.getCompiler()));
-            }
-
             TemplatePathLocator commonTemplateLocator = new CommonTemplateContentLocator();
             TemplatePathLocator generatorTemplateLocator = new GeneratorTemplateContentLocator(this.generator);
             this.templateProcessor = new TemplateManager(
@@ -153,7 +153,7 @@ public GeneratorRunner opts(ClientOptInput opts) {
             this.userDefinedTemplates = Collections.unmodifiableList(userFiles);
         }
 
-        String ignoreFileLocation = generator.getIgnoreFilePathOverride();
+        String ignoreFileLocation = generator.generatorSettings().ignoreFilePathOverride;
         if (ignoreFileLocation != null) {
             final File ignoreFile = new File(ignoreFileLocation);
             if (ignoreFile.exists() && ignoreFile.canRead()) {
@@ -164,7 +164,7 @@ public GeneratorRunner opts(ClientOptInput opts) {
         }
 
         if (this.ignoreProcessor == null) {
-            this.ignoreProcessor = new CodegenIgnoreProcessor(generator.getOutputDir());
+            this.ignoreProcessor = new CodegenIgnoreProcessor(generator.generatorSettings().outputFolder);
         }
         return this;
     }
@@ -275,7 +275,7 @@ public void configureGeneratorProperties() {
         generator.additionalProperties().put("generatedDate", ZonedDateTime.now().toString());
         generator.additionalProperties().put("generatedYear", String.valueOf(ZonedDateTime.now().getYear()));
         generator.additionalProperties().put("generatorClass", generator.getClass().getSimpleName());
-        generator.additionalProperties().put("inputSpec", generator.getInputSpec());
+        generator.additionalProperties().put("inputSpec", generator.generatorSettings().inputSpecLocation);
 
         if (openAPI.getExtensions() != null) {
             generator.vendorExtensions().putAll(openAPI.getExtensions());
@@ -350,7 +350,6 @@ private void configureOpenAPIInfo() {
 
     private void generateSchemaDocumentation(List<File> files, CodegenSchema schema, String jsonPath, String docRoot, boolean shouldGenerate) {
         Map<String, Object> schemaData = new HashMap<>();
-        schemaData.put("packageName", generator.packageName());
         schemaData.put("schema", schema);
         schemaData.put("docRoot", docRoot);
         schemaData.put("identifierPieces", Collections.unmodifiableList(new ArrayList<>()));
@@ -360,36 +359,20 @@ private void generateSchemaDocumentation(List<File> files, CodegenSchema schema,
 
     private void generateSchema(List<File> files, CodegenSchema schema, String jsonPath) {
         Map<String, Object> schemaData = new HashMap<>();
-        schemaData.put("packageName", generator.packageName());
         schemaData.put("schema", schema);
         schemaData.put("identifierPieces", Collections.unmodifiableList(new ArrayList<>()));
         generateXs(files, jsonPath, CodegenConstants.JSON_PATH_LOCATION_TYPE.SCHEMA, CodegenConstants.MODELS, schemaData, generateModels);
     }
 
-    @Override
-    public String requestBodyFileFolder() {
-        return "";
-    }
-
-    private String packageFilename(List<String> pathSegments) {
-        String prefix = generator.getOutputDir() + File.separatorChar + generator.packagePath() + File.separatorChar;
-        String suffix = pathSegments.stream().collect(Collectors.joining(File.separator));
-        return prefix + suffix;
-    }
-
-    private String filenameFromRoot(List<String> pathSegments) {
-        String prefix = generator.getOutputDir() + File.separatorChar;
-        String suffix = pathSegments.stream().collect(Collectors.joining(File.separator));
-        return prefix + suffix;
-    }
-
     private void generateFile(Map<String, Object> templateData, String templateName, String outputFilename, List<File> files, boolean shouldGenerate, String skippedByOption) {
         templateData.putAll(generator.additionalProperties());
+        String packageName = generator.generatorSettings().packageName;
+        templateData.put("packageName", packageName);
         try {
             File written = processTemplateToFile(templateData, templateName, outputFilename, shouldGenerate, skippedByOption);
             if (written != null) {
                 files.add(written);
-                if (generator.isEnablePostProcessFile() && !dryRun) {
+                if (generator.generatorSettings().enablePostProcessFile && !dryRun) {
                     generator.postProcessFile(written, skippedByOption);
                 }
             }
@@ -407,7 +390,7 @@ private void generateFiles(List<List<Object>> processTemplateToFileInfos, boolea
                 File written = processTemplateToFile(templateData, templateName, outputFilename, shouldGenerate, skippedByOption);
                 if (written != null) {
                     files.add(written);
-                    if (generator.isEnablePostProcessFile() && !dryRun) {
+                    if (generator.generatorSettings().enablePostProcessFile && !dryRun) {
                         generator.postProcessFile(written, skippedByOption);
                     }
                 }
@@ -487,8 +470,7 @@ private void generatePathItem(List<File> files, CodegenKey pathKey, CodegenPathI
                 endpointInfo.put("pathItem", pathItem);
                 endpointInfo.put("servers", servers);
                 endpointInfo.put("security", security);
-                endpointInfo.put("packageName", generator.packageName());
-                endpointInfo.put("apiPackage", generator.apiPackage());
+                endpointInfo.put("apiPackage", generator.generatorSettings().apiPackage);
                 endpointInfo.put("headerSize", "#");
                 endpointInfo.put("identifierPieces", Collections.unmodifiableList(new ArrayList<>()));
                 endpointInfo.put("docRoot", "../../");
@@ -608,7 +590,7 @@ private void generateContent(List<File> files, LinkedHashMap<CodegenKey, Codegen
                 generateSchema(files, schema, schemaJsonPath);
                 generateSchemaDocumentation(files, schema, schemaJsonPath, docRoot + "../../", true);
 
-                Map<String, String> contentTypeTemplateInfo = generator.jsonPathTemplateFiles().get(CodegenConstants.JSON_PATH_LOCATION_TYPE.CONTENT_TYPE);
+                Map<String, String> contentTypeTemplateInfo = generator.getJsonPathTemplateFiles(GeneratedFileType.CODE).get(CodegenConstants.JSON_PATH_LOCATION_TYPE.CONTENT_TYPE);
                 if (contentTypeTemplateInfo == null || contentTypeTemplateInfo.isEmpty()) {
                     continue;
                 }
@@ -616,14 +598,14 @@ private void generateContent(List<File> files, LinkedHashMap<CodegenKey, Codegen
                 for (Map.Entry<String, String> contentTypeEntry: contentTypeTemplateInfo.entrySet()) {
                     String templateFile = contentTypeEntry.getKey();
                     String outputFile = contentTypeEntry.getValue();
-                    String outputFilepath = generator.getFilepath(contentTypeJsonPath) + File.separatorChar + outputFile;
+                    String outputFilepath = generator.getFilePath(GeneratedFileType.CODE, contentTypeJsonPath) + File.separatorChar + outputFile;
                     HashMap<String, Object> contentTypeTemplateData = new HashMap<>();
                     contentTypeTemplateData.put("schema", schema);
                     try {
                         File written = processTemplateToFile(contentTypeTemplateData, templateFile, outputFilepath, true, CodegenConstants.CONTENT);
                         if (written != null) {
                             files.add(written);
-                            if (generator.isEnablePostProcessFile() && !dryRun) {
+                            if (generator.generatorSettings().enablePostProcessFile && !dryRun) {
                                 generator.postProcessFile(written, "content");
                             }
                         }
@@ -634,19 +616,19 @@ private void generateContent(List<File> files, LinkedHashMap<CodegenKey, Codegen
             }
         }
 
-        Map<String, String> contentTemplateInfo = generator.jsonPathTemplateFiles().get(CodegenConstants.JSON_PATH_LOCATION_TYPE.CONTENT);
+        Map<String, String> contentTemplateInfo = generator.getJsonPathTemplateFiles(GeneratedFileType.CODE).get(CodegenConstants.JSON_PATH_LOCATION_TYPE.CONTENT);
         if (schemaExists && contentTemplateInfo != null && !contentTemplateInfo.isEmpty()) {
             for (Map.Entry<String, String> contentEntry: contentTemplateInfo.entrySet()) {
                 String contentTemplateFile = contentEntry.getKey();
                 String outputFile = contentEntry.getValue();
-                String outputFilepath = generator.getFilepath(contentJsonPath) + File.separatorChar + outputFile;
+                String outputFilepath = generator.getFilePath(GeneratedFileType.CODE, contentJsonPath) + File.separatorChar + outputFile;
                 HashMap<String, Object> contentTemplateData = new HashMap<>();
                 contentTemplateData.put("content", content);
                 try {
                     File written = processTemplateToFile(contentTemplateData, contentTemplateFile, outputFilepath, true, CodegenConstants.CONTENT);
                     if (written != null) {
                         files.add(written);
-                        if (generator.isEnablePostProcessFile() && !dryRun) {
+                        if (generator.generatorSettings().enablePostProcessFile && !dryRun) {
                             generator.postProcessFile(written, "content");
                         }
                     }
@@ -659,7 +641,6 @@ private void generateContent(List<File> files, LinkedHashMap<CodegenKey, Codegen
 
     private void generateResponse(List<File> files, CodegenResponse response, String jsonPath, String docRoot) {
         Map<String, Object> templateData = new HashMap<>();
-        templateData.put("packageName", generator.packageName());
         templateData.put("response", response);
         generateXs(files, jsonPath, CodegenConstants.JSON_PATH_LOCATION_TYPE.RESPONSE, CodegenConstants.RESPONSES, templateData, true);
         templateData.put("headerSize", "#");
@@ -718,7 +699,6 @@ private TreeMap<String, CodegenResponse> generateResponses(List<File> files) {
 
     private void generateRequestBody(List<File> files, CodegenRequestBody requestBody, String jsonPath, String docRoot) {
         Map<String, Object> templateData = new HashMap<>();
-        templateData.put("packageName", generator.packageName());
         templateData.put("requestBody", requestBody);
         generateXs(files, jsonPath, CodegenConstants.JSON_PATH_LOCATION_TYPE.REQUEST_BODY, CodegenConstants.REQUEST_BODIES, templateData, true);
 
@@ -731,7 +711,6 @@ private void generateRequestBody(List<File> files, CodegenRequestBody requestBod
 
     private void generateSecurityScheme(List<File> files, CodegenSecurityScheme securityScheme, String jsonPath) {
         Map<String, Object> templateData = new HashMap<>();
-        templateData.put("packageName", generator.packageName());
         templateData.put("securityScheme", securityScheme);
         generateXs(files, jsonPath, CodegenConstants.JSON_PATH_LOCATION_TYPE.SECURITY_SCHEME, CodegenConstants.SECURITY_SCHEMES, templateData, true);
     }
@@ -762,7 +741,6 @@ private TreeMap<String, CodegenSecurityScheme> generateSecuritySchemes(List<File
 
             // doc generation
             Map<String, Object> templateData = new HashMap<>();
-            templateData.put("packageName", generator.packageName());
             templateData.put("securityScheme", securityScheme);
             templateData.put("headerSize", "#");
             templateData.put("identifierPieces", Collections.unmodifiableList(new ArrayList<>()));
@@ -777,7 +755,6 @@ private TreeMap<String, CodegenSecurityScheme> generateSecuritySchemes(List<File
     private void generateRequestBodyDoc(List<File> files, CodegenRequestBody requestBody, String sourceJsonPath, String docRoot, boolean shouldGenerate) {
         // doc generation
         Map<String, Object> templateData = new HashMap<>();
-        templateData.put("packageName", generator.packageName());
         templateData.put("requestBody", requestBody);
         templateData.put("headerSize", "#");
         templateData.put("identifierPieces", Collections.unmodifiableList(new ArrayList<>()));
@@ -817,7 +794,6 @@ private TreeMap<String, CodegenRequestBody> generateRequestBodies(List<File> fil
 
     private void generateParameter(List<File> files, CodegenParameter parameter, String jsonPath) {
         Map<String, Object> templateData = new HashMap<>();
-        templateData.put("packageName", generator.packageName());
         templateData.put("parameter", parameter);
         generateXs(files, jsonPath, CodegenConstants.JSON_PATH_LOCATION_TYPE.PARAMETER, CodegenConstants.PARAMETERS, templateData, true);
 
@@ -858,7 +834,6 @@ private TreeMap<String, CodegenParameter> generateParameters(List<File> files) {
             generateParameter(files, parameter, parameterJsonPath);
 
             Map<String, Object> templateData = new HashMap<>();
-            templateData.put("packageName", generator.packageName());
             templateData.put("parameter", parameter);
             templateData.put("headerSize", "#");
             templateData.put("identifierPieces", Collections.unmodifiableList(new ArrayList<>()));
@@ -871,7 +846,6 @@ private TreeMap<String, CodegenParameter> generateParameters(List<File> files) {
 
     private void generateHeader(List<File> files, CodegenHeader header, String jsonPath, String docRoot) {
         Map<String, Object> headertTemplateData = new HashMap<>();
-        headertTemplateData.put("packageName", generator.packageName());
         headertTemplateData.put("header", header);
 
         // header
@@ -891,18 +865,18 @@ private void generateHeader(List<File> files, CodegenHeader header, String jsonP
     }
 
     private void generateXDocs(List<File> files, String jsonPath, CodegenConstants.JSON_PATH_LOCATION_TYPE type, String skippedByOption, Map<String, Object> templateInfo, boolean shouldGenerate) {
-        Map<String, String> templateFileToOutputFile = generator.jsonPathDocTemplateFiles().get(type);
+        Map<String, String> templateFileToOutputFile = generator.getJsonPathTemplateFiles(GeneratedFileType.DOCUMENTATION).get(type);
         if (templateFileToOutputFile == null || templateFileToOutputFile.isEmpty()) {
             return;
         }
         for (Map.Entry<String, String> entry : templateFileToOutputFile.entrySet()) {
             String templateFile = entry.getKey();
             String suffix = entry.getValue();
-            String filename = generator.getDocsFilepath(jsonPath) + suffix;
+            String filename = generator.getFilePath(GeneratedFileType.DOCUMENTATION, jsonPath) + suffix;
 
             HashMap<String, Object> templateData = new HashMap<>();
             templateData.putAll(generator.additionalProperties());
-            templateData.put("packageName", generator.packageName());
+            templateData.put("packageName", generator.generatorSettings().packageName);
             templateData.put("modelPackage", generator.modelPackage());
             if (templateInfo != null && !templateInfo.isEmpty()) {
                 templateData.putAll(templateInfo);
@@ -911,7 +885,7 @@ private void generateXDocs(List<File> files, String jsonPath, CodegenConstants.J
                 File written = processTemplateToFile(templateData, templateFile, filename, shouldGenerate, skippedByOption);
                 if (written != null) {
                     files.add(written);
-                    if (generator.isEnablePostProcessFile() && !dryRun) {
+                    if (generator.generatorSettings().enablePostProcessFile && !dryRun) {
                         generator.postProcessFile(written, skippedByOption);
                     }
                 }
@@ -922,18 +896,18 @@ private void generateXDocs(List<File> files, String jsonPath, CodegenConstants.J
     }
 
     private void generateXTests(List<File> files, String jsonPath, CodegenConstants.JSON_PATH_LOCATION_TYPE type, String skippedByOption, Map<String, Object> templateInfo, boolean shouldGenerate) {
-        Map<String, String> templateFileToOutputFile = generator.jsonPathTestTemplateFiles().get(type);
+        Map<String, String> templateFileToOutputFile = generator.getJsonPathTemplateFiles(GeneratedFileType.TEST).get(type);
         if (templateFileToOutputFile == null || templateFileToOutputFile.isEmpty()) {
             return;
         }
         for (Map.Entry<String, String> entry : templateFileToOutputFile.entrySet()) {
             String templateFile = entry.getKey();
             String suffix = entry.getValue();
-            String filename = generator.getTestFilepath(jsonPath) + suffix;
+            String filename = generator.getFilePath(GeneratedFileType.TEST, jsonPath) + suffix;
 
             HashMap<String, Object> templateData = new HashMap<>();
             templateData.putAll(generator.additionalProperties());
-            templateData.put("packageName", generator.packageName());
+            templateData.put("packageName", generator.generatorSettings().packageName);
             templateData.put("modelPackage", generator.modelPackage());
             if (templateInfo != null && !templateInfo.isEmpty()) {
                 templateData.putAll(templateInfo);
@@ -946,7 +920,7 @@ private void generateXTests(List<File> files, String jsonPath, CodegenConstants.
                     File written = processTemplateToFile(templateData, templateFile, filename, shouldGenerate, skippedByOption);
                     if (written != null) {
                         files.add(written);
-                        if (generator.isEnablePostProcessFile() && !dryRun) {
+                        if (generator.generatorSettings().enablePostProcessFile && !dryRun) {
                             generator.postProcessFile(written, skippedByOption);
                         }
                     }
@@ -958,18 +932,18 @@ private void generateXTests(List<File> files, String jsonPath, CodegenConstants.
     }
 
     private void generateXs(List<File> files, String jsonPath, CodegenConstants.JSON_PATH_LOCATION_TYPE type, String skippedByOption, Map<String, Object> templateInfo, boolean shouldGenerate) {
-        Map<String, String> templateFileToOutputFile = generator.jsonPathTemplateFiles().get(type);
+        Map<String, String> templateFileToOutputFile = generator.getJsonPathTemplateFiles(GeneratedFileType.CODE).get(type);
         if (templateFileToOutputFile == null || templateFileToOutputFile.isEmpty()) {
             return;
         }
         for (Map.Entry<String, String> entry : templateFileToOutputFile.entrySet()) {
             String templateFile = entry.getKey();
             String suffix = entry.getValue();
-            String filename = generator.getFilepath(jsonPath) + suffix;
+            String filename = generator.getFilePath(GeneratedFileType.CODE, jsonPath) + suffix;
 
             HashMap<String, Object> templateData = new HashMap<>();
             templateData.putAll(generator.additionalProperties());
-            templateData.put("packageName", generator.packageName());
+            templateData.put("packageName", generator.generatorSettings().packageName);
             templateData.put("modelPackage", generator.modelPackage());
             if (templateInfo != null && !templateInfo.isEmpty()) {
                 templateData.putAll(templateInfo);
@@ -978,7 +952,7 @@ private void generateXs(List<File> files, String jsonPath, CodegenConstants.JSON
                 File written = processTemplateToFile(templateData, templateFile, filename, shouldGenerate, skippedByOption);
                 if (written != null) {
                     files.add(written);
-                    if (generator.isEnablePostProcessFile() && !dryRun) {
+                    if (generator.generatorSettings().enablePostProcessFile && !dryRun) {
                         generator.postProcessFile(written, skippedByOption);
                     }
                 }
@@ -1014,7 +988,6 @@ private TreeMap<String, CodegenHeader> generateHeaders(List<File> files) {
 
             // documentation
             Map<String, Object> templateData = new HashMap<>();
-            templateData.put("packageName", generator.packageName());
             templateData.put("header", header);
             templateData.put("headerSize", "#");
             templateData.put("docRoot", "../../");
@@ -1087,7 +1060,6 @@ protected TreeMap<String, CodegenSchema> generateSchemas(List<File> files) {
 
                 // to generate model test files
                 Map<String, Object> schemaData = new HashMap<>();
-                schemaData.put("packageName", generator.packageName());
                 schemaData.put("schema", schema);
                 if (generateModelTests) {
                     generateXTests(files, jsonPath, CodegenConstants.JSON_PATH_LOCATION_TYPE.SCHEMA, CodegenConstants.MODELS, schemaData, true);
@@ -1124,7 +1096,7 @@ void generateApis(List<File> files, TreeMap<CodegenKey, CodegenPathItem> paths)
             allowListedTags = new HashSet<>(Arrays.asList(apiNames.split(",")));
         }
         String jsonPath = "#/apis";
-        Map<String, String> apiPathsTemplates = generator.jsonPathTemplateFiles().get(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_PATHS);
+        Map<String, String> apiPathsTemplates = generator.getJsonPathTemplateFiles(GeneratedFileType.CODE).get(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_PATHS);
         // paths api file(s)
         if (apiPathsTemplates != null) {
             for (Map.Entry<String, String> apiPathEntry: apiPathsTemplates.entrySet()) {
@@ -1132,17 +1104,15 @@ void generateApis(List<File> files, TreeMap<CodegenKey, CodegenPathItem> paths)
                 String apiFileName = apiPathEntry.getValue();
                 String thisJsonPath = jsonPath + "/paths";
                 Map<String, Object> apiData = new HashMap<>();
-                String packageName = generator.packageName();
-                apiData.put("packageName", packageName);
-                String outputFile = generator.getFilepath(thisJsonPath) + apiFileName;
+                String outputFile = generator.getFilePath(GeneratedFileType.CODE, thisJsonPath) + apiFileName;
                 generateFile(apiData, templateFile, outputFile, files, true, CodegenConstants.APIS);
             }
         }
 
         LinkedHashMap<CodegenTag, HashMap<CodegenKey, ArrayList<CodegenOperation>>> tagToPathToOperations = new LinkedHashMap<>();
         HashMap<CodegenTag, TreeMap<CodegenKey, HashMap<CodegenKey, CodegenOperation>>> tagToOperationIdToPathToOperation = new HashMap<>();
-        Map<String, String> apiPathTemplates = generator.jsonPathTemplateFiles().get(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_PATH);
-        Map<String, String> apiDocPathTemplates = generator.jsonPathDocTemplateFiles().get(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_PATH);
+        Map<String, String> apiPathTemplates = generator.getJsonPathTemplateFiles(GeneratedFileType.CODE).get(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_PATH);
+        Map<String, String> apiDocPathTemplates = generator.getJsonPathTemplateFiles(GeneratedFileType.DOCUMENTATION).get(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_PATH);
         // path apis
         for(Map.Entry<CodegenKey, CodegenPathItem> entry: paths.entrySet()) {
             CodegenKey path = entry.getKey();
@@ -1153,12 +1123,10 @@ void generateApis(List<File> files, TreeMap<CodegenKey, CodegenPathItem> paths)
                     String templateFile = apiPathEntry.getKey();
                     String suffix = apiPathEntry.getValue();
                     Map<String, Object> apiData = new HashMap<>();
-                    String packageName = generator.packageName();
-                    apiData.put("packageName", packageName);
                     apiData.put("path", path);
                     apiData.put("pathItem", pathItem);
                     String thisJsonPath = jsonPath + "/paths/" + ModelUtils.encodeSlashes(path.original);
-                    String outputFile = generator.getFilepath(thisJsonPath) + suffix;
+                    String outputFile = generator.getFilePath(GeneratedFileType.CODE, thisJsonPath) + suffix;
                     generateFile(apiData, templateFile, outputFile, files, true, CodegenConstants.APIS);
                 }
             }
@@ -1169,10 +1137,8 @@ void generateApis(List<File> files, TreeMap<CodegenKey, CodegenPathItem> paths)
                     String templateFile = apiPathEntry.getKey();
                     String fileName = apiPathEntry.getValue();
                     String thisJsonPath = jsonPath + "/paths/" +  ModelUtils.encodeSlashes(path.original);
-                    String outputFile = generator.getDocsFilepath(thisJsonPath) + fileName;
+                    String outputFile = generator.getFilePath(GeneratedFileType.DOCUMENTATION, thisJsonPath) + fileName;
                     Map<String, Object> apiData = new HashMap<>();
-                    String packageName = generator.packageName();
-                    apiData.put("packageName", packageName);
                     apiData.put("path", path);
                     apiData.put("pathItem", pathItem);
                     apiData.put("docRoot", "../../");
@@ -1209,39 +1175,35 @@ void generateApis(List<File> files, TreeMap<CodegenKey, CodegenPathItem> paths)
         }
 
         // files in the apiPackage root folder
-        Map<String, String> apiRootTemplates = generator.jsonPathTemplateFiles().get(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_ROOT_FOLDER);
+        Map<String, String> apiRootTemplates = generator.getJsonPathTemplateFiles(GeneratedFileType.CODE).get(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_ROOT_FOLDER);
         if (apiRootTemplates != null) {
             for (Map.Entry<String, String> entry: apiRootTemplates.entrySet()) {
                 String templateFile = entry.getKey();
                 String fileName = entry.getValue();
                 Map<String, Object> apiData = new HashMap<>();
-                String packageName = generator.packageName();
-                apiData.put("packageName", packageName);
                 apiData.put("apiClassname", "Api");
                 apiData.put("tagToPathToOperations", tagToPathToOperations);
                 apiData.put("paths", paths);
-                String outputFile = generator.getFilepath(jsonPath) + fileName;
+                String outputFile = generator.getFilePath(GeneratedFileType.CODE, jsonPath) + fileName;
                 generateFile(apiData, templateFile, outputFile, files, true, CodegenConstants.APIS);
             }
         }
 
         // tags file(s)
-        Map<String, String> apiTagsTemplates = generator.jsonPathTemplateFiles().get(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_TAGS);
+        Map<String, String> apiTagsTemplates = generator.getJsonPathTemplateFiles(GeneratedFileType.CODE).get(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_TAGS);
         if (apiTagsTemplates != null) {
             for (Map.Entry<String, String> apiPathEntry: apiTagsTemplates.entrySet()) {
                 String templateFile = apiPathEntry.getKey();
                 String fileName = apiPathEntry.getValue();
                 Map<String, Object> apiData = new HashMap<>();
-                String packageName = generator.packageName();
-                apiData.put("packageName", packageName);
                 String thisJsonPath = jsonPath + "/tags";
-                String outputFile = generator.getFilepath(thisJsonPath) + fileName;
+                String outputFile = generator.getFilePath(GeneratedFileType.CODE, thisJsonPath) + fileName;
                 generateFile(apiData, templateFile, outputFile, files, true, CodegenConstants.APIS);
             }
         }
 
-        Map<String, String> apiTagTemplates = generator.jsonPathTemplateFiles().get(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_TAG);
-        Map<String, String> apiDocTagTemplates = generator.jsonPathDocTemplateFiles().get(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_TAG);
+        Map<String, String> apiTagTemplates = generator.getJsonPathTemplateFiles(GeneratedFileType.CODE).get(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_TAG);
+        Map<String, String> apiDocTagTemplates = generator.getJsonPathTemplateFiles(GeneratedFileType.DOCUMENTATION).get(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_TAG);
         for(Map.Entry<CodegenTag, HashMap<CodegenKey, ArrayList<CodegenOperation>>> entry: tagToPathToOperations.entrySet()) {
             CodegenTag tag = entry.getKey();
             HashMap<CodegenKey, ArrayList<CodegenOperation>> pathToOperations = entry.getValue();
@@ -1251,12 +1213,10 @@ void generateApis(List<File> files, TreeMap<CodegenKey, CodegenPathItem> paths)
             }
 
             Map<String, Object> apiData = new HashMap<>();
-            String packageName = generator.packageName();
-            apiData.put("packageName", packageName);
             apiData.put("tag", tag);
             apiData.put("pathToOperations", pathToOperations);
             apiData.put("operations", operations);
-            apiData.put("apiPackage", generator.apiPackage());
+            apiData.put("apiPackage", generator.generatorSettings().apiPackage);
             apiData.put("docRoot", "../../");
             apiData.put("headerSize", "#");
 
@@ -1277,7 +1237,7 @@ public int compare(CodegenKey e1, CodegenKey e2) {
                     String templateFile = apiPathEntry.getKey();
                     String fileName = apiPathEntry.getValue();
                     String thisJsonPath = jsonPath + "/tags/" + tag.name;
-                    String outputFile = generator.getFilepath(thisJsonPath) + fileName;
+                    String outputFile = generator.getFilePath(GeneratedFileType.CODE, thisJsonPath) + fileName;
                     generateFile(apiData, templateFile, outputFile, files, true, CodegenConstants.APIS);
                 }
             }
@@ -1287,7 +1247,7 @@ public int compare(CodegenKey e1, CodegenKey e2) {
                     String templateFile = apiPathEntry.getKey();
                     String fileName = apiPathEntry.getValue();
                     String thisJsonPath = jsonPath + "/tags/" + tag.name;
-                    String outputFile = generator.getDocsFilepath(thisJsonPath) + fileName;
+                    String outputFile = generator.getFilePath(GeneratedFileType.DOCUMENTATION, thisJsonPath) + fileName;
                     generateFile(apiData, templateFile, outputFile, files, true, CodegenConstants.APIS);
                 }
             }
@@ -1308,7 +1268,7 @@ private void generateSupportingFiles(List<File> files, Map<String, Object> bundl
 
         for (SupportingFile support : generator.supportingFiles()) {
             try {
-                String outputFolder = generator.outputFolder();
+                String outputFolder = generator.generatorSettings().outputFolder;
                 if (StringUtils.isNotEmpty(support.getFolder())) {
                     outputFolder += File.separator + support.getFolder();
                 }
@@ -1330,7 +1290,7 @@ private void generateSupportingFiles(List<File> files, Map<String, Object> bundl
                 File written = processTemplateToFile(bundle, support.getTemplateFile(), outputFilename, shouldGenerate, CodegenConstants.SUPPORTING_FILES);
                 if (written != null) {
                     files.add(written);
-                    if (generator.isEnablePostProcessFile() && !dryRun) {
+                    if (generator.generatorSettings().enablePostProcessFile && !dryRun) {
                         generator.postProcessFile(written, "supporting-file");
                     }
                 }
@@ -1342,7 +1302,7 @@ private void generateSupportingFiles(List<File> files, Map<String, Object> bundl
         // Consider .openapi-generator-ignore a supporting file
         // Output .openapi-generator-ignore if it doesn't exist and wasn't explicitly created by a generator
         final String openapiGeneratorIgnore = ".openapi-generator-ignore";
-        String ignoreFileNameTarget = generator.outputFolder() + File.separator + openapiGeneratorIgnore;
+        String ignoreFileNameTarget = generator.generatorSettings().outputFolder + File.separator + openapiGeneratorIgnore;
         File ignoreFile = new File(ignoreFileNameTarget);
         if (generateMetadata) {
             try {
@@ -1353,7 +1313,7 @@ private void generateSupportingFiles(List<File> files, Map<String, Object> bundl
                 File written = processTemplateToFile(bundle, openapiGeneratorIgnore, ignoreFileNameTarget, shouldGenerate, CodegenConstants.SUPPORTING_FILES);
                 if (written != null) {
                     files.add(written);
-                    if (generator.isEnablePostProcessFile() && !dryRun) {
+                    if (generator.generatorSettings().enablePostProcessFile && !dryRun) {
                         generator.postProcessFile(written, "openapi-generator-ignore");
                     }
                 }
@@ -1379,7 +1339,7 @@ Map<String, Object> buildSupportFileBundle(
             CodegenList<CodegenSecurityRequirementObject> security) {
 
         Map<String, Object> bundle = new HashMap<>(generator.additionalProperties());
-        bundle.put("apiPackage", generator.apiPackage());
+        bundle.put("apiPackage", generator.generatorSettings().apiPackage);
 
         URL url = URLPathUtils.getServerURL(openAPI, null);
         TreeSet<CodegenList<CodegenServer>> allServers = new TreeSet<>();
@@ -1427,7 +1387,7 @@ Map<String, Object> buildSupportFileBundle(
         bundle.put("hasServers", hasServers);  // also true if there are no root servers but there are pathItem/operation servers
         bundle.put("paths", paths);
         bundle.put("security", security);
-        bundle.put("apiFolder", generator.apiPackage().replace('.', File.separatorChar));
+        bundle.put("apiFolder", generator.generatorSettings().apiPackage.replace('.', File.separatorChar));
         bundle.put("modelPackage", generator.modelPackage());
         if (securitySchemes == null) {
             bundle.put("hasHttpSignatureSecurityScheme", false);
@@ -1438,7 +1398,7 @@ Map<String, Object> buildSupportFileBundle(
                 }
             }
         }
-        bundle.put("generatorLanguageVersion", generator.generatorLanguageVersion());
+        bundle.put("generatorLanguageVersion", generator.getGeneratorMetadata().getLanguageVersion());
         // todo verify support and operation bundles have access to the common variables
 
         if (openAPI.getExternalDocs() != null) {
@@ -1459,7 +1419,6 @@ private void generateServers(List<File> files, CodegenList<CodegenServer> server
             return;
         }
         Map<String, Object> serversTemplateData = new HashMap<>();
-        serversTemplateData.put("packageName", generator.packageName());
         serversTemplateData.put("servers", servers);
         generateXs(files, jsonPath, CodegenConstants.JSON_PATH_LOCATION_TYPE.SERVERS, CodegenConstants.SERVERS, serversTemplateData, true);
         serversTemplateData.put("headerSize", "#");
@@ -1469,7 +1428,6 @@ private void generateServers(List<File> files, CodegenList<CodegenServer> server
         int i = 0;
         for (CodegenServer server: servers) {
             Map<String, Object> templateData = new HashMap<>();
-            templateData.put("packageName", generator.packageName());
             templateData.put("server", server);
             String serverJsonPath = jsonPath + "/" + i;
             generateXs(files, serverJsonPath, CodegenConstants.JSON_PATH_LOCATION_TYPE.SERVER, CodegenConstants.SERVERS, templateData, true);
@@ -1513,7 +1471,6 @@ private void generateSecurity(List<File> files, CodegenList<CodegenSecurityRequi
             return;
         }
         Map<String, Object> securityTemplateData = new HashMap<>();
-        securityTemplateData.put("packageName", generator.packageName());
         securityTemplateData.put("security", security);
         generateXs(files, jsonPath, CodegenConstants.JSON_PATH_LOCATION_TYPE.SECURITIES, CodegenConstants.SECURITY, securityTemplateData, true);
         securityTemplateData.put("headerSize", "#");
@@ -1523,7 +1480,6 @@ private void generateSecurity(List<File> files, CodegenList<CodegenSecurityRequi
         int i = 0;
         for (CodegenSecurityRequirementObject securityRequirementObject: security) {
             Map<String, Object> templateData = new HashMap<>();
-            templateData.put("packageName", generator.packageName());
             templateData.put("securityRequirementObject", securityRequirementObject);
             String securityJsonPath = jsonPath + "/" + i;
             generateXs(files, securityJsonPath, CodegenConstants.JSON_PATH_LOCATION_TYPE.SECURITY, CodegenConstants.SECURITY, templateData, true);
@@ -1654,8 +1610,12 @@ public List<File> generate() {
             }
         }
 
-        // post-process
-        generator.postProcess();
+        List<String> postGenerationMsg = generator.getGeneratorMetadata().getPostGenerationMsg();
+        if (postGenerationMsg != null && !postGenerationMsg.isEmpty()) {
+            for (String msg: postGenerationMsg) {
+                LOGGER.info(msg);
+            }
+        }
 
         // reset GlobalSettings, so that the running thread can be reused for another generator-run
         GlobalSettings.reset();
@@ -1708,27 +1668,27 @@ private void processUserDefinedTemplates() {
 
                         switch (userDefinedTemplate.getTemplateType()) {
                             case API:
-                                Map<String, String> apiTemplateFiles = generator.jsonPathTemplateFiles().getOrDefault(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_ROOT_FOLDER, new HashMap<>());
+                                Map<String, String> apiTemplateFiles = generator.getJsonPathTemplateFiles(GeneratedFileType.CODE).getOrDefault(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_ROOT_FOLDER, new HashMap<>());
                                 apiTemplateFiles.put(templateFile, templateExt);
                                 break;
                             case Model:
-                                Map<String, String> schemaTemplateToSuffix = generator.jsonPathTemplateFiles().getOrDefault(CodegenConstants.JSON_PATH_LOCATION_TYPE.SCHEMA, new HashMap<>());
+                                Map<String, String> schemaTemplateToSuffix = generator.getJsonPathTemplateFiles(GeneratedFileType.CODE).getOrDefault(CodegenConstants.JSON_PATH_LOCATION_TYPE.SCHEMA, new HashMap<>());
                                 schemaTemplateToSuffix.put(templateFile, templateExt);
                                 break;
                             case APIDocs:
-                                Map<String, String> apiDocTemplateToSuffix = generator.jsonPathDocTemplateFiles().getOrDefault(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_ROOT_FOLDER, new HashMap<>());
+                                Map<String, String> apiDocTemplateToSuffix = generator.getJsonPathTemplateFiles(GeneratedFileType.DOCUMENTATION).getOrDefault(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_ROOT_FOLDER, new HashMap<>());
                                 apiDocTemplateToSuffix.put(templateFile, templateExt);
                                 break;
                             case ModelDocs:
-                                Map<String, String> schemaDocTemplateToSuffix = generator.jsonPathDocTemplateFiles().getOrDefault(CodegenConstants.JSON_PATH_LOCATION_TYPE.SCHEMA, new HashMap<>());
+                                Map<String, String> schemaDocTemplateToSuffix = generator.getJsonPathTemplateFiles(GeneratedFileType.DOCUMENTATION).getOrDefault(CodegenConstants.JSON_PATH_LOCATION_TYPE.SCHEMA, new HashMap<>());
                                 schemaDocTemplateToSuffix.put(templateFile, templateExt);
                                 break;
                             case APITests:
-                                Map<String, String> apiTestTemplateToSuffix = generator.jsonPathTestTemplateFiles().getOrDefault(CodegenConstants.JSON_PATH_LOCATION_TYPE.OPERATION, new HashMap<>());
+                                Map<String, String> apiTestTemplateToSuffix = generator.getJsonPathTemplateFiles(GeneratedFileType.TEST).getOrDefault(CodegenConstants.JSON_PATH_LOCATION_TYPE.OPERATION, new HashMap<>());
                                 apiTestTemplateToSuffix.put(templateFile, templateExt);
                                 break;
                             case ModelTests:
-                                Map<String, String> modelTestTemplateToSuffix = generator.jsonPathTestTemplateFiles().getOrDefault(CodegenConstants.JSON_PATH_LOCATION_TYPE.SCHEMA, new HashMap<>());
+                                Map<String, String> modelTestTemplateToSuffix = generator.getJsonPathTemplateFiles(GeneratedFileType.TEST).getOrDefault(CodegenConstants.JSON_PATH_LOCATION_TYPE.SCHEMA, new HashMap<>());
                                 modelTestTemplateToSuffix.put(templateFile, templateExt);
                                 break;
                             case SupportingFiles:
@@ -1740,7 +1700,7 @@ private void processUserDefinedTemplates() {
     }
 
     protected File processTemplateToFile(Map<String, Object> templateData, String templateName, String outputFilename, boolean shouldGenerate, String skippedByOption) throws IOException {
-        return processTemplateToFile(templateData, templateName, outputFilename, shouldGenerate, skippedByOption, this.generator.getOutputDir());
+        return processTemplateToFile(templateData, templateName, outputFilename, shouldGenerate, skippedByOption, this.generator.generatorSettings().outputFolder);
     }
 
     private File processTemplateToFile(Map<String, Object> templateData, String templateName, String outputFilename, boolean shouldGenerate, String skippedByOption, String intendedOutputDir) throws IOException {
@@ -1774,14 +1734,14 @@ private static String generateParameterId(Parameter parameter) {
      * @param files The list tracking generated files
      */
     private void generateVersionMetadata(List<File> files) {
-        String versionMetadata = generator.outputFolder() + File.separator + METADATA_DIR + File.separator + generator.getVersionMetadataFilename();
+        String versionMetadata = generator.generatorSettings().outputFolder + File.separator + METADATA_DIR + File.separator + generator.getReportFilename(ReportFileType.VERSION);
         if (generateMetadata) {
             File versionMetadataFile = new File(versionMetadata);
             try {
                 File written = this.templateProcessor.writeToFile(versionMetadata, ImplementationVersion.read().getBytes(StandardCharsets.UTF_8));
                 if (written != null) {
                     files.add(versionMetadataFile);
-                    if (generator.isEnablePostProcessFile() && !dryRun) {
+                    if (generator.generatorSettings().enablePostProcessFile && !dryRun) {
                         generator.postProcessFile(written, "openapi-generator-version");
                     }
                 }
@@ -1809,7 +1769,7 @@ private void generateFilesMetadata(List<File> files) {
         if (generateMetadata) {
             try {
                 StringBuilder sb = new StringBuilder();
-                Path outDir = absPath(new File(this.generator.getOutputDir()));
+                Path outDir = absPath(new File(this.generator.generatorSettings().outputFolder));
 
                 List<File> filesToSort = new ArrayList<>();
 
@@ -1842,7 +1802,7 @@ private void generateFilesMetadata(List<File> files) {
                     }
                 });
 
-                String targetFile = generator.outputFolder() + File.separator + METADATA_DIR + File.separator + generator.getFilesMetadataFilename();
+                String targetFile = generator.generatorSettings().outputFolder + File.separator + METADATA_DIR + File.separator + generator.getReportFilename(ReportFileType.FILES);
 
                 File filesFile = this.templateProcessor.writeToFile(targetFile, sb.toString().getBytes(StandardCharsets.UTF_8));
                 if (filesFile != null) {
diff --git a/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorRunner.java b/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorRunner.java
index 9878ba39183..72f8af8a07c 100644
--- a/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorRunner.java
+++ b/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorRunner.java
@@ -24,8 +24,5 @@
 
 public interface GeneratorRunner {
     GeneratorRunner opts(ClientOptInput opts);
-
-    String requestBodyFileFolder();
-
     List<File> generate();
 }
\ No newline at end of file
diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java
index 49a96eca428..3990dc0bc3f 100644
--- a/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java
+++ b/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java
@@ -25,7 +25,6 @@
 import com.github.curiousoddman.rgxgen.config.RgxGenProperties;
 import com.google.common.collect.ImmutableMap;
 import com.samskivert.mustache.Mustache;
-import com.samskivert.mustache.Mustache.Compiler;
 import com.samskivert.mustache.Mustache.Lambda;
 
 import io.swagger.v3.oas.models.Components;
@@ -38,6 +37,8 @@
 import org.apache.commons.text.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
+import org.openapijsonschematools.codegen.config.GeneratorSettings;
+import org.openapijsonschematools.codegen.config.WorkflowSettings;
 import org.openapijsonschematools.codegen.generators.models.CliOption;
 import org.openapijsonschematools.codegen.common.CodegenConstants;
 import org.openapijsonschematools.codegen.config.GlobalSettings;
@@ -47,6 +48,7 @@
 import org.openapijsonschematools.codegen.generators.generatormetadata.features.GlobalFeature;
 import org.openapijsonschematools.codegen.generators.generatormetadata.features.SchemaFeature;
 import org.openapijsonschematools.codegen.generators.generatormetadata.features.WireFormatFeature;
+import org.openapijsonschematools.codegen.generators.models.CodeGeneratorSettings;
 import org.openapijsonschematools.codegen.generators.models.VendorExtension;
 import org.openapijsonschematools.codegen.generators.openapimodels.ArrayListWithContext;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenCallback;
@@ -78,15 +80,16 @@
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenXml;
 import org.openapijsonschematools.codegen.generators.openapimodels.EnumInfo;
 import org.openapijsonschematools.codegen.generators.openapimodels.EnumValue;
+import org.openapijsonschematools.codegen.generators.models.GeneratedFileType;
 import org.openapijsonschematools.codegen.generators.openapimodels.LinkedHashMapWithContext;
 import org.openapijsonschematools.codegen.generators.openapimodels.MapBuilder;
 import org.openapijsonschematools.codegen.generators.openapimodels.PairCacheKey;
 import org.openapijsonschematools.codegen.generators.openapimodels.ParameterCollection;
+import org.openapijsonschematools.codegen.generators.models.ReportFileType;
 import org.openapijsonschematools.codegen.generators.openapimodels.SchemaTestCase;
 import org.openapijsonschematools.codegen.templating.SupportingFile;
 import org.openapijsonschematools.codegen.common.SerializerUtils;
 import org.openapijsonschematools.codegen.templating.TemplatingEngineLoader;
-import org.openapijsonschematools.codegen.templating.mustache.CamelCaseLambda;
 import org.openapijsonschematools.codegen.templating.mustache.IndentedLambda;
 import org.openapijsonschematools.codegen.templating.mustache.LowercaseLambda;
 import org.openapijsonschematools.codegen.templating.mustache.SnakecaseLambda;
@@ -108,7 +111,6 @@
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -128,12 +130,58 @@
 import io.swagger.v3.oas.models.servers.Server;
 import io.swagger.v3.oas.models.servers.ServerVariable;
 
-import javax.validation.constraints.NotNull;
-
 import static org.openapijsonschematools.codegen.common.StringUtils.camelize;
 
 @SuppressWarnings("rawtypes")
 public class DefaultGenerator implements Generator {
+    protected CodeGeneratorSettings generatorSettings;
+    protected static final List<String> defaultPostGenerationMsg = List.of(
+        "################################################################################",
+        "# Thanks for using OpenAPI JSON Schema Generator.                              #",
+        "# Please consider donation to help us maintain this project \uD83D\uDE4F                 #",
+        "# https://github.com/sponsors/spacether                                        #",
+        "################################################################################"
+    );
+
+    private static Map<String, Object> getInitialAdditionalProperties(GeneratorSettings generatorSettings, CodeGeneratorSettings codeGeneratorSettings) {
+        Map<String, Object> initialAddProps = new HashMap<>();
+        if (generatorSettings != null) {
+            initialAddProps.putAll(generatorSettings.getAdditionalProperties());
+        }
+        initialAddProps.put(CodegenConstants.HIDE_GENERATION_TIMESTAMP, codeGeneratorSettings.hideGenerationTimestamp);
+        initialAddProps.put(CodegenConstants.TEMPLATING_ENGINE, codeGeneratorSettings.templateEngineName);
+        if (codeGeneratorSettings.templateDir != null) {
+            initialAddProps.put(CodegenConstants.TEMPLATE_DIR, codeGeneratorSettings.templateDir);
+        }
+        return initialAddProps;
+    }
+
+    protected DefaultGenerator(GeneratorSettings generatorSettings, WorkflowSettings workflowSettings, String embeddedTemplateDir, String packageNameDefault, String artifactIdDefault, String outputFolderDefault) {
+        this.generatorSettings = CodeGeneratorSettings.of(generatorSettings, workflowSettings, embeddedTemplateDir, packageNameDefault, artifactIdDefault, outputFolderDefault);
+        additionalProperties = getInitialAdditionalProperties(generatorSettings, this.generatorSettings);
+
+        // name formatting options
+        cliOptions.add(CliOption.newBoolean(CodegenConstants.ALLOW_UNICODE_IDENTIFIERS, CodegenConstants
+            .ALLOW_UNICODE_IDENTIFIERS_DESC).defaultValue(Boolean.FALSE.toString()));
+
+        // initialize special character mapping
+        initializeSpecialCharacterMapping();
+
+        // Register common Mustache lambdas.
+        registerMustacheLambdas();
+    }
+
+    public DefaultGenerator(GeneratorSettings generatorSettings, WorkflowSettings workflowSettings) {
+        this(
+            generatorSettings,
+            workflowSettings,
+            "java",
+            "openapiclient",
+            "openapiclient",
+            "generated-code" + File.separator + "java"
+        );
+    }
+
     private final Logger LOGGER = LoggerFactory.getLogger(DefaultGenerator.class);
 
     public static FeatureSet DefaultFeatureSet;
@@ -151,10 +199,6 @@ public class DefaultGenerator implements Generator {
     protected String requestBodyIdentifier = "request_body";
     private final Pattern patternRegex = Pattern.compile("^/?(.+?)/?([simu]{0,4})$");
     private final CodegenKey additionalPropertySampleKey = new CodegenKey("someAdditionalProperty", true, "additional_property", "AdditionalProperty", "additional-property", "additionalProperty");
-
-
-
-    protected String templateEngineName;
     protected String headersSchemaFragment = "Headers";
     protected static final Set<String> operationVerbs = Set.of("get", "put", "post", "delete", "options", "head", "patch", "trace");
     protected Set<String> xParameters = Set.of("PathParameters", "QueryParameters", "HeaderParameters", "CookieParameters");
@@ -201,25 +245,27 @@ public class DefaultGenerator implements Generator {
         falseSchema.setNot(new Schema());
     }
 
-    protected GeneratorMetadata generatorMetadata;
+    public static final GeneratorMetadata generatorMetadata = GeneratorMetadata.newBuilder()
+        .name("java")
+        .language(GeneratorLanguage.JAVA)
+        .languageVersion("17")
+        .type(GeneratorType.CLIENT)
+        .stability(Stability.EXPERIMENTAL)
+        .featureSet(DefaultFeatureSet)
+        .generationMessage("OpenAPI JSON Schema Generator: java "+GeneratorType.CLIENT.toValue())
+        .helpMsg("todo replace help text")
+        .postGenerationMsg(defaultPostGenerationMsg)
+        .reservedWords(Set.of())
+        .instantiationTypes(Map.of())
+        .languageSpecificPrimitives(Set.of())
+        .build();
     protected String inputSpec;
-    protected String outputFolder = "";
-    protected Set<String> defaultIncludes;
     protected Map<String, String> typeMapping;
-    // instantiationTypes map from container types only: set, map, and array to the in language-type
-    protected Map<String, String> instantiationTypes;
-    protected Set<String> reservedWords;
-    protected Set<String> languageSpecificPrimitives = new HashSet<>();
-    // a map to store the mapping between a schema and the new one
-    // a map to store the mapping between inline schema and the name provided by the user
-    protected String modelPackage = "components.schema", apiPackage = "";
+    protected String modelPackage = "components.schema";
     protected String modelNamePrefix = "", modelNameSuffix = "";
     protected String apiNamePrefix = "", apiNameSuffix = "Api";
     protected String filesMetadataFilename = "FILES";
     protected String versionMetadataFilename = "VERSION";
-
-    protected String packageName = "src.main.java";
-
     protected String docsFolder = "docs";
     // for writing api files
     protected HashMap<CodegenConstants.JSON_PATH_LOCATION_TYPE, HashMap<String, String>> jsonPathTemplateFiles = new HashMap<>();
@@ -228,8 +274,6 @@ public class DefaultGenerator implements Generator {
     // for writing test files
     protected HashMap<CodegenConstants.JSON_PATH_LOCATION_TYPE, HashMap<String, String>> jsonPathTestTemplateFiles = new HashMap<>();
 
-    protected String templateDir;
-    protected String embeddedTemplateDir;
     protected Map<String, Object> additionalProperties = new HashMap<>();
     protected Map<String, Object> vendorExtensions = new HashMap<>();
     /*
@@ -238,11 +282,8 @@ public class DefaultGenerator implements Generator {
     */
     protected List<SupportingFile> supportingFiles = new ArrayList<>();
     protected List<CliOption> cliOptions = new ArrayList<>();
-    protected boolean skipOverwrite;
-    protected boolean removeOperationIdPrefix;
     protected String removeOperationIdPrefixDelimiter = "_";
     protected int removeOperationIdPrefixCount = 1;
-    protected boolean skipOperationExample;
 
     private static final Pattern COMMON_PREFIX_ENUM_NAME = Pattern.compile("[a-zA-Z\\d]+\\z");
 
@@ -268,7 +309,6 @@ public class DefaultGenerator implements Generator {
      */
     protected boolean supportsAdditionalPropertiesWithComposedSchema = true;
     protected Boolean allowUnicodeIdentifiers = false;
-    protected Boolean hideGenerationTimestamp = true;
     // How to encode special characters like $
     // They are translated to words like "Dollar" and prefixed with '
     // Then translated back during JSON encoding and decoding
@@ -279,11 +319,6 @@ public class DefaultGenerator implements Generator {
     // flag to indicate whether to use environment variable to post process file
     protected boolean enablePostProcessFile = false;
 
-    // flag to indicate whether to only update files whose contents have changed
-    protected boolean enableMinimalUpdate = false;
-
-    // acts strictly upon a spec, potentially modifying it to have consistent behavior across generators.
-    protected boolean strictSpecBehavior = true;
     // flag to indicate whether enum value prefixes are removed
     protected boolean removeEnumValuePrefix = true;
 
@@ -316,24 +351,6 @@ public List<CliOption> cliOptions() {
 
     @Override
     public void processOpts() {
-        if (this.templateEngineName == null && additionalProperties.containsKey(CodegenConstants.TEMPLATING_ENGINE)) {
-            setTemplateEngineName((String) additionalProperties.get(CodegenConstants.TEMPLATING_ENGINE));
-        }
-
-        if (additionalProperties.containsKey(CodegenConstants.TEMPLATE_DIR)) {
-            this.setTemplateDir((String) additionalProperties.get(CodegenConstants.TEMPLATE_DIR));
-        }
-
-        if (additionalProperties.containsKey(CodegenConstants.API_PACKAGE)) {
-            this.setApiPackage((String) additionalProperties.get(CodegenConstants.API_PACKAGE));
-        }
-
-        if (additionalProperties.containsKey(CodegenConstants.HIDE_GENERATION_TIMESTAMP)) {
-            setHideGenerationTimestamp(convertPropertyToBooleanAndWriteBack(CodegenConstants.HIDE_GENERATION_TIMESTAMP));
-        } else {
-            additionalProperties.put(CodegenConstants.HIDE_GENERATION_TIMESTAMP, hideGenerationTimestamp);
-        }
-
         if (additionalProperties.containsKey(CodegenConstants.ALLOW_UNICODE_IDENTIFIERS)) {
             this.setAllowUnicodeIdentifiers(Boolean.valueOf(additionalProperties
                     .get(CodegenConstants.ALLOW_UNICODE_IDENTIFIERS).toString()));
@@ -355,11 +372,6 @@ public void processOpts() {
             this.setModelNameSuffix((String) additionalProperties.get(CodegenConstants.MODEL_NAME_SUFFIX));
         }
 
-        if (additionalProperties.containsKey(CodegenConstants.REMOVE_OPERATION_ID_PREFIX)) {
-            this.setRemoveOperationIdPrefix(Boolean.parseBoolean(additionalProperties
-                    .get(CodegenConstants.REMOVE_OPERATION_ID_PREFIX).toString()));
-        }
-
         if (additionalProperties.containsKey(CodegenConstants.REMOVE_OPERATION_ID_PREFIX_DELIMITER)) {
             this.setRemoveOperationIdPrefixDelimiter(additionalProperties
                     .get(CodegenConstants.REMOVE_OPERATION_ID_PREFIX_DELIMITER).toString());
@@ -370,28 +382,12 @@ public void processOpts() {
                     .get(CodegenConstants.REMOVE_OPERATION_ID_PREFIX_COUNT).toString()));
         }
 
-        if (additionalProperties.containsKey(CodegenConstants.SKIP_OPERATION_EXAMPLE)) {
-            this.setSkipOperationExample(Boolean.parseBoolean(additionalProperties
-                    .get(CodegenConstants.SKIP_OPERATION_EXAMPLE).toString()));
-        }
-
         if (additionalProperties.containsKey(CodegenConstants.DOCEXTENSION)) {
             this.setDocExtension(String.valueOf(additionalProperties
                     .get(CodegenConstants.DOCEXTENSION).toString()));
         }
 
-        if (additionalProperties.containsKey(CodegenConstants.ENABLE_POST_PROCESS_FILE)) {
-            this.setEnablePostProcessFile(Boolean.parseBoolean(additionalProperties
-                    .get(CodegenConstants.ENABLE_POST_PROCESS_FILE).toString()));
-        }
-
-        if (additionalProperties.containsKey(CodegenConstants.REMOVE_ENUM_VALUE_PREFIX)) {
-            this.setRemoveEnumValuePrefix(Boolean.parseBoolean(additionalProperties
-                    .get(CodegenConstants.REMOVE_ENUM_VALUE_PREFIX).toString()));
-        }
-
         requiredAddPropUnsetSchema = fromSchema(new JsonSchema(), null, null);
-
     }
 
     /***
@@ -413,8 +409,6 @@ protected ImmutableMap.Builder<String, Lambda> addMustacheLambdas() {
                 .put("uppercase", new UppercaseLambda())
                 .put("snakecase", new SnakecaseLambda())
                 .put("titlecase", new TitlecaseLambda())
-                .put("camelcase", new CamelCaseLambda(true).generator(this))
-                .put("pascalcase", new CamelCaseLambda(false).generator(this))
                 .put("indented", new IndentedLambda())
                 .put("indented_8", new IndentedLambda(8, " "))
                 .put("indented_12", new IndentedLambda(12, " "))
@@ -457,14 +451,8 @@ protected Map<String, Schema> getModelNameToSchemaCache() {
         return modelNameToSchemaCache;
     }
 
-    @Override
-    public String packageName() {
-        // used to generate imports
-        return packageName;
-    }
-
     public String packagePath() {
-        return packageName.replace('.', File.separatorChar);
+        return generatorSettings.packageName.replace('.', File.separatorChar);
     }
 
     /**
@@ -478,13 +466,6 @@ public TreeMap<String, CodegenSchema> updateAllModels(TreeMap<String, CodegenSch
         return models;
     }
 
-    // override with any special post-processing
-    @Override
-    @SuppressWarnings("static-method")
-    public TreeMap<String, CodegenSchema> postProcessModels(TreeMap<String, CodegenSchema> models) {
-        return models;
-    }
-
     /**
      * Returns the common prefix of variables for enum naming if
      * two or more variables are present
@@ -545,17 +526,6 @@ public void setOpenAPI(OpenAPI openAPI) {
         this.openAPI = openAPI;
     }
 
-    // override with any message to be shown right before the process finishes
-    @Override
-    @SuppressWarnings("static-method")
-    public void postProcess() {
-        LOGGER.info("################################################################################");
-        LOGGER.info("# Thanks for using OpenAPI JSON Schema Generator.                              #");
-        LOGGER.info("# Please consider donation to help us maintain this project \uD83D\uDE4F                 #");
-        LOGGER.info("# https://github.com/sponsors/spacether                                        #");
-        LOGGER.info("################################################################################");
-    }
-
     // override with any special post-processing
     @Override
     @SuppressWarnings("static-method")
@@ -599,13 +569,6 @@ public void preprocessOpenAPI(OpenAPI openAPI) {
     public void processOpenAPI(OpenAPI openAPI) {
     }
 
-    // override with any special handling of the JMustache compiler
-    @Override
-    @SuppressWarnings("unused")
-    public Compiler processCompiler(Compiler compiler) {
-        return compiler;
-    }
-
     // override with any special text escaping logic
     @Override
     @SuppressWarnings("static-method")
@@ -628,32 +591,6 @@ public String escapeText(String input) {
                         .replace("\"", "\\\""));
     }
 
-    /**
-     * Escape characters while allowing new lines
-     *
-     * @param input String to be escaped
-     * @return escaped string
-     */
-    @Override
-    public String escapeTextWhileAllowingNewLines(String input) {
-        if (input == null) {
-            return null;
-        }
-
-        // remove \t
-        // replace \ with \\
-        // replace " with \"
-        // outer unescape to retain the original multibyte characters
-        // finally escalate characters avoiding code injection
-        return escapeUnsafeCharacters(
-                StringEscapeUtils.unescapeJava(
-                                StringEscapeUtils.escapeJava(input)
-                                        .replace("\\/", "/"))
-                        .replaceAll("\\t", " ")
-                        .replace("\\", "\\\\")
-                        .replace("\"", "\\\""));
-    }
-
     /**
      * override with any special text escaping logic to handle unsafe
      * characters to avoid code injection
@@ -686,59 +623,26 @@ public String escapeQuotationMark(String input) {
     }
 
     @Override
-    public Map<String, String> instantiationTypes() {
-        return instantiationTypes;
-    }
-
-    @Override
-    public Set<String> reservedWords() {
-        return reservedWords;
-    }
-
-    @Override
-    public Set<String> languageSpecificPrimitives() {
-        return languageSpecificPrimitives;
+    public HashMap<CodegenConstants.JSON_PATH_LOCATION_TYPE, HashMap<String, String>> getJsonPathTemplateFiles(GeneratedFileType type) {
+        switch (type) {
+            case CODE:
+                return jsonPathTemplateFiles;
+            case DOCUMENTATION:
+                return jsonPathDocTemplateFiles;
+            case TEST:
+                return jsonPathTestTemplateFiles;
+            default:
+                return null;
+        }
     }
 
-    @Override
+    @Deprecated
     public String modelPackage() {
         return modelPackage;
     }
 
-    @Override
-    public String apiPackage() {
-        return apiPackage;
-    }
-
-    @Override
-    public String templateDir() {
-        return templateDir;
-    }
-
-    @Override
-    public String embeddedTemplateDir() {
-        if (embeddedTemplateDir != null) {
-            return embeddedTemplateDir;
-        } else {
-            return templateDir;
-        }
-    }
-    @Override
-    public HashMap<CodegenConstants.JSON_PATH_LOCATION_TYPE, HashMap<String, String>> jsonPathTemplateFiles() {
-        return jsonPathTemplateFiles;
-    }
-
-    @Override
-    public HashMap<CodegenConstants.JSON_PATH_LOCATION_TYPE, HashMap<String, String>> jsonPathDocTemplateFiles() {
-        return jsonPathDocTemplateFiles;
-    }
-
-    @Override
-    public HashMap<CodegenConstants.JSON_PATH_LOCATION_TYPE, HashMap<String, String>> jsonPathTestTemplateFiles() {
-        return jsonPathTestTemplateFiles;
-    }
-
-    public String toResponseModuleName(String componentName, String jsonPath) { return toModuleFilename(componentName, jsonPath); }
+    @Deprecated
+    public String toResponseModuleName(String componentName, String jsonPath) { return getFilename(CodegenKeyType.RESPONSE, componentName, jsonPath); }
 
     @Deprecated
     public String getPascalCaseResponse(String componentName, String jsonPath) { return getPascalCase(CodegenKeyType.RESPONSE, componentName, jsonPath); }
@@ -754,47 +658,13 @@ public Map<String, Object> vendorExtensions() {
     }
 
     @Override
-    public List<SupportingFile> supportingFiles() {
-        return supportingFiles;
-    }
-
-    @Override
-    public String outputFolder() {
-        return outputFolder;
-    }
-
-    @Override
-    public void setOutputDir(String dir) {
-        this.outputFolder = dir;
+    public CodeGeneratorSettings generatorSettings() {
+        return generatorSettings;
     }
 
     @Override
-    public String getOutputDir() {
-        return outputFolder();
-    }
-
-    @Override
-    public String getInputSpec() {
-        return inputSpec;
-    }
-
-    @Override
-    public void setInputSpec(String inputSpec) {
-        this.inputSpec = inputSpec;
-    }
-
-    @Override
-    public String getFilesMetadataFilename() {
-        return filesMetadataFilename;
-    }
-
-    @Override
-    public String getVersionMetadataFilename() {
-        return versionMetadataFilename;
-    }
-
-    public void setTemplateDir(String templateDir) {
-        this.templateDir = templateDir;
+    public List<SupportingFile> supportingFiles() {
+        return supportingFiles;
     }
 
     public void setModelPackage(String modelPackage) {
@@ -817,10 +687,6 @@ public void setApiNamePrefix(String apiNamePrefix) {
         this.apiNamePrefix = apiNamePrefix;
     }
 
-    public void setApiPackage(String apiPackage) {
-        this.apiPackage = apiPackage;
-    }
-
     public void setAllowUnicodeIdentifiers(Boolean allowUnicodeIdentifiers) {
         this.allowUnicodeIdentifiers = allowUnicodeIdentifiers;
     }
@@ -925,6 +791,18 @@ public String getPascalCaseParameter(String basename, String jsonPath) {
         return getPascalCase(CodegenKeyType.PARAMETER, basename, null);
     }
 
+    @Override
+    public String getReportFilename(ReportFileType type) {
+        switch (type) {
+            case FILES:
+                return filesMetadataFilename;
+            case VERSION:
+                return versionMetadataFilename;
+            default:
+                return null;
+        }
+    }
+
     /**
      * Returns metadata about the generator.
      *
@@ -943,7 +821,7 @@ public GeneratorMetadata getGeneratorMetadata() {
      * @return the sanitized variable name
      */
     public String toVarName(final String name) {
-        if (reservedWords.contains(name)) {
+        if (getGeneratorMetadata().getReservedWords().contains(name)) {
             return escapeReservedWord(name);
         } else if (name.chars().anyMatch(character -> specialCharReplacements.containsKey(String.valueOf((char) character)))) {
             return org.openapijsonschematools.codegen.common.StringUtils.escape(name, specialCharReplacements, null, null);
@@ -951,6 +829,7 @@ public String toVarName(final String name) {
         return name;
     }
 
+    @Deprecated
     /**
      * Return the parameter name by removing invalid characters and proper escaping if
      * it's a reserved word.
@@ -960,8 +839,14 @@ public String toVarName(final String name) {
      */
     @Override
     public String toParamName(String name) {
-        name = removeNonNameElementToCamelCase(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
-        if (reservedWords.contains(name)) {
+        String result = Arrays.stream(name.split("[-_:;#" + removeOperationIdPrefixDelimiter + "]"))
+                .map(StringUtils::capitalize)
+                .collect(Collectors.joining(""));
+        if (!result.isEmpty()) {
+            result = result.substring(0, 1).toLowerCase(Locale.ROOT) + result.substring(1);
+        }
+        name = result; // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
+        if (getGeneratorMetadata().getReservedWords().contains(name)) {
             return escapeReservedWord(name);
         } else if (name.chars().anyMatch(character -> specialCharReplacements.containsKey(String.valueOf((char) character)))) {
             return org.openapijsonschematools.codegen.common.StringUtils.escape(name, specialCharReplacements, null, null);
@@ -995,90 +880,10 @@ public String toModelImport(String refClass) {
         if ("".equals(modelPackage())) {
             return refClass;
         } else {
-            return modelPackage() + "." + refClass;
+            return modelPackage + "." + refClass;
         }
     }
 
-    protected Stability getStability() {
-        return Stability.STABLE;
-    }
-
-    /**
-     * Default constructor.
-     * This method will map between OAS type and language-specified type, as well as mapping
-     * between OAS type and the corresponding import statement for the language. This will
-     * also add some language specified CLI options, if any.
-     * returns string presentation of the example path (it's a constructor)
-     */
-    public DefaultGenerator() {
-        GeneratorType generatorType = getTag();
-        if (generatorType == null) {
-            generatorType = GeneratorType.OTHER;
-        }
-
-        generatorMetadata = GeneratorMetadata.newBuilder()
-                .stability(getStability())
-                .featureSet(DefaultFeatureSet)
-                .generationMessage(String.format(Locale.ROOT, "OpenAPI JSON Schema Generator: %s (%s)", getName(), generatorType.toValue()))
-                .build();
-
-        defaultIncludes = new HashSet<>(
-                Arrays.asList("double",
-                        "int",
-                        "long",
-                        "short",
-                        "char",
-                        "float",
-                        "String",
-                        "boolean",
-                        "Boolean",
-                        "Double",
-                        "Void",
-                        "Integer",
-                        "Long",
-                        "Float")
-        );
-
-        typeMapping = new HashMap<>();
-        typeMapping.put("array", "List");
-        typeMapping.put("set", "Set");
-        typeMapping.put("map", "Map");
-        typeMapping.put("boolean", "Boolean");
-        typeMapping.put("string", "String");
-        typeMapping.put("int", "Integer");
-        typeMapping.put("float", "Float");
-        typeMapping.put("double", "Double");
-        typeMapping.put("number", "BigDecimal");
-        typeMapping.put("decimal", "BigDecimal");
-        typeMapping.put("DateTime", "Date");
-        typeMapping.put("long", "Long");
-        typeMapping.put("short", "Short");
-        typeMapping.put("char", "String");
-        typeMapping.put("object", "Object");
-        typeMapping.put("integer", "Integer");
-        // FIXME: java specific type should be in Java Based Abstract Implementations
-        typeMapping.put("ByteArray", "byte[]");
-        typeMapping.put("binary", "File");
-        typeMapping.put("file", "File");
-        typeMapping.put("UUID", "UUID");
-        typeMapping.put("URI", "URI");
-        typeMapping.put("AnyType", "oas_any_type_not_mapped");
-
-        instantiationTypes = new HashMap<>();
-
-        reservedWords = new HashSet<>();
-
-        // name formatting options
-        cliOptions.add(CliOption.newBoolean(CodegenConstants.ALLOW_UNICODE_IDENTIFIERS, CodegenConstants
-                .ALLOW_UNICODE_IDENTIFIERS_DESC).defaultValue(Boolean.FALSE.toString()));
-
-        // initialize special character mapping
-        initializeSpecialCharacterMapping();
-
-        // Register common Mustache lambdas.
-        registerMustacheLambdas();
-    }
-
     /**
      * Initialize special character mapping
      */
@@ -1793,7 +1598,7 @@ protected boolean isValid(String name) {
 
     @Override
     public String getImport(CodegenRefInfo<?> refInfo) {
-        String prefix = "from " + packageName + ".components.";
+        String prefix = "from " + generatorSettings.packageName + ".components.";
         if (refInfo.ref instanceof CodegenSchema) {
             if (refInfo.refModuleAlias == null) {
                 return "from " + refInfo.refModuleLocation + " import " + refInfo.refModule;
@@ -1830,7 +1635,7 @@ public Set<String> getImports(String sourceJsonPath, CodegenSchema schema, Featu
                     String complexType = mm.modelName;
                     if (shouldAddImport(complexType)) {
                         String refModule = complexType.split("\\.")[0];
-                        String refModuleLocation = packageName() + ".components.schema";
+                        String refModuleLocation = generatorSettings.packageName + ".components.schema";
                         CodegenRefInfo<CodegenSchema> refInfo = new CodegenRefInfo<>(new CodegenSchema(), null, refModule, refModuleLocation, null);
                         imports.add(getImport(refInfo));
                     }
@@ -1933,7 +1738,7 @@ protected LinkedHashSet<String> getTypes(Schema schema) {
     }
 
     private String schemaPathFromDocRoot(String moduleLocation) {
-        return moduleLocation.replace('.', File.separatorChar).substring(packageName.length()+1);
+        return moduleLocation.replace('.', File.separatorChar).substring(generatorSettings.packageName.length()+1);
     }
 
     private LinkedHashMap<CodegenPatternInfo, CodegenSchema> getPatternProperties(Map<String, Schema> schemaPatternProperties, String jsonPath, String sourceJsonPath) {
@@ -2262,7 +2067,7 @@ public CodegenSchema fromSchema(Schema p, String sourceJsonPath, String currentJ
                 // import from $ref
                 property.imports = new TreeSet<>();
                 assert generatorMetadata != null;
-                addImports(property.imports, getImports(sourceJsonPath, property, generatorMetadata.getFeatureSet()));
+                addImports(property.imports, getImports(sourceJsonPath, property, getGeneratorMetadata().getFeatureSet()));
             }
             if (p.getSpecVersion().compareTo(SpecVersion.V31) < 0) {
                 //  stop processing if version is less than 3.1.0
@@ -2537,8 +2342,7 @@ public CodegenSchema fromSchema(Schema p, String sourceJsonPath, String currentJ
         if (addSchemaImportsFromV3SpecLocations && sourceJsonPath != null && sourceJsonPath.equals(currentJsonPath)) {
             // imports from properties/items/additionalProperties/oneOf/anyOf/allOf/not
             property.imports = new TreeSet<>();
-            assert generatorMetadata != null;
-            addImports(property.imports, getImports(sourceJsonPath, property, generatorMetadata.getFeatureSet()));
+            addImports(property.imports, getImports(sourceJsonPath, property, getGeneratorMetadata().getFeatureSet()));
         }
 
         LOGGER.debug("debugging fromSchema return: {}", property);
@@ -2569,7 +2373,7 @@ protected CodegenKey getOperationId(Operation operation, String path, String htt
         String operationId = getOrGenerateOperationId(operation, path, httpMethod);
 
         // remove prefix in operationId
-        if (removeOperationIdPrefix) {
+        if (generatorSettings.removeOperationIdPrefix) {
             // The prefix is everything before the removeOperationIdPrefixCount occurrence of removeOperationIdPrefixDelimiter
             String[] components = operationId.split("[" + removeOperationIdPrefixDelimiter + "]");
             if (components.length > 1) {
@@ -2970,7 +2774,7 @@ private CodegenSchema getXParametersSchema(HashMap<String, Schema> xParametersPr
         xParametersSchema.setAdditionalProperties(Boolean.FALSE);
         CodegenSchema schema = fromSchema(xParametersSchema, sourceJsonPath, currentJsonPath);
         schema.imports = new TreeSet<>();
-        addImports(schema.imports, getImports(sourceJsonPath, schema, generatorMetadata.getFeatureSet()));
+        addImports(schema.imports, getImports(sourceJsonPath, schema, getGeneratorMetadata().getFeatureSet()));
         return schema;
     }
 
@@ -3018,20 +2822,20 @@ public CodegenList<CodegenSecurityRequirementObject> fromSecurity(List<SecurityR
 
     protected String getPathFromDocRoot(String sourceJsonPath) {
         String moduleLocation = getModuleLocation(sourceJsonPath);
-        return moduleLocation.replace('.', File.separatorChar).substring(packageName.length()+1);
+        return moduleLocation.replace('.', File.separatorChar).substring(generatorSettings.packageName.length()+1);
     }
 
     protected String responsePathFromDocRoot(String sourceJsonPath) {
         if (sourceJsonPath.startsWith("#/components/responses")) {
             String moduleLocation = getModuleLocation(sourceJsonPath);
-            return moduleLocation.replace('.', File.separatorChar).substring(packageName.length()+1);
+            return moduleLocation.replace('.', File.separatorChar).substring(generatorSettings.packageName.length()+1);
         }
         // otherwise response is inline and the operation file is the location
         // #/paths/somePath/verb/responses/200
         int secondToLastSlashIndex = sourceJsonPath.lastIndexOf("/", sourceJsonPath.lastIndexOf("/")-1);
         String sourceJsonPathSubstring = sourceJsonPath.substring(0, secondToLastSlashIndex);
         String moduleLocation = getModuleLocation(sourceJsonPathSubstring);
-        return moduleLocation.replace('.', File.separatorChar).substring(packageName.length()+1);
+        return moduleLocation.replace('.', File.separatorChar).substring(generatorSettings.packageName.length()+1);
     }
 
     private CodegenText getCodegenText(String input) {
@@ -3397,6 +3201,7 @@ public String getFilename(CodegenKeyType type, String lastJsonPathFragment, Stri
             case SECURITY:
             case SECURITY_SCHEME:
             case REQUEST_BODY:
+            case RESPONSE:
                 return toModuleFilename(lastJsonPathFragment, jsonPath);
             default:
                 return null;
@@ -3571,15 +3376,16 @@ public CodegenSecurityScheme fromSecurityScheme(SecurityScheme securityScheme, S
         return cs;
     }
 
-    protected void setReservedWordsLowerCase(List<String> words) {
-        reservedWords = new HashSet<>();
+    protected static Set<String> getLowerCaseWords(List<String> words) {
+        Set<String> lowerCaseWords = new HashSet<>();
         for (String word : words) {
-            reservedWords.add(word.toLowerCase(Locale.ROOT));
+            lowerCaseWords.add(word.toLowerCase(Locale.ROOT));
         }
+        return lowerCaseWords;
     }
 
     protected boolean isReservedWord(String word) {
-        return word != null && reservedWords.contains(word.toLowerCase(Locale.ROOT));
+        return word != null && getGeneratorMetadata().getReservedWords().contains(word.toLowerCase(Locale.ROOT));
     }
 
     /**
@@ -3626,8 +3432,7 @@ protected String getOrGenerateOperationId(Operation operation, String path, Stri
      * @return true if the library/module/package of the corresponding type needs to be imported
      */
     protected boolean needToImport(String type) {
-        return StringUtils.isNotBlank(type) && !defaultIncludes.contains(type)
-                && !languageSpecificPrimitives.contains(type);
+        return true;
     }
 
     protected void addImports(Set<String> importsToBeAddedTo, Set<String> importsToAdd) {
@@ -3769,34 +3574,6 @@ protected LinkedHashMapWithContext<CodegenSchema> getOptionalProperties(LinkedHa
         return optionalProperties;
     }
 
-    /**
-     * Remove characters not suitable for variable or method name from the input and camel case it
-     *
-     * @param name string to be camel case
-     * @return camel case string
-     */
-    @SuppressWarnings("static-method")
-    public String removeNonNameElementToCamelCase(String name) {
-        return removeNonNameElementToCamelCase(name, "[-_:;#" + removeOperationIdPrefixDelimiter + "]");
-    }
-
-    /**
-     * Remove characters that is not good to be included in method name from the input and camel case it
-     *
-     * @param name                  string to be camel case
-     * @param nonNameElementPattern a regex pattern of the characters that is not good to be included in name
-     * @return camel case string
-     */
-    protected String removeNonNameElementToCamelCase(final String name, final String nonNameElementPattern) {
-        String result = Arrays.stream(name.split(nonNameElementPattern))
-                .map(StringUtils::capitalize)
-                .collect(Collectors.joining(""));
-        if (!result.isEmpty()) {
-            result = result.substring(0, 1).toLowerCase(Locale.ROOT) + result.substring(1);
-        }
-        return result;
-    }
-
     @Override
     public String modelPackagePathFragment() {
         return modelPackage.replace('.', File.separatorChar);
@@ -3813,10 +3590,9 @@ protected void updateComponentsFilepath(String[] pathPieces) {
         // rename schemas + requestBodies
         switch (pathPieces[2]) {
             case "schemas":
+                // #/components/schemas/SomeSchema
                 // modelPackage replaces pathPieces[1] + pathPieces[2]
-                String fragment = modelPackagePathFragment();
-                String[] fragments = fragment.split("/");
-                pathPieces[1] = fragments[0];
+                String[] fragments = modelPackage.split("\\.");
                 pathPieces[2] = fragments[1];
                 if (pathPieces.length == 4) {
                     // #/components/schemas/SomeSchema
@@ -3871,7 +3647,7 @@ protected void updateComponentsFilepath(String[] pathPieces) {
             }
         } else if (pathPieces[2].equals("responses")) {
             // #/components/responses/SuccessWithJsonApiResponse/headers
-            pathPieces[3] = toResponseModuleName(pathPieces[3], jsonPath);
+            pathPieces[3] = getFilename(CodegenKeyType.RESPONSE, pathPieces[3], jsonPath);
             if (pathPieces.length == 4) {
                 // #/components/responses/SuccessWithJsonApiResponse
                 return;
@@ -3999,11 +3775,11 @@ private void updatePathsFilepath(String[] pathPieces) {
         } else if (pathPieces[4].equals("responses")) {
             if (pathPieces.length == 5) {
                 // #/paths/user_login/get/responses -> length 5
-                pathPieces[4] = toResponseModuleName(pathPieces[4], jsonPath);
+                pathPieces[4] = getFilename(CodegenKeyType.RESPONSE, pathPieces[4], jsonPath);
                 return;
             }
             // #/paths/user_login/get/responses/200 -> 200 -> response_200 -> length 6
-            pathPieces[5] = toResponseModuleName(pathPieces[5], jsonPath);
+            pathPieces[5] = getFilename(CodegenKeyType.RESPONSE, pathPieces[5], jsonPath);
             if (pathPieces.length == 6) {
                 // #/paths/user_login/get/responses/200
                 return;
@@ -4123,7 +3899,7 @@ private void updateApisFilepath(String[] pathPieces) {
         originalPieces[0] = "#";
         String jsonPath = String.join("/", originalPieces);
 
-        pathPieces[1] = apiPackage.replace('.', File.separatorChar);
+        pathPieces[1] = generatorSettings.apiPackage.replace('.', File.separatorChar);
         if (pathPieces.length < 4) {
             return;
         }
@@ -4133,29 +3909,7 @@ private void updateApisFilepath(String[] pathPieces) {
             pathPieces[3] = getFilename(CodegenKeyType.PATH, ModelUtils.decodeSlashes(pathPieces[3]), jsonPath);
         }
     }
-
-    @Override
-    public String getFilepath(String jsonPath) {
-        String[] pathPieces = jsonPath.split("/");
-        pathPieces[0] = outputFolder + File.separatorChar + packagePath();
-        if (jsonPath.startsWith("#/components")) {
-            updateComponentsFilepath(pathPieces);
-        } else if (jsonPath.startsWith("#/paths")) {
-            updatePathsFilepath(pathPieces);
-        } else if (jsonPath.startsWith("#/servers")) {
-            updateServersFilepath(pathPieces);
-        } else if (jsonPath.startsWith("#/security")) {
-            updateSecurityFilepath(pathPieces);
-        } else if (jsonPath.startsWith("#/apis")) {
-            // this is a fake json path that the code generates and uses to generate apis
-            updateApisFilepath(pathPieces);
-        }
-        List<String> finalPathPieces = Arrays.stream(pathPieces)
-                .filter(Objects::nonNull)
-                .collect(Collectors.toList());
-        return String.join(File.separator, finalPathPieces);
-    }
-
+    
     @Override
     public String getSubpackage(String jsonPath) {
         String[] pathPieces = jsonPath.split("/");
@@ -4182,65 +3936,61 @@ public String getSubpackage(String jsonPath) {
         }
         return subpackage.substring(1,lastPeriodIndex);
     }
-    @Override
-    public String getTestFilepath(String jsonPath) {
-        String[] pathPieces = jsonPath.split("/");
-        pathPieces[0] = outputFolder + File.separatorChar + "test";
-        if (jsonPath.startsWith("#/components")) {
-            // #/components/schemas/someSchema
-            updateComponentsFilepath(pathPieces);
-            if (pathPieces.length == 4) {
-                int lastIndex = pathPieces.length - 1;
-                pathPieces[lastIndex] = "test_" + pathPieces[lastIndex];
-            }
-        } else if (jsonPath.startsWith("#/paths")) {
-            updatePathsFilepath(pathPieces);
-            // #/paths/somePath/get
-            if (pathPieces.length == 4) {
-                int lastIndex = pathPieces.length - 1;
-                pathPieces[lastIndex] = "test_" + pathPieces[lastIndex];
-            }
-        }
-        List<String> finalPathPieces = Arrays.stream(pathPieces)
-                .filter(Objects::nonNull)
-                .collect(Collectors.toList());
-        return String.join(File.separator, finalPathPieces);
-    }
-
 
     @Override
-    public String getDocsFilepath(String jsonPath) {
+    public String getFilePath(GeneratedFileType type, String jsonPath) {
         String[] pathPieces = jsonPath.split("/");
-        pathPieces[0] = outputFolder + File.separatorChar + docsFolder;
-        if (jsonPath.startsWith("#/components")) {
-            updateComponentsFilepath(pathPieces);
-        } else if (jsonPath.startsWith("#/paths")) {
-            updatePathsFilepath(pathPieces);
-        } else if (jsonPath.startsWith("#/servers")) {
-            updateServersFilepath(pathPieces);
-        } else if (jsonPath.startsWith("#/apis")) {
-            // this is a fake json path that the code generates and uses to generate apis
-            updateApisFilepath(pathPieces);
+        switch (type) {
+            case CODE:
+                pathPieces[0] = generatorSettings.outputFolder + File.separatorChar + packagePath();
+                if (jsonPath.startsWith("#/components")) {
+                    updateComponentsFilepath(pathPieces);
+                } else if (jsonPath.startsWith("#/paths")) {
+                    updatePathsFilepath(pathPieces);
+                } else if (jsonPath.startsWith("#/servers")) {
+                    updateServersFilepath(pathPieces);
+                } else if (jsonPath.startsWith("#/security")) {
+                    updateSecurityFilepath(pathPieces);
+                } else if (jsonPath.startsWith("#/apis")) {
+                    // this is a fake json path that the code generates and uses to generate apis
+                    updateApisFilepath(pathPieces);
+                }
+                break;
+            case DOCUMENTATION:
+                pathPieces[0] = generatorSettings.outputFolder + File.separatorChar + docsFolder;
+                if (jsonPath.startsWith("#/components")) {
+                    updateComponentsFilepath(pathPieces);
+                } else if (jsonPath.startsWith("#/paths")) {
+                    updatePathsFilepath(pathPieces);
+                } else if (jsonPath.startsWith("#/servers")) {
+                    updateServersFilepath(pathPieces);
+                } else if (jsonPath.startsWith("#/apis")) {
+                    // this is a fake json path that the code generates and uses to generate apis
+                    updateApisFilepath(pathPieces);
+                }
+                break;
+            case TEST:
+                pathPieces[0] = generatorSettings.outputFolder + File.separatorChar + "test";
+                if (jsonPath.startsWith("#/components")) {
+                    // #/components/schemas/someSchema
+                    updateComponentsFilepath(pathPieces);
+                    if (pathPieces.length == 4) {
+                        int lastIndex = pathPieces.length - 1;
+                        pathPieces[lastIndex] = "test_" + pathPieces[lastIndex];
+                    }
+                } else if (jsonPath.startsWith("#/paths")) {
+                    updatePathsFilepath(pathPieces);
+                    // #/paths/somePath/get
+                    if (pathPieces.length == 4) {
+                        int lastIndex = pathPieces.length - 1;
+                        pathPieces[lastIndex] = "test_" + pathPieces[lastIndex];
+                    }
+                }
         }
-        List<String> finalPathPieces = Arrays.stream(pathPieces)
-                .filter(Objects::nonNull)
-                .collect(Collectors.toList());
-        return String.join(File.separator, finalPathPieces);
-    }
-
-    @Override
-    public boolean isSkipOverwrite() {
-        return skipOverwrite;
-    }
-
-    @Override
-    public void setSkipOverwrite(boolean skipOverwrite) {
-        this.skipOverwrite = skipOverwrite;
-    }
-
-    @Override
-    public void setRemoveOperationIdPrefix(boolean removeOperationIdPrefix) {
-        this.removeOperationIdPrefix = removeOperationIdPrefix;
+        List<String> codePieces = Arrays.stream(pathPieces)
+            .filter(Objects::nonNull)
+            .collect(Collectors.toList());
+        return String.join(File.separator, codePieces);
     }
 
     public void setRemoveOperationIdPrefixDelimiter(String removeOperationIdPrefixDelimiter) {
@@ -4251,21 +4001,6 @@ public void setRemoveOperationIdPrefixCount(int removeOperationIdPrefixCount) {
         this.removeOperationIdPrefixCount = removeOperationIdPrefixCount;
     }
 
-    @Override
-    public void setSkipOperationExample(boolean skipOperationExample) {
-        this.skipOperationExample = skipOperationExample;
-    }
-
-    @Override
-    public boolean isHideGenerationTimestamp() {
-        return hideGenerationTimestamp;
-    }
-
-    @Override
-    public void setHideGenerationTimestamp(boolean hideGenerationTimestamp) {
-        this.hideGenerationTimestamp = hideGenerationTimestamp;
-    }
-
     /**
      * Set Documentation files extension
      *
@@ -4288,14 +4023,9 @@ public String sanitizeName(String name) {
         return sanitizeName(name, "\\W");
     }
 
-    @Override
-    public void setTemplateEngineName(String templateEngineName) {
-        this.templateEngineName = templateEngineName;
-    }
-
     @Override
     public TemplatingEngineAdapter getTemplatingEngine() {
-        String loadedTemplateEngineName = templateEngineName;
+        String loadedTemplateEngineName = generatorSettings.templateEngineName;
         if (loadedTemplateEngineName ==  null) {
             loadedTemplateEngineName = defaultTemplatingEngine();
         }
@@ -4396,7 +4126,7 @@ protected EnumInfo getEnumInfo(ArrayList<Object> values, Schema<?> schema, Strin
         LinkedHashMap<String, EnumValue> enumNameToValue = new LinkedHashMap<>();
         int truncateIdx = 0;
 
-        if (isRemoveEnumValuePrefix()) {
+        if (generatorSettings.removeEnumValuePrefix) {
             String commonPrefix = findCommonPrefixOfVars(values);
             truncateIdx = commonPrefix.length();
         }
@@ -4491,20 +4221,6 @@ protected EnumInfo getEnumInfo(ArrayList<Object> values, Schema<?> schema, Strin
         return new EnumInfo(enumValueToName, typeToValues, jsonPathPiece);
     }
 
-    /**
-     * reads propertyKey from additionalProperties, converts it to a boolean and
-     * writes it back to additionalProperties to be usable as a boolean in
-     * mustache files.
-     *
-     * @param propertyKey property key
-     * @return property value as boolean
-     */
-    public boolean convertPropertyToBooleanAndWriteBack(String propertyKey) {
-        boolean result = convertPropertyToBoolean(propertyKey);
-        writePropertyBack(propertyKey, result);
-        return result;
-    }
-
     /**
      * Provides an override location, if any is specified, for the .openapi-generator-ignore.
      * <p>
@@ -4517,34 +4233,7 @@ public String getIgnoreFilePathOverride() {
         return ignoreFilePathOverride;
     }
 
-    /**
-     * Sets an override location for the '.openapi-generator-ignore' location for the first code generation.
-     *
-     * @param ignoreFileOverride The full path to an ignore file
-     */
-    @Override
-    public void setIgnoreFilePathOverride(final String ignoreFileOverride) {
-        this.ignoreFilePathOverride = ignoreFileOverride;
-    }
-
-    public boolean convertPropertyToBoolean(String propertyKey) {
-        final Object booleanValue = additionalProperties.get(propertyKey);
-        boolean result = Boolean.FALSE;
-        if (booleanValue instanceof Boolean) {
-            result = (Boolean) booleanValue;
-        } else if (booleanValue instanceof String) {
-            result = Boolean.parseBoolean((String) booleanValue);
-        } else {
-            LOGGER.warn("The value (generator's option) must be either boolean or string. Default to `false`.");
-        }
-        return result;
-    }
-
-    public void writePropertyBack(String propertyKey, boolean value) {
-        additionalProperties.put(propertyKey, value);
-    }
-
-//    private List<Map<String, Object>> getScopes(Scopes scopes) {
+    //    private List<Map<String, Object>> getScopes(Scopes scopes) {
 //        if (scopes != null && !scopes.isEmpty()) {
 //            List<Map<String, Object>> newScopes = new ArrayList<>();
 //            for (Map.Entry<String, String> scopeEntry : scopes.entrySet()) {
@@ -4620,21 +4309,6 @@ public static Set<String> getProducesInfo(final OpenAPI openAPI, final Operation
         return produces;
     }
 
-    @Override
-    public GeneratorType getTag() {
-        return null;
-    }
-
-    @Override
-    public String getName() {
-        return null;
-    }
-
-    @Override
-    public String getHelp() {
-        return null;
-    }
-
     protected LinkedHashMap<CodegenKey, CodegenMediaType> getContent(Content content, String sourceJsonPath) {
         if (content == null) {
             return null;
@@ -4720,7 +4394,7 @@ protected String toRefModule(String ref, String sourceJsonPath, String expectedC
             case "requestBodies":
                 return getFilename(CodegenKeyType.REQUEST_BODY, refPieces[3], ref);
             case "responses":
-                return toResponseModuleName(refPieces[3], ref);
+                return getFilename(CodegenKeyType.RESPONSE, refPieces[3], ref);
             case "headers":
                 return getFilename(CodegenKeyType.HEADER, refPieces[3], ref);
             case "parameters":
@@ -4788,16 +4462,16 @@ private void setSchemaLocationInfo(String ref, String sourceJsonPath, String cur
     }
 
     protected String getModuleLocation(String ref) {
-        String filePath = getFilepath(ref);
-        String prefix = outputFolder + File.separatorChar + "src" + File.separatorChar;
+        String filePath = getFilePath(GeneratedFileType.CODE, ref);
+        String prefix = generatorSettings.outputFolder + File.separatorChar + "src" + File.separatorChar;
         String localFilepath = filePath.substring(prefix.length());
         return localFilepath.replaceAll(String.valueOf(File.separatorChar), ".");
     }
 
     @Override
     public String getRefModuleLocation(String ref) {
-        String filePath = getFilepath(ref);
-        String prefix = outputFolder + File.separatorChar + "src" + File.separatorChar;
+        String filePath = getFilePath(GeneratedFileType.CODE, ref);
+        String prefix = generatorSettings.outputFolder + File.separatorChar + "src" + File.separatorChar;
         int endIndex = filePath.lastIndexOf(File.separatorChar);
         String localFilepath = filePath.substring(prefix.length(), endIndex);
         return localFilepath.replaceAll(String.valueOf(File.separatorChar), ".");
@@ -4980,7 +4654,7 @@ public CodegenKey getKey(String key, String keyType, String sourceJsonPath) {
             case "responses":
                 usedKey = escapeUnsafeCharacters(key);
                 isValid = isValid(usedKey);
-                snakeCaseName = toResponseModuleName(usedKey, sourceJsonPath);
+                snakeCaseName = getFilename(CodegenKeyType.RESPONSE, usedKey, sourceJsonPath);
                 pascalCaseName = getPascalCase(CodegenKeyType.RESPONSE, usedKey, sourceJsonPath);
                 break;
             case "securitySchemes":
@@ -5325,85 +4999,6 @@ public void postProcessFile(File file, String fileType) {
         LOGGER.debug("Post processing file {} ({})", file, fileType);
     }
 
-    /**
-     * Boolean value indicating the state of the option for post-processing file using environment variables.
-     *
-     * @return true if the option is enabled
-     */
-    @Override
-    public boolean isEnablePostProcessFile() {
-        return enablePostProcessFile;
-    }
-
-    /**
-     * Set the boolean value indicating the state of the option for post-processing file using environment variables.
-     *
-     * @param enablePostProcessFile true to enable post-processing file
-     */
-    @Override
-    public void setEnablePostProcessFile(boolean enablePostProcessFile) {
-        this.enablePostProcessFile = enablePostProcessFile;
-    }
-
-    /**
-     * Get the boolean value indicating the state of the option for updating only changed files
-     */
-    @Override
-    public boolean isEnableMinimalUpdate() {
-        return enableMinimalUpdate;
-    }
-
-    /**
-     * Set the boolean value indicating the state of the option for updating only changed files
-     *
-     * @param enableMinimalUpdate true to enable minimal update
-     */
-    @Override
-    public void setEnableMinimalUpdate(boolean enableMinimalUpdate) {
-        this.enableMinimalUpdate = enableMinimalUpdate;
-    }
-
-    /**
-     * Sets the boolean valid indicating whether generation will work strictly against the specification, potentially making
-     * minor changes to the input document.
-     *
-     * @param strictSpecBehavior true if we will behave strictly, false to allow specification documents which pass validation to be loosely interpreted against the spec.
-     */
-    @Override
-    public void setStrictSpecBehavior(final boolean strictSpecBehavior) {
-        this.strictSpecBehavior = strictSpecBehavior;
-    }
-
-    @Override
-    public FeatureSet getFeatureSet() {
-        return this.generatorMetadata.getFeatureSet();
-    }
-
-    /**
-     * Get the boolean value indicating whether to remove enum value prefixes
-     */
-    @Override
-    public boolean isRemoveEnumValuePrefix() {
-        return this.removeEnumValuePrefix;
-    }
-
-    /**
-     * Set the boolean value indicating whether to remove enum value prefixes
-     *
-     * @param removeEnumValuePrefix true to enable enum value prefix removal
-     */
-    @Override
-    public void setRemoveEnumValuePrefix(final boolean removeEnumValuePrefix) {
-        this.removeEnumValuePrefix = removeEnumValuePrefix;
-    }
-
-    protected void modifyFeatureSet(Consumer<FeatureSet.Builder> processor) {
-        FeatureSet.Builder builder = getFeatureSet().modify();
-        processor.accept(builder);
-        this.generatorMetadata = GeneratorMetadata.newBuilder(generatorMetadata)
-                .featureSet(builder.build()).build();
-    }
-
     /**
      * A map entry for cached sanitized names.
      */
@@ -5476,16 +5071,6 @@ public String defaultTemplatingEngine() {
         return "mustache";
     }
 
-    @Override
-    public GeneratorLanguage generatorLanguage() {
-        return GeneratorLanguage.JAVA;
-    }
-
-    @Override
-    public String generatorLanguageVersion() {
-        return null;
-    }
-
     /**
      * Used to ensure that null or Schema is returned given an input Boolean/Schema/null
      * This will be used in openapi 3.1.0 spec processing to ensure that Booleans become Schemas
diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java b/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java
index d22b0d65fc8..c30a963da8e 100644
--- a/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java
+++ b/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java
@@ -17,88 +17,44 @@
 
 package org.openapijsonschematools.codegen.generators;
 
-import com.samskivert.mustache.Mustache.Compiler;
 import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.Operation;
-import io.swagger.v3.oas.models.PathItem;
-import io.swagger.v3.oas.models.Paths;
-import io.swagger.v3.oas.models.headers.Header;
-import io.swagger.v3.oas.models.media.Schema;
-import io.swagger.v3.oas.models.parameters.Parameter;
-import io.swagger.v3.oas.models.parameters.RequestBody;
-import io.swagger.v3.oas.models.responses.ApiResponse;
-import io.swagger.v3.oas.models.security.SecurityRequirement;
-import io.swagger.v3.oas.models.security.SecurityScheme;
-import io.swagger.v3.oas.models.servers.Server;
-import io.swagger.v3.oas.models.servers.ServerVariable;
-import org.apache.commons.lang3.tuple.Pair;
 import org.openapijsonschematools.codegen.common.CodegenConstants;
 import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorLanguage;
 import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorType;
+import org.openapijsonschematools.codegen.generators.models.CodeGeneratorSettings;
 import org.openapijsonschematools.codegen.generators.models.VendorExtension;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenKeyType;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenRefInfo;
-import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityRequirementObject;
-import org.openapijsonschematools.codegen.generators.openapimodels.CodegenList;
-import org.openapijsonschematools.codegen.generators.openapimodels.CodegenServer;
+import org.openapijsonschematools.codegen.generators.models.GeneratedFileType;
+import org.openapijsonschematools.codegen.generators.models.ReportFileType;
 import org.openapijsonschematools.codegen.templating.SupportingFile;
 import org.openapijsonschematools.codegen.generators.models.CliOption;
-import org.openapijsonschematools.codegen.generators.openapimodels.CodegenHeader;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenKey;
-import org.openapijsonschematools.codegen.generators.openapimodels.CodegenOperation;
-import org.openapijsonschematools.codegen.generators.openapimodels.CodegenParameter;
-import org.openapijsonschematools.codegen.generators.openapimodels.CodegenPathItem;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenPatternInfo;
-import org.openapijsonschematools.codegen.generators.openapimodels.CodegenRequestBody;
-import org.openapijsonschematools.codegen.generators.openapimodels.CodegenResponse;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema;
-import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityRequirementValue;
-import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityScheme;
 import org.openapijsonschematools.codegen.templating.TemplatingEngineAdapter;
 import org.openapijsonschematools.codegen.generators.generatormetadata.FeatureSet;
 import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorMetadata;
-import org.openapijsonschematools.codegen.generators.openapimodels.CodegenTag;
 
 import javax.validation.constraints.NotNull;
 import java.io.File;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.function.Function;
 
-public interface Generator {
-    String getFilesMetadataFilename();
-
-    String getVersionMetadataFilename();
+public interface Generator extends OpenApiProcessor, Comparable<Generator> {
+    String getReportFilename(ReportFileType type);
 
     GeneratorMetadata getGeneratorMetadata();
 
-    GeneratorType getTag();
-
-    String getName();
-
-    String getHelp();
-
     Map<String, Object> additionalProperties();
 
     Map<String, Object> vendorExtensions();
 
-    String apiPackage();
-
-    String outputFolder();
-
-    String templateDir();
-
-    String embeddedTemplateDir();
-
-    String modelPackage();
-
-    String modelPackagePathFragment();
-
-    String packageName();
+    CodeGeneratorSettings generatorSettings();
 
     String toApiName(String name);
 
@@ -106,95 +62,100 @@ public interface Generator {
 
     String toModelName(String name, String jsonPath);
 
-    @Deprecated
-    default String getSchemaFilename(String jsonPath) {
-        String[] pathPieces = jsonPath.split("/");
-        return getFilename(CodegenKeyType.SCHEMA, pathPieces[pathPieces.length-1], jsonPath);
-    }
-
-    @Deprecated
-    default String getSchemaPascalCaseName(String name, @NotNull String sourceJsonPath) {
-        return getPascalCase(CodegenKeyType.SCHEMA, name, sourceJsonPath);
-    }
-    Set<String> getImports(String sourceJsonPath, CodegenSchema schema, FeatureSet featureSet);
-    @Deprecated
-    default String toContentTypeFilename(String name) {
-        return getFilename(CodegenKeyType.CONTENT_TYPE, name, null);
-    }
-
-    String toParamName(String name);
-
     String escapeText(String text);
 
-    String escapeTextWhileAllowingNewLines(String text);
-
     String escapeUnsafeCharacters(String input);
 
     String escapeReservedWord(String name);
 
     String escapeQuotationMark(String input);
 
+    // todo remove this and move it into the generator constructor
     void processOpts();
 
     List<CliOption> cliOptions();
 
-    Set<String> reservedWords();
-
     List<SupportingFile> supportingFiles();
 
-    String getInputSpec();
-
-    void setInputSpec(String inputSpec);
+    CodegenKey getKey(String key, String keyType);
 
-    String getOutputDir();
+    HashMap<CodegenConstants.JSON_PATH_LOCATION_TYPE, HashMap<String, String>> getJsonPathTemplateFiles(GeneratedFileType type);
 
-    String packagePath();
+    // todo remove this and move it into the generator constructor
+    void preprocessOpenAPI(OpenAPI openAPI);
 
-    void setOutputDir(String dir);
+    // todo remove this and move it into the generator constructor
+    void processOpenAPI(OpenAPI openAPI);
 
-    CodegenSchema fromSchema(Schema<?> schema, String sourceJsonPath, String currentJsonPath);
+    String toApiFilename(String name);
 
-    CodegenTag fromTag(String name, String description);
+    String toModelFilename(String name, String jsonPath);
 
-    CodegenList<CodegenSecurityRequirementObject> fromSecurity(List<SecurityRequirement> security, String jsonPath);
+    String toModuleFilename(String name, String jsonPath);
 
-    CodegenOperation fromOperation(Operation operation, String jsonPath, LinkedHashMap<Pair<String, String>, CodegenParameter> pathItemParameters, CodegenList<CodegenServer> rootOrPathServers, CodegenList<CodegenSecurityRequirementObject> rootSecurity);
+    TreeMap<String, CodegenSchema> updateAllModels(TreeMap<String, CodegenSchema> models);
 
-    CodegenKey getKey(String key, String keyType);
+    TreeMap<String, CodegenSchema> postProcessAllModels(TreeMap<String, CodegenSchema> schemas);
 
-    CodegenSecurityScheme fromSecurityScheme(SecurityScheme securityScheme, String jsonPath);
+    Map<String, Object> postProcessSupportingFileData(Map<String, Object> data);
 
-    HashMap<String, CodegenSecurityRequirementValue> fromSecurityRequirement(SecurityRequirement securityScheme, String jsonPath);
+    void postProcessModelProperty(CodegenSchema model, CodegenSchema property);
+    
+    String getImport(CodegenRefInfo<?> refInfo);
+    String getRefModuleLocation(String ref);
+    String getSubpackage(String jsonPath);
 
-    TreeMap<CodegenKey, CodegenPathItem> fromPaths(Paths paths, CodegenList<CodegenServer> rootServers, CodegenList<CodegenSecurityRequirementObject> rootSecurity);
+    String getFilePath(GeneratedFileType type, String jsonPath);
 
-    CodegenPathItem fromPathItem(PathItem pathItem, String jsonPath, CodegenList<CodegenServer> rootServers, CodegenList<CodegenSecurityRequirementObject> rootSecurity);
+    void setDocExtension(String docExtension);
 
-    CodegenList<CodegenServer> fromServers(List<Server> servers, String jsonPath);
+    String sanitizeName(String name);
 
-    CodegenSchema fromServerVariables(Map<String, ServerVariable> variables, String jsonPath);
+    void postProcessFile(File file, String fileType);
 
-    Map<String, String> instantiationTypes();
+    /**
+     * Set the OpenAPI instance. This method needs to be called right after the instantiation of the Codegen class.
+     *
+     * @param openAPI specification being generated
+     */
+    void setOpenAPI(OpenAPI openAPI);
 
-    HashMap<CodegenConstants.JSON_PATH_LOCATION_TYPE, HashMap<String, String>> jsonPathTemplateFiles();
+    TemplatingEngineAdapter getTemplatingEngine();
 
-    HashMap<CodegenConstants.JSON_PATH_LOCATION_TYPE, HashMap<String, String>> jsonPathDocTemplateFiles();
+    CodegenPatternInfo getPatternInfo(String pattern);
 
-    HashMap<CodegenConstants.JSON_PATH_LOCATION_TYPE, HashMap<String, String>> jsonPathTestTemplateFiles();
+    String defaultTemplatingEngine();
 
-    Set<String> languageSpecificPrimitives();
+    List<VendorExtension> getSupportedVendorExtensions();
 
-    void preprocessOpenAPI(OpenAPI openAPI);
+    String toRefClass(String ref, String sourceJsonPath, String expectedComponentType);
+    Function<CodegenSchema, List<CodegenSchema>> getSchemasFn();
 
-    void processOpenAPI(OpenAPI openAPI);
+    boolean generateSeparateServerSchemas();
+    boolean shouldGenerateFile(String jsonPath, boolean isDoc);
 
-    Compiler processCompiler(Compiler compiler);
+    String getPascalCase(CodegenKeyType type, String lastJsonPathFragment, String jsonPath);
+    String getFilename(CodegenKeyType type, String lastJsonPathFragment, String jsonPath);
+    Set<String> getImports(String sourceJsonPath, CodegenSchema schema, FeatureSet featureSet);
 
-    String toApiFilename(String name);
+    default int compareTo(Generator o) {
+        return getGeneratorMetadata().getName().compareTo(o.getGeneratorMetadata().getName());
+    }
 
-    String toModelFilename(String name, String jsonPath);
+    @Deprecated
+    default String getSchemaFilename(String jsonPath) {
+        String[] pathPieces = jsonPath.split("/");
+        return getFilename(CodegenKeyType.SCHEMA, pathPieces[pathPieces.length-1], jsonPath);
+    }
 
-    String toModuleFilename(String name, String jsonPath);
+    @Deprecated
+    default String getSchemaPascalCaseName(String name, @NotNull String sourceJsonPath) {
+        return getPascalCase(CodegenKeyType.SCHEMA, name, sourceJsonPath);
+    }
+    @Deprecated
+    default String toContentTypeFilename(String name) {
+        return getFilename(CodegenKeyType.CONTENT_TYPE, name, null);
+    }
 
     @Deprecated
     default String toRequestBodyFilename(String componentName, String jsonPath) {
@@ -240,109 +201,167 @@ default String toSecurityFilename(String baseName, String jsonPath) {
     default String getPascalCaseServer(String basename, String jsonPath) {
         return getPascalCase(CodegenKeyType.SERVER, basename, jsonPath);
     }
-    String toModelImport(String refClass);
-
-    TreeMap<String, CodegenSchema> updateAllModels(TreeMap<String, CodegenSchema> models);
-
-    void postProcess();
-
-    TreeMap<String, CodegenSchema> postProcessAllModels(TreeMap<String, CodegenSchema> schemas);
-
-    TreeMap<String, CodegenSchema> postProcessModels(TreeMap<String, CodegenSchema> models);
-
-    Map<String, Object> postProcessSupportingFileData(Map<String, Object> data);
-
-    void postProcessModelProperty(CodegenSchema model, CodegenSchema property);
-
-    // handles almost all files to be written
-    String getFilepath(String jsonPath);
-
-    String getImport(CodegenRefInfo<?> refInfo);
-    String getRefModuleLocation(String ref);
-    String getSubpackage(String jsonPath);
 
-    String getDocsFilepath(String jsonPath);
-
-    String getTestFilepath(String jsonPath);
-
-    boolean isSkipOverwrite();
-
-    void setSkipOverwrite(boolean skipOverwrite);
+    @Deprecated
+    default String getFilesMetadataFilename() {
+        return getReportFilename(ReportFileType.FILES);
+    }
 
-    void setRemoveOperationIdPrefix(boolean removeOperationIdPrefix);
+    @Deprecated
+    default String getVersionMetadataFilename() {
+        return getReportFilename(ReportFileType.VERSION);
+    }
 
-    void setSkipOperationExample(boolean skipOperationExample);
+    @Deprecated
+    default String getName() {
+        return getGeneratorMetadata().getName();
+    }
 
-    boolean isHideGenerationTimestamp();
+    @Deprecated
+    default GeneratorType getTag() {
+        return getGeneratorMetadata().getType();
+    }
 
-    void setHideGenerationTimestamp(boolean hideGenerationTimestamp);
+    @Deprecated
+    default GeneratorLanguage generatorLanguage() {
+        return getGeneratorMetadata().getLanguage();
+    }
 
-    void setDocExtension(String docExtension);
+    @Deprecated
+    default String generatorLanguageVersion() {
+        return getGeneratorMetadata().getLanguageVersion();
+    }
 
-    void setIgnoreFilePathOverride(String ignoreFileOverride);
+    @Deprecated
+    default String getHelp() {
+        return getGeneratorMetadata().getHelpMsg();
+    }
 
-    String getIgnoreFilePathOverride();
+    @Deprecated
+    String toParamName(String name);
 
-    String sanitizeName(String name);
+    @Deprecated
+    default FeatureSet getFeatureSet() {
+        return getGeneratorMetadata().getFeatureSet();
+    }
 
-    void postProcessFile(File file, String fileType);
+    @Deprecated
+    default HashMap<CodegenConstants.JSON_PATH_LOCATION_TYPE, HashMap<String, String>> jsonPathTemplateFiles() {
+        return getJsonPathTemplateFiles(GeneratedFileType.CODE);
+    }
 
-    boolean isEnablePostProcessFile();
+    @Deprecated
+    default HashMap<CodegenConstants.JSON_PATH_LOCATION_TYPE, HashMap<String, String>> jsonPathDocTemplateFiles() {
+        return getJsonPathTemplateFiles(GeneratedFileType.DOCUMENTATION);
+    }
 
-    void setEnablePostProcessFile(boolean isEnablePostProcessFile);
+    @Deprecated
+    default HashMap<CodegenConstants.JSON_PATH_LOCATION_TYPE, HashMap<String, String>> jsonPathTestTemplateFiles() {
+        return getJsonPathTemplateFiles(GeneratedFileType.TEST);
+    }
 
-    /**
-     * Set the OpenAPI instance. This method needs to be called right after the instantiation of the Codegen class.
-     *
-     * @param openAPI specification being generated
-     */
-    void setOpenAPI(OpenAPI openAPI);
+    @Deprecated
+    default String getFilepath(String jsonPath) {
+        return getFilePath(GeneratedFileType.CODE, jsonPath);
+    }
 
-    void setTemplateEngineName(String name);
+    @Deprecated
+    default String getDocsFilepath(String jsonPath) {
+        return getFilePath(GeneratedFileType.DOCUMENTATION, jsonPath);
+    }
 
-    TemplatingEngineAdapter getTemplatingEngine();
+    @Deprecated
+    default String getTestFilePath(String jsonPath) {
+        return getFilePath(GeneratedFileType.TEST, jsonPath);
+    }
 
-    boolean isEnableMinimalUpdate();
+    @Deprecated
+    String toModelImport(String refClass);
 
-    void setEnableMinimalUpdate(boolean isEnableMinimalUpdate);
+    @Deprecated
+    String modelPackage();
 
-    void setStrictSpecBehavior(boolean strictSpecBehavior);
+    @Deprecated
+    String modelPackagePathFragment();
 
-    FeatureSet getFeatureSet();
+    @Deprecated
+    default String apiPackage() {
+        return generatorSettings().apiPackage;
+    }
 
-    CodegenPatternInfo getPatternInfo(String pattern);
+    @Deprecated
+    default String outputFolder() {
+        return generatorSettings().outputFolder;
+    }
 
-    boolean isRemoveEnumValuePrefix();
+    @Deprecated
+    default String getOutputDir() {
+        return outputFolder();
+    }
 
-    void setRemoveEnumValuePrefix(boolean removeEnumValuePrefix);
+    @Deprecated
+    default String templateDir() {
+        return generatorSettings().templateDir;
+    }
 
-    String defaultTemplatingEngine();
+    @Deprecated
+    default String embeddedTemplateDir() {
+        return generatorSettings().templateDir;
+    }
 
-    GeneratorLanguage generatorLanguage();
+    @Deprecated
+    default String packageName() {
+        return generatorSettings().packageName;
+    }
 
-    /*
-    the version of the language that the generator implements
-    For python 3.9.0, generatorLanguageVersion would be "3.9.0"
-    */
-    String generatorLanguageVersion();
+    @Deprecated
+    default boolean isEnableMinimalUpdate() {
+        return generatorSettings().enableMinimalUpdate;
+    }
 
-    List<VendorExtension> getSupportedVendorExtensions();
+    @Deprecated
+    default boolean isSkipOverwrite() {
+        return generatorSettings().skipOverwrite;
+    }
 
-    String toRefClass(String ref, String sourceJsonPath, String expectedComponentType);
+    @Deprecated
+    default String getIgnoreFilePathOverride() {
+        return generatorSettings().ignoreFilePathOverride;
+    }
 
-    CodegenRequestBody fromRequestBody(RequestBody body, String sourceJsonPath);
+    @Deprecated
+    default boolean isEnablePostProcessFile() {
+        return generatorSettings().enablePostProcessFile;
+    }
 
-    CodegenResponse fromResponse(ApiResponse response, String sourceJsonPath);
+    @Deprecated
+    default String getInputSpec() {
+        return generatorSettings().inputSpecLocation;
+    }
 
-    CodegenHeader fromHeader(Header parameter, String sourceJsonPath);
+    @Deprecated
+    default boolean isRemoveEnumValuePrefix() {
+        return generatorSettings().removeEnumValuePrefix;
+    }
 
-    CodegenParameter fromParameter(Parameter parameter, String sourceJsonPath);
+    @Deprecated
+    default Set<String> reservedWords() {
+        return getGeneratorMetadata().getReservedWords();
+    }
 
-    Function<CodegenSchema, List<CodegenSchema>> getSchemasFn();
+    @Deprecated
+    default Map<String, String> instantiationTypes() {
+        return getGeneratorMetadata().getInstantiationTypes();
+    }
 
-    boolean generateSeparateServerSchemas();
-    boolean shouldGenerateFile(String jsonPath, boolean isDoc);
+    @Deprecated
+    default Set<String> languageSpecificPrimitives() {
+        return getGeneratorMetadata().getLanguageSpecificPrimitives();
+    }
 
-    String getPascalCase(CodegenKeyType type, String lastJsonPathFragment, String jsonPath);
-    String getFilename(CodegenKeyType type, String lastJsonPathFragment, String jsonPath);
+    @Deprecated
+    default boolean isHideGenerationTimestamp() {
+        return generatorSettings().hideGenerationTimestamp;
+    }
+    // 93 - 45 -> 48
 }
diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java
index 05f7fd7e5e5..23de6836528 100644
--- a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java
+++ b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java
@@ -29,15 +29,21 @@
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.openapijsonschematools.codegen.common.ModelUtils;
+import org.openapijsonschematools.codegen.config.GeneratorSettings;
+import org.openapijsonschematools.codegen.config.WorkflowSettings;
 import org.openapijsonschematools.codegen.generators.generatormetadata.FeatureSet;
+import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorLanguage;
+import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorMetadata;
 import org.openapijsonschematools.codegen.generators.generatormetadata.Stability;
 import org.openapijsonschematools.codegen.generators.generatormetadata.features.ComponentsFeature;
+import org.openapijsonschematools.codegen.generators.generatormetadata.features.DataTypeFeature;
 import org.openapijsonschematools.codegen.generators.generatormetadata.features.GlobalFeature;
 import org.openapijsonschematools.codegen.generators.generatormetadata.features.OperationFeature;
 import org.openapijsonschematools.codegen.generators.generatormetadata.features.SchemaFeature;
 import org.openapijsonschematools.codegen.common.CodegenConstants;
 import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorType;
 import org.openapijsonschematools.codegen.generators.generatormetadata.features.SecurityFeature;
+import org.openapijsonschematools.codegen.generators.generatormetadata.features.WireFormatFeature;
 import org.openapijsonschematools.codegen.generators.models.CliOption;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenHeader;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenKey;
@@ -54,6 +60,7 @@
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenServer;
 import org.openapijsonschematools.codegen.generators.openapimodels.EnumInfo;
 import org.openapijsonschematools.codegen.generators.openapimodels.EnumValue;
+import org.openapijsonschematools.codegen.generators.models.GeneratedFileType;
 import org.openapijsonschematools.codegen.generators.openapimodels.MapBuilder;
 import org.openapijsonschematools.codegen.generators.openapimodels.OperationInput;
 import org.openapijsonschematools.codegen.generators.openapimodels.OperationInputProvider;
@@ -79,129 +86,24 @@
 import static org.openapijsonschematools.codegen.common.StringUtils.escape;
 
 public class JavaClientGenerator extends DefaultGenerator implements Generator {
-
-    private final Logger LOGGER = LoggerFactory.getLogger(JavaClientGenerator.class);
-
-    protected String authFolder;
-    protected HashMap<String, String> schemaJsonPathToModelName = new HashMap<>();
-
-    private static final String ARTIFACT_VERSION_DEFAULT_VALUE = "1.0.0";
-
-    public static final String TEST_OUTPUT = "testOutput";
-    public static final String DEFAULT_TEST_FOLDER = "${project.build.directory}/generated-test-sources/openapi";
-
-    protected String invokerPackage = "org.openapijsonschematools";
-    protected String groupId = "org.openapijsonschematools";
-    protected String artifactId = "openapi-java";
-    protected String artifactVersion = null;
-    protected String artifactUrl = "https://github.com/openapi-json-schema-tools/openapi-json-schema-generator";
-    protected String artifactDescription = "OpenAPI Java";
-    protected String developerName = "OpenAPI-Generator Contributors";
-    protected String developerEmail = "team@openapijsonschematools.org";
-    protected String developerOrganization = "OpenAPITools.org";
-    protected String developerOrganizationUrl = "http://openapijsonschematools.org";
-    protected String scmConnection = "scm:git:git@github.com:openapi-json-schema-tools/openapi-json-schema-generator.git";
-    protected String scmDeveloperConnection = "scm:git:git@github.com:openapi-json-schema-tools/openapi-json-schema-generator.git";
-    protected String scmUrl = "https://github.com/openapi-json-schema-tools/openapi-json-schema-generator";
-    protected String licenseName = "Unlicense";
-    protected String licenseUrl = "http://unlicense.org";
-    protected String projectFolder = "src/main";
-    // this must not be OS-specific
-    protected String sourceFolder = projectFolder + "/java";
-    protected String apiDocPath = "docs/";
-    protected String modelDocPath = "docs/";
-    protected String parentGroupId = "";
-    protected String parentArtifactId = "";
-    protected String parentVersion = "";
-    protected String outputTestFolder = "";
-    private final Map<String, String> schemaKeyToModelNameCache = new HashMap<>();
-
-    protected Stability getStability() {
-        return Stability.STABLE;
-    }
-
-    @Override
-    public String toModuleFilename(String name, String jsonPath) {
-        String usedName = sanitizeName(name, "[^a-zA-Z0-9]+");
-        // todo check if empty and if so them use enum name
-        // todo fix this, this does not handle names starting with numbers
-        usedName = usedName.toLowerCase(Locale.ROOT);
-        if (usedName.isEmpty()) {
-            usedName = toEnumVarName(name, null).toLowerCase(Locale.ROOT);
-        }
-        return usedName;
-    }
-
-    protected void updateServersFilepath(String[] pathPieces) {
-        String[] copiedPathPieces = pathPieces.clone();
-        copiedPathPieces[0] = "#";
-        String jsonPath = String.join("/", copiedPathPieces);
-        if (pathPieces.length == 2) {
-            // #/servers
-            pathPieces[1] = "RootServerInfo";
-        } else if (pathPieces.length == 3) {
-            // #/servers/0
-            pathPieces[2] = getFilename(CodegenKeyType.SERVER, pathPieces[2], jsonPath);
-        } else {
-            // #/servers/0/variables
-            pathPieces[2] = getFilename(CodegenKeyType.SERVER, pathPieces[2], jsonPath).toLowerCase(Locale.ROOT);
-            pathPieces[3] = getFilename(CodegenKeyType.SCHEMA, pathPieces[pathPieces.length-1], jsonPath);
+    public JavaClientGenerator(GeneratorSettings generatorSettings, WorkflowSettings workflowSettings) {
+        super(
+            generatorSettings,
+            workflowSettings,
+            "java",
+            "org.openapijsonschematools.client",
+            "openapi-java-client",
+            "generated-code" + File.separator + "java"
+        );
+        if (this.outputTestFolder.isEmpty()) {
+            setOutputTestFolder(this.generatorSettings.outputFolder);
         }
-    }
-
-    @Override
-    public String generatorLanguageVersion() {
-        return "17";
-    }
-
-    public JavaClientGenerator() {
-        super();
         headersSchemaFragment = "HeadersSchema";
-
         supportsInheritance = true;
 
-        hideGenerationTimestamp = false;
-
-        setReservedWordsLowerCase(
-                Arrays.asList(
-                        // used as internal variables, can collide with parameter names
-                        "localVarPath", "localVarQueryParams", "localVarCollectionQueryParams",
-                        "localVarHeaderParams", "localVarCookieParams", "localVarFormParams", "localVarPostBody",
-                        "localVarAccepts", "localVarAccept", "localVarContentTypes",
-                        "localVarContentType", "localVarAuthNames", "localReturnType",
-                        "ApiClient", "ApiException", "ApiResponse", "Configuration", "StringUtil",
-
-                        // language reserved words
-                        "abstract", "continue", "for", "new", "switch", "assert",
-                        "default", "if", "package", "synchronized", "boolean", "do", "goto", "private",
-                        "this", "break", "double", "implements", "protected", "throw", "byte", "else",
-                        "import", "public", "throws", "case", "enum", "instanceof", "return", "transient",
-                        "catch", "extends", "int", "short", "try", "char", "final", "interface", "static",
-                        "void", "class", "finally", "long", "strictfp", "volatile", "const", "float",
-                        "native", "super", "while", "null",
-                        // additional types
-                        "localdate", "zoneddatetime", "list", "map", "linkedhashset", "void", "string", "uuid", "number", "integer", "toString"
-                )
-        );
 
-        languageSpecificPrimitives = Sets.newHashSet("String",
-                "boolean",
-                "Boolean",
-                "Double",
-                "Integer",
-                "Long",
-                "Float",
-                "Object",
-                "byte[]"
-        );
-        typeMapping.put("date", "Date");
-        typeMapping.put("file", "File");
-        typeMapping.put("AnyType", "Object");
-
-        cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC));
         cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, CodegenConstants.INVOKER_PACKAGE_DESC).defaultValue(this.getInvokerPackage()));
         cliOptions.add(new CliOption(CodegenConstants.GROUP_ID, CodegenConstants.GROUP_ID_DESC).defaultValue(this.getGroupId()));
-        cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_ID, CodegenConstants.ARTIFACT_ID_DESC).defaultValue(this.getArtifactId()));
         cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_VERSION, CodegenConstants.ARTIFACT_VERSION_DESC).defaultValue(ARTIFACT_VERSION_DEFAULT_VALUE));
         cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_URL, CodegenConstants.ARTIFACT_URL_DESC).defaultValue(this.getArtifactUrl()));
         cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_DESCRIPTION, CodegenConstants.ARTIFACT_DESCRIPTION_DESC).defaultValue(this.getArtifactDescription()));
@@ -215,7 +117,6 @@ public JavaClientGenerator() {
         cliOptions.add(new CliOption(CodegenConstants.LICENSE_NAME, CodegenConstants.LICENSE_NAME_DESC).defaultValue(this.getLicenseName()));
         cliOptions.add(new CliOption(CodegenConstants.LICENSE_URL, CodegenConstants.LICENSE_URL_DESC).defaultValue(this.getLicenseUrl()));
         cliOptions.add(new CliOption(CodegenConstants.SOURCE_FOLDER, CodegenConstants.SOURCE_FOLDER_DESC).defaultValue(this.getSourceFolder()));
-        cliOptions.add(CliOption.newBoolean(CodegenConstants.HIDE_GENERATION_TIMESTAMP, CodegenConstants.HIDE_GENERATION_TIMESTAMP_DESC, this.isHideGenerationTimestamp()));
 
         cliOptions.add(CliOption.newString(CodegenConstants.PARENT_GROUP_ID, CodegenConstants.PARENT_GROUP_ID_DESC));
         cliOptions.add(CliOption.newString(CodegenConstants.PARENT_ARTIFACT_ID, CodegenConstants.PARENT_ARTIFACT_ID_DESC));
@@ -231,142 +132,179 @@ public JavaClientGenerator() {
         requestBodiesIdentifier = "requestbodies";
         securitySchemesIdentifier = "securityschemes";
         requestBodyIdentifier = "requestbody";
-        packageName = "org.openapijsonschematools.client";
         addSchemaImportsFromV3SpecLocations = true;
         deepestRefSchemaImportNeeded = true;
         objectIOClassNamePiece = "Map";
         arrayIOClassNamePiece = "List";
         arrayObjectInputClassNameSuffix = "Builder";
 
-        // this tells users what openapi types turn in to
-        instantiationTypes.put("object", "FrozenMap");
-        instantiationTypes.put("array", "FrozenList");
-        instantiationTypes.put("string", "String");
-        instantiationTypes.put("number", "Number (int, long, float, double)");
-        instantiationTypes.put("integer", "Number (int, long, float with integer values, double with integer values)");
-        instantiationTypes.put("boolean", "boolean");
-        instantiationTypes.put("null", "Void (null)");
-
-        modifyFeatureSet(features -> features
-            .includeDocumentationFeatures(
-                DocumentationFeature.Readme,
-                DocumentationFeature.Servers,
-                DocumentationFeature.Security,
-                DocumentationFeature.ComponentSchemas,
-                DocumentationFeature.ComponentSecuritySchemes,
-                DocumentationFeature.ComponentRequestBodies,
-                DocumentationFeature.ComponentResponses,
-                DocumentationFeature.ComponentHeaders,
-                DocumentationFeature.ComponentParameters,
-                DocumentationFeature.Api
-            )
-            .includeGlobalFeatures(
-                GlobalFeature.Components,
-                GlobalFeature.Servers,
-                GlobalFeature.Security,
-                GlobalFeature.Paths
-            )
-            .includeComponentsFeatures(
-                ComponentsFeature.schemas,
-                ComponentsFeature.securitySchemes,
-                ComponentsFeature.requestBodies,
-                ComponentsFeature.responses,
-                ComponentsFeature.headers,
-                ComponentsFeature.parameters
-            )
-            .includeSecurityFeatures(
-                SecurityFeature.ApiKey,
-                SecurityFeature.HTTP_Basic,
-                SecurityFeature.HTTP_Bearer
-            )
-            .includeOperationFeatures(
-                OperationFeature.Security,
-                OperationFeature.Servers,
-                OperationFeature.Responses_Default,
-                OperationFeature.Responses_HttpStatusCode,
-                OperationFeature.Responses_RangedResponseCodes,
-                OperationFeature.Responses_RedirectionResponse
-            )
-            .includeSchemaFeatures(
-                SchemaFeature.AdditionalProperties,
-                SchemaFeature.AllOf,
-                SchemaFeature.AnyOf,
-                SchemaFeature.Const,
-                SchemaFeature.Contains,
-                SchemaFeature.Default,
-                SchemaFeature.DependentRequired,
-                SchemaFeature.DependentSchemas,
-                // SchemaFeature.Discriminator,
-                SchemaFeature.Else,
-                SchemaFeature.Enum,
-                SchemaFeature.ExclusiveMaximum,
-                SchemaFeature.ExclusiveMinimum,
-                SchemaFeature.Format,
-                SchemaFeature.If,
-                SchemaFeature.Items,
-                SchemaFeature.MaxContains,
-                SchemaFeature.MaxItems,
-                SchemaFeature.MaxLength,
-                SchemaFeature.MaxProperties,
-                SchemaFeature.Maximum,
-                SchemaFeature.MinContains,
-                SchemaFeature.MinItems,
-                SchemaFeature.MinLength,
-                SchemaFeature.MinProperties,
-                SchemaFeature.Minimum,
-                SchemaFeature.MultipleOf,
-                SchemaFeature.Not,
-                SchemaFeature.Nullable,
-                SchemaFeature.OneOf,
-                SchemaFeature.Pattern,
-                SchemaFeature.PatternProperties,
-                SchemaFeature.PrefixItems,
-                SchemaFeature.Properties,
-                SchemaFeature.PropertyNames,
-                SchemaFeature.Ref,
-                SchemaFeature.Required,
-                SchemaFeature.Then,
-                SchemaFeature.Type,
-                SchemaFeature.UnevaluatedItems,
-                SchemaFeature.UnevaluatedProperties,
-                SchemaFeature.UniqueItems
-            )
-        );
-
-        outputFolder = "generated-code" + File.separator + "java";
-        embeddedTemplateDir = templateDir = "java";
         invokerPackage = "org.openapijsonschematools.client";
-        artifactId = "openapi-java-client";
-        apiPackage = "apis";
         modelPackage = "components.schemas";
 
         // cliOptions default redefinition need to be updated
         updateOption(CodegenConstants.INVOKER_PACKAGE, this.getInvokerPackage());
-        updateOption(CodegenConstants.ARTIFACT_ID, this.getArtifactId());
-        updateOption(CodegenConstants.API_PACKAGE, apiPackage);
 
         jsonPathTestTemplateFiles.put(
-                CodegenConstants.JSON_PATH_LOCATION_TYPE.SCHEMA,
-                new HashMap<>() {{
-                    put("src/test/java/packagename/components/schemas/Schema_test.hbs", ".java");
-                }}
+            CodegenConstants.JSON_PATH_LOCATION_TYPE.SCHEMA,
+            new HashMap<>() {{
+                put("src/test/java/packagename/components/schemas/Schema_test.hbs", ".java");
+            }}
         );
     }
 
-    @Override
-    public GeneratorType getTag() {
-        return GeneratorType.CLIENT;
-    }
+    private final Logger LOGGER = LoggerFactory.getLogger(JavaClientGenerator.class);
 
-    @Override
-    public String getName() {
-        return "java";
-    }
+    protected String authFolder;
+    protected HashMap<String, String> schemaJsonPathToModelName = new HashMap<>();
 
-    @Override
-    public String getHelp() {
-        return String.join("<br />",
-            "Generates a Java client library",
+    private static final String ARTIFACT_VERSION_DEFAULT_VALUE = "1.0.0";
+
+    public static final String TEST_OUTPUT = "testOutput";
+    public static final String DEFAULT_TEST_FOLDER = "${project.build.directory}/generated-test-sources/openapi";
+
+    protected String invokerPackage = "org.openapijsonschematools";
+    protected String groupId = "org.openapijsonschematools";
+    protected String artifactVersion = null;
+    protected String artifactUrl = "https://github.com/openapi-json-schema-tools/openapi-json-schema-generator";
+    protected String artifactDescription = "OpenAPI Java";
+    protected String developerName = "OpenAPI-Generator Contributors";
+    protected String developerEmail = "team@openapijsonschematools.org";
+    protected String developerOrganization = "OpenAPITools.org";
+    protected String developerOrganizationUrl = "http://openapijsonschematools.org";
+    protected String scmConnection = "scm:git:git@github.com:openapi-json-schema-tools/openapi-json-schema-generator.git";
+    protected String scmDeveloperConnection = "scm:git:git@github.com:openapi-json-schema-tools/openapi-json-schema-generator.git";
+    protected String scmUrl = "https://github.com/openapi-json-schema-tools/openapi-json-schema-generator";
+    protected String licenseName = "Unlicense";
+    protected String licenseUrl = "http://unlicense.org";
+    protected String projectFolder = "src/main";
+    // this must not be OS-specific
+    protected String sourceFolder = projectFolder + "/java";
+    protected String apiDocPath = "docs/";
+    protected String modelDocPath = "docs/";
+    protected String parentGroupId = "";
+    protected String parentArtifactId = "";
+    protected String parentVersion = "";
+    protected String outputTestFolder = "";
+    private final Map<String, String> schemaKeyToModelNameCache = new HashMap<>();
+
+    private static final FeatureSet featureSet = FeatureSet.newBuilder()
+        .includeDataTypeFeatures(
+            DataTypeFeature.Int32,
+            DataTypeFeature.Int64,
+            DataTypeFeature.Integer,
+            DataTypeFeature.Float,
+            DataTypeFeature.Double,
+            DataTypeFeature.Number,
+            DataTypeFeature.String,
+            DataTypeFeature.Boolean,
+            DataTypeFeature.Date,
+            DataTypeFeature.DateTime,
+            DataTypeFeature.Uuid,
+            DataTypeFeature.Array,
+            DataTypeFeature.Object,
+            DataTypeFeature.Null,
+            DataTypeFeature.AnyType,
+            DataTypeFeature.Enum
+        )
+        .includeDocumentationFeatures(
+            DocumentationFeature.Readme,
+            DocumentationFeature.Servers,
+            DocumentationFeature.Security,
+            DocumentationFeature.ComponentSchemas,
+            DocumentationFeature.ComponentSecuritySchemes,
+            DocumentationFeature.ComponentRequestBodies,
+            DocumentationFeature.ComponentResponses,
+            DocumentationFeature.ComponentHeaders,
+            DocumentationFeature.ComponentParameters,
+            DocumentationFeature.Api
+        )
+        .includeGlobalFeatures(
+            GlobalFeature.Components,
+            GlobalFeature.Servers,
+            GlobalFeature.Security,
+            GlobalFeature.Paths,
+            GlobalFeature.Info
+        )
+        .includeComponentsFeatures(
+            ComponentsFeature.schemas,
+            ComponentsFeature.securitySchemes,
+            ComponentsFeature.requestBodies,
+            ComponentsFeature.responses,
+            ComponentsFeature.headers,
+            ComponentsFeature.parameters
+        )
+        .includeSecurityFeatures(
+            SecurityFeature.ApiKey,
+            SecurityFeature.HTTP_Basic,
+            SecurityFeature.HTTP_Bearer
+        )
+        .includeOperationFeatures(
+            OperationFeature.Security,
+            OperationFeature.Servers,
+            OperationFeature.Responses_Default,
+            OperationFeature.Responses_HttpStatusCode,
+            OperationFeature.Responses_RangedResponseCodes,
+            OperationFeature.Responses_RedirectionResponse
+        )
+        .includeSchemaFeatures(
+            SchemaFeature.AdditionalProperties,
+            SchemaFeature.AllOf,
+            SchemaFeature.AnyOf,
+            SchemaFeature.Const,
+            SchemaFeature.Contains,
+            SchemaFeature.Default,
+            SchemaFeature.DependentRequired,
+            SchemaFeature.DependentSchemas,
+            // SchemaFeature.Discriminator,
+            SchemaFeature.Else,
+            SchemaFeature.Enum,
+            SchemaFeature.ExclusiveMaximum,
+            SchemaFeature.ExclusiveMinimum,
+            SchemaFeature.Format,
+            SchemaFeature.If,
+            SchemaFeature.Items,
+            SchemaFeature.MaxContains,
+            SchemaFeature.MaxItems,
+            SchemaFeature.MaxLength,
+            SchemaFeature.MaxProperties,
+            SchemaFeature.Maximum,
+            SchemaFeature.MinContains,
+            SchemaFeature.MinItems,
+            SchemaFeature.MinLength,
+            SchemaFeature.MinProperties,
+            SchemaFeature.Minimum,
+            SchemaFeature.MultipleOf,
+            SchemaFeature.Not,
+            SchemaFeature.Nullable,
+            SchemaFeature.OneOf,
+            SchemaFeature.Pattern,
+            SchemaFeature.PatternProperties,
+            SchemaFeature.PrefixItems,
+            SchemaFeature.Properties,
+            SchemaFeature.PropertyNames,
+            SchemaFeature.Ref,
+            SchemaFeature.Required,
+            SchemaFeature.Then,
+            SchemaFeature.Type,
+            SchemaFeature.UnevaluatedItems,
+            SchemaFeature.UnevaluatedProperties,
+            SchemaFeature.UniqueItems
+        )
+        .includeWireFormatFeatures(
+            WireFormatFeature.JSON
+        )
+        .build();
+    public static final GeneratorMetadata generatorMetadata = GeneratorMetadata.newBuilder()
+        .name("java")
+        .language(GeneratorLanguage.JAVA)
+        .languageVersion("17")
+        .type(GeneratorType.CLIENT)
+        .stability(Stability.STABLE)
+        .featureSet(featureSet)
+        .generationMessage(String.format(Locale.ROOT, "OpenAPI JSON Schema Generator: %s (%s)", "java", GeneratorType.CLIENT))
+        .helpMsg(String.join(
+            "<br />",
+        "Generates a Java client library",
             "",
             "Features in this generator:",
             "- v3.0.0 - [v3.1.0](#schema-feature) OpenAPI Specification support",
@@ -397,15 +335,97 @@ public String getHelp() {
             "- Payload values are not coerced when validated, so a date/date-time value can pass other validations that describe the payload only as type string",
             "- enum types are generated for enums of type string/integer/number/boolean/null",
             "- String transmission of numbers supported with type: string, format: number"
-        );
+        ))
+        .postGenerationMsg(defaultPostGenerationMsg)
+        .reservedWords(
+            getLowerCaseWords(
+                Arrays.asList(
+                    // used as internal variables, can collide with parameter names
+                    "localVarPath", "localVarQueryParams", "localVarCollectionQueryParams",
+                    "localVarHeaderParams", "localVarCookieParams", "localVarFormParams", "localVarPostBody",
+                    "localVarAccepts", "localVarAccept", "localVarContentTypes",
+                    "localVarContentType", "localVarAuthNames", "localReturnType",
+                    "ApiClient", "ApiException", "ApiResponse", "Configuration", "StringUtil",
+
+                    // language reserved words
+                    "abstract", "continue", "for", "new", "switch", "assert",
+                    "default", "if", "package", "synchronized", "boolean", "do", "goto", "private",
+                    "this", "break", "double", "implements", "protected", "throw", "byte", "else",
+                    "import", "public", "throws", "case", "enum", "instanceof", "return", "transient",
+                    "catch", "extends", "int", "short", "try", "char", "final", "interface", "static",
+                    "void", "class", "finally", "long", "strictfp", "volatile", "const", "float",
+                    "native", "super", "while", "null",
+                    // additional types
+                    "localdate", "zoneddatetime", "list", "map", "linkedhashset", "void", "string", "uuid", "number", "integer", "toString"
+                )
+            )
+        )
+        .instantiationTypes(
+            Map.ofEntries(
+                new AbstractMap.SimpleEntry<>("object", "FrozenMap"),
+                new AbstractMap.SimpleEntry<>("array", "FrozenList"),
+                new AbstractMap.SimpleEntry<>("string", "String"),
+                new AbstractMap.SimpleEntry<>("number", "Number (int, long, float, double)"),
+                new AbstractMap.SimpleEntry<>("integer", "Number (int, long, float with integer values, double with integer values)"),
+                new AbstractMap.SimpleEntry<>("boolean", "boolean"),
+                new AbstractMap.SimpleEntry<>("null", "Void (null)")
+            )
+        )
+        .languageSpecificPrimitives(
+            Sets.newHashSet(
+                "String",
+                "boolean",
+                "Boolean",
+                "Double",
+                "Integer",
+                "Long",
+                "Float",
+                "Object",
+                "byte[]"
+            )
+        )
+    .build();
+
+    @Override
+    public GeneratorMetadata getGeneratorMetadata() {
+        return generatorMetadata;
+    }
+
+    @Override
+    public String toModuleFilename(String name, String jsonPath) {
+        String usedName = sanitizeName(name, "[^a-zA-Z0-9]+");
+        // todo check if empty and if so them use enum name
+        // todo fix this, this does not handle names starting with numbers
+        usedName = usedName.toLowerCase(Locale.ROOT);
+        if (usedName.isEmpty()) {
+            usedName = toEnumVarName(name, null).toLowerCase(Locale.ROOT);
+        }
+        return usedName;
+    }
+
+    protected void updateServersFilepath(String[] pathPieces) {
+        String[] copiedPathPieces = pathPieces.clone();
+        copiedPathPieces[0] = "#";
+        String jsonPath = String.join("/", copiedPathPieces);
+        if (pathPieces.length == 2) {
+            // #/servers
+            pathPieces[1] = "RootServerInfo";
+        } else if (pathPieces.length == 3) {
+            // #/servers/0
+            pathPieces[2] = getFilename(CodegenKeyType.SERVER, pathPieces[2], jsonPath);
+        } else {
+            // #/servers/0/variables
+            pathPieces[2] = getFilename(CodegenKeyType.SERVER, pathPieces[2], jsonPath).toLowerCase(Locale.ROOT);
+            pathPieces[3] = getFilename(CodegenKeyType.SCHEMA, pathPieces[pathPieces.length-1], jsonPath);
+        }
     }
 
     public String packagePath() {
-        return "src" + File.separatorChar + "main" + File.separatorChar + "java" + File.separatorChar + packageName.replace('.', File.separatorChar);
+        return "src" + File.separatorChar + "main" + File.separatorChar + "java" + File.separatorChar + generatorSettings.packageName.replace('.', File.separatorChar);
     }
 
     protected String testPackagePath() {
-        return "src" + File.separatorChar + "test" + File.separatorChar + "java" + File.separatorChar + packageName.replace('.', File.separatorChar);
+        return "src" + File.separatorChar + "test" + File.separatorChar + "java" + File.separatorChar + generatorSettings.packageName.replace('.', File.separatorChar);
     }
 
     @Override
@@ -429,7 +449,7 @@ public void processOpts() {
         }
 
         if (!additionalProperties.containsKey(CodegenConstants.API_PACKAGE)) {
-            additionalProperties.put(CodegenConstants.API_PACKAGE, apiPackage);
+            additionalProperties.put(CodegenConstants.API_PACKAGE, generatorSettings().apiPackage);
         }
 
         if (additionalProperties.containsKey(CodegenConstants.GROUP_ID)) {
@@ -439,13 +459,6 @@ public void processOpts() {
             additionalProperties.put(CodegenConstants.GROUP_ID, groupId);
         }
 
-        if (additionalProperties.containsKey(CodegenConstants.ARTIFACT_ID)) {
-            this.setArtifactId((String) additionalProperties.get(CodegenConstants.ARTIFACT_ID));
-        } else {
-            //not set, use to be passed to template
-            additionalProperties.put(CodegenConstants.ARTIFACT_ID, artifactId);
-        }
-
         if (additionalProperties.containsKey(CodegenConstants.ARTIFACT_URL)) {
             this.setArtifactUrl((String) additionalProperties.get(CodegenConstants.ARTIFACT_URL));
         } else {
@@ -543,7 +556,7 @@ public void processOpts() {
             setOutputTestFolder(additionalProperties.get(TEST_OUTPUT).toString());
         }
 
-        additionalProperties.put(CodegenConstants.PACKAGE_NAME, packageName);
+        additionalProperties.put(CodegenConstants.PACKAGE_NAME, generatorSettings.packageName);
         List<String> schemaSupportingFiles = new ArrayList<>();
         schemaSupportingFiles.add("AnyTypeJsonSchema");
         schemaSupportingFiles.add("BooleanJsonSchema");
@@ -1062,7 +1075,7 @@ public Map<String, Object> postProcessSupportingFileData(Map<String, Object> dat
     @Override
     public String toApiVarName(String name) {
         String apiVarName = super.toApiVarName(name);
-        if (reservedWords.contains(apiVarName)) {
+        if (getGeneratorMetadata().getReservedWords().contains(apiVarName)) {
             apiVarName = escapeReservedWord(apiVarName);
         }
         return apiVarName;
@@ -1087,29 +1100,6 @@ public String toModelFilename(String name, String jsonPath) {
         return toModelName(name, jsonPath);
     }
 
-    @Override
-    public String toResponseModuleName(String componentName, String jsonPath) {
-        String[] pathPieces = jsonPath.split("/");
-        if (jsonPath.startsWith("#/components/responses/")) {
-            if (pathPieces.length == 4) {
-                // #/components/responses/SomeResponse
-                return toModelName(componentName, null);
-            }
-            return toModuleFilename(componentName, jsonPath);
-        }
-        String prefix = getPathClassNamePrefix(jsonPath);
-        switch (pathPieces.length) {
-            case 5:
-                // #/paths/somePath/verb/responses
-                return prefix + "Responses";
-            case 6:
-                // #/paths/somePath/verb/responses/200
-                return prefix + "Code"+ componentName + "Response";
-            default:
-                return toModuleFilename("code"+componentName+"response", null);
-        }
-    }
-
     @Override
     @SuppressWarnings("static-method")
     public String sanitizeName(String name, String filterOutRegex) {
@@ -1348,7 +1338,7 @@ private String toSchemaRefClass(String ref, String sourceJsonPath) {
         if (sourceJsonPath != null && ref.startsWith(sourceJsonPath + "/")) {
             // internal in-schema reference, no import needed
             // TODO handle this in the future
-            if (getFilepath(sourceJsonPath).equals(getFilepath(ref))) {
+            if (getFilePath(GeneratedFileType.CODE, sourceJsonPath).equals(getFilePath(GeneratedFileType.CODE, ref))) {
                 // TODO ensure that getFilepath returns the same file for somePath/get/QueryParameters
                 // TODO ensure that getFilepath returns the same file for schemas/SomeSchema...
                 return null;
@@ -1421,8 +1411,8 @@ public String toRefClass(String ref, String sourceJsonPath, String expectedCompo
 
     @Override
     public String getRefModuleLocation(String ref) {
-        String filePath = getFilepath(ref);
-        String prefix = outputFolder + File.separatorChar + "src" + File.separatorChar + "main" + File.separatorChar + "java" + File.separatorChar;
+        String filePath = getFilePath(GeneratedFileType.CODE, ref);
+        String prefix = generatorSettings.outputFolder + File.separatorChar + "src" + File.separatorChar + "main" + File.separatorChar + "java" + File.separatorChar;
         // modules are always in a package one above them, so strip off the last jsonPath fragment
         String localFilepath = filePath.substring(prefix.length(), filePath.lastIndexOf(File.separatorChar));
         return localFilepath.replaceAll(String.valueOf(File.separatorChar), ".");
@@ -1460,14 +1450,14 @@ private Set<String> getDeeperImports(String sourceJsonPath, CodegenSchema schema
         if (schema.types != null) {
             if (schema.types.contains("array")) {
                 imports.add("import java.util.List;");
-                imports.add("import "+packageName + ".schemas.validation.FrozenList;");
+                imports.add("import "+ generatorSettings.packageName + ".schemas.validation.FrozenList;");
                 if (schema.items != null) {
                     imports.addAll(getDeeperImports(sourceJsonPath, schema.items));
                 }
             }
             if (schema.types.contains("object")) {
                 imports.add("import java.util.Map;");
-                imports.add("import "+packageName + ".schemas.validation.FrozenMap;");
+                imports.add("import "+ generatorSettings.packageName + ".schemas.validation.FrozenMap;");
                 if (schema.mapValueSchema != null) {
                     imports.addAll(getDeeperImports(sourceJsonPath, schema.mapValueSchema));
                 }
@@ -1578,7 +1568,7 @@ public Set<String> getImports(String sourceJsonPath, CodegenSchema schema, Featu
             if (schema.types.size() == 1) {
                 if (schema.types.contains("boolean")) {
                     if (schema.isSimpleBoolean()) {
-                        imports.add("import "+packageName + ".schemas.BooleanJsonSchema;");
+                        imports.add("import "+ generatorSettings.packageName + ".schemas.BooleanJsonSchema;");
                         imports.add("import org.checkerframework.checker.nullness.qual.Nullable;");
                     } else {
                         addCustomSchemaImports(imports, schema);
@@ -1587,7 +1577,7 @@ public Set<String> getImports(String sourceJsonPath, CodegenSchema schema, Featu
                     }
                 } else if (schema.types.contains("null")) {
                     if (schema.isSimpleNull()) {
-                        imports.add("import "+packageName + ".schemas.NullJsonSchema;");
+                        imports.add("import "+generatorSettings.packageName + ".schemas.NullJsonSchema;");
                         imports.add("import org.checkerframework.checker.nullness.qual.Nullable;");
                     } else {
                         addCustomSchemaImports(imports, schema);
@@ -1598,11 +1588,11 @@ public Set<String> getImports(String sourceJsonPath, CodegenSchema schema, Featu
                     if (schema.isSimpleInteger()) {
                         imports.add("import org.checkerframework.checker.nullness.qual.Nullable;");
                         if (schema.format == null || schema.format.equals("int")) {
-                            imports.add("import "+packageName + ".schemas.IntJsonSchema;");
+                            imports.add("import "+generatorSettings.packageName + ".schemas.IntJsonSchema;");
                         } else if (schema.format.equals("int32")) {
-                            imports.add("import "+packageName + ".schemas.Int32JsonSchema;");
+                            imports.add("import "+generatorSettings.packageName + ".schemas.Int32JsonSchema;");
                         } else if (schema.format.equals("int64")) {
-                            imports.add("import "+packageName + ".schemas.Int64JsonSchema;");
+                            imports.add("import "+generatorSettings.packageName + ".schemas.Int64JsonSchema;");
                         }
                     } else {
                         addCustomSchemaImports(imports, schema);
@@ -1613,15 +1603,15 @@ public Set<String> getImports(String sourceJsonPath, CodegenSchema schema, Featu
                     if (schema.isSimpleNumber()) {
                         imports.add("import org.checkerframework.checker.nullness.qual.Nullable;");
                         if (schema.format == null) {
-                            imports.add("import "+packageName + ".schemas.NumberJsonSchema;");
+                            imports.add("import "+generatorSettings.packageName + ".schemas.NumberJsonSchema;");
                         } else if (schema.format.equals("int32")) {
-                            imports.add("import "+packageName + ".schemas.Int32JsonSchema;");
+                            imports.add("import "+generatorSettings.packageName + ".schemas.Int32JsonSchema;");
                         } else if (schema.format.equals("int64")) {
-                            imports.add("import "+packageName + ".schemas.Int64JsonSchema;");
+                            imports.add("import "+generatorSettings.packageName + ".schemas.Int64JsonSchema;");
                         } else if (schema.format.equals("float")) {
-                            imports.add("import "+packageName + ".schemas.FloatJsonSchema;");
+                            imports.add("import "+generatorSettings.packageName + ".schemas.FloatJsonSchema;");
                         } else if (schema.format.equals("double")) {
-                            imports.add("import "+packageName + ".schemas.DoubleJsonSchema;");
+                            imports.add("import "+generatorSettings.packageName + ".schemas.DoubleJsonSchema;");
                         }
                     } else {
                         addCustomSchemaImports(imports, schema);
@@ -1632,21 +1622,21 @@ public Set<String> getImports(String sourceJsonPath, CodegenSchema schema, Featu
                     if (schema.isSimpleString()) {
                         imports.add("import org.checkerframework.checker.nullness.qual.Nullable;");
                         if (schema.format == null) {
-                            imports.add("import "+packageName + ".schemas.StringJsonSchema;");
+                            imports.add("import "+generatorSettings.packageName + ".schemas.StringJsonSchema;");
                         } else if (schema.format.equals("date")) {
-                            imports.add("import "+packageName + ".schemas.DateJsonSchema;");
+                            imports.add("import "+generatorSettings.packageName + ".schemas.DateJsonSchema;");
                         } else if (schema.format.equals("date-time")) {
-                            imports.add("import "+packageName + ".schemas.DateTimeJsonSchema;");
+                            imports.add("import "+generatorSettings.packageName + ".schemas.DateTimeJsonSchema;");
                         } else if (schema.format.equals("number")) {
-                            imports.add("import "+packageName + ".schemas.DecimalJsonSchema;");
+                            imports.add("import "+generatorSettings.packageName + ".schemas.DecimalJsonSchema;");
                         } else if (schema.format.equals("uuid")) {
-                            imports.add("import "+packageName + ".schemas.UuidJsonSchema;");
+                            imports.add("import "+generatorSettings.packageName + ".schemas.UuidJsonSchema;");
                         } else if (schema.format.equals("byte")) {
                             // todo implement this
-                            imports.add("import "+packageName + ".schemas.StringJsonSchema;");
+                            imports.add("import "+generatorSettings.packageName + ".schemas.StringJsonSchema;");
                         } else if (schema.format.equals("binary")) {
                             // todo implement this
-                            imports.add("import "+packageName + ".schemas.StringJsonSchema;");
+                            imports.add("import "+generatorSettings.packageName + ".schemas.StringJsonSchema;");
                         }
                     } else {
                         addCustomSchemaImports(imports, schema);
@@ -1656,9 +1646,9 @@ public Set<String> getImports(String sourceJsonPath, CodegenSchema schema, Featu
                 } else if (schema.types.contains("object")) {
                     if (schema.isSimpleObject()) {
                         imports.add("import org.checkerframework.checker.nullness.qual.Nullable;");
-                        imports.add("import "+packageName + ".schemas.MapJsonSchema;");
+                        imports.add("import "+generatorSettings.packageName + ".schemas.MapJsonSchema;");
                         // add this in case the 1 higher schema is an array of FrozenMap
-                        imports.add("import "+packageName + ".schemas.validation.FrozenMap;");
+                        imports.add("import "+generatorSettings.packageName + ".schemas.validation.FrozenMap;");
                     } else {
                         addCustomSchemaImports(imports, schema);
                         imports.add("import java.util.Set;");
@@ -1670,9 +1660,9 @@ public Set<String> getImports(String sourceJsonPath, CodegenSchema schema, Featu
                 } else if (schema.types.contains("array")) {
                     if (schema.isSimpleArray()) {
                         imports.add("import org.checkerframework.checker.nullness.qual.Nullable;");
-                        imports.add("import "+packageName + ".schemas.ListJsonSchema;");
+                        imports.add("import "+generatorSettings.packageName + ".schemas.ListJsonSchema;");
                         // add this in case the 1 higher schema is a map of FrozenList
-                        imports.add("import "+packageName + ".schemas.validation.FrozenList;");
+                        imports.add("import "+generatorSettings.packageName + ".schemas.validation.FrozenList;");
                     } else {
                         addCustomSchemaImports(imports, schema);
                         imports.add("import java.util.Set;");
@@ -1714,29 +1704,29 @@ public Set<String> getImports(String sourceJsonPath, CodegenSchema schema, Featu
             // no types
             if (schema.isBooleanSchemaTrue) {
                 imports.add("import org.checkerframework.checker.nullness.qual.Nullable;");
-                imports.add("import "+packageName + ".schemas.AnyTypeJsonSchema;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.AnyTypeJsonSchema;");
             } else if (schema.isBooleanSchemaFalse) {
                 imports.add("import org.checkerframework.checker.nullness.qual.Nullable;");
-                imports.add("import "+packageName + ".schemas.NotAnyTypeJsonSchema;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.NotAnyTypeJsonSchema;");
             } else if (schema.isSimpleAnyType()) {
                 imports.add("import org.checkerframework.checker.nullness.qual.Nullable;");
-                imports.add("import "+packageName + ".schemas.AnyTypeJsonSchema;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.AnyTypeJsonSchema;");
                 // in case higher schema is ListBuilder add List + Map
             } else {
                 addCustomSchemaImports(imports, schema);
                 imports.add("import java.time.LocalDate;");
                 imports.add("import java.time.ZonedDateTime;");
                 imports.add("import java.util.UUID;");
-                imports.add("import "+packageName + ".schemas.validation.FrozenList;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.FrozenList;");
                 imports.add("import java.util.List;");
-                imports.add("import "+packageName + ".schemas.validation.FrozenMap;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.FrozenMap;");
                 imports.add("import java.util.Map;");
-                imports.add("import "+packageName + ".schemas.validation.NullSchemaValidator;");
-                imports.add("import "+packageName + ".schemas.validation.BooleanSchemaValidator;");
-                imports.add("import "+packageName + ".schemas.validation.NumberSchemaValidator;");
-                imports.add("import "+packageName + ".schemas.validation.StringSchemaValidator;");
-                imports.add("import "+packageName + ".schemas.validation.ListSchemaValidator;");
-                imports.add("import "+packageName + ".schemas.validation.MapSchemaValidator;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.NullSchemaValidator;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.BooleanSchemaValidator;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.NumberSchemaValidator;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.StringSchemaValidator;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.ListSchemaValidator;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.MapSchemaValidator;");
                 imports.add("import java.util.LinkedHashMap;");
                 imports.add("import java.util.ArrayList;"); // for validate
                 addPropertiesImports(schema, imports);
@@ -1760,8 +1750,8 @@ public Set<String> getImports(String sourceJsonPath, CodegenSchema schema, Featu
                     imports.addAll(getDeeperImports(sourceJsonPath, schema.items));
                 }
                 if (schema.additionalProperties == null || !schema.additionalProperties.isBooleanSchemaFalse) {
-                    imports.add("import "+packageName + ".exceptions.UnsetPropertyException;");
-                    imports.add("import "+packageName + ".exceptions.InvalidAdditionalPropertyException;");
+                    imports.add("import "+generatorSettings.packageName + ".exceptions.UnsetPropertyException;");
+                    imports.add("import "+generatorSettings.packageName + ".exceptions.InvalidAdditionalPropertyException;");
                 }
             }
         }
@@ -1776,45 +1766,45 @@ private void addPatternValidator(CodegenSchema schema, Set<String> imports) {
 
     private void addDefaultValueImport(CodegenSchema schema, Set<String> imports) {
         if (schema.defaultValue != null) {
-            imports.add("import "+packageName + ".schemas.validation.DefaultValueMethod;");
+            imports.add("import "+generatorSettings.packageName + ".schemas.validation.DefaultValueMethod;");
         }
     }
 
 
     private void addEnumValidator(CodegenSchema schema, Set<String> imports) {
         if (schema.enumInfo != null) {
-            imports.add("import "+packageName + ".schemas.SetMaker;");
+            imports.add("import "+generatorSettings.packageName + ".schemas.SetMaker;");
             if (schema.enumInfo.typeToValues.containsKey("null")) {
-                imports.add("import "+packageName + ".schemas.validation.NullEnumValidator;");
-                imports.add("import "+packageName + ".schemas.validation.NullValueMethod;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.NullEnumValidator;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.NullValueMethod;");
             }
             if (schema.enumInfo.typeToValues.containsKey("boolean")) {
-                imports.add("import "+packageName + ".schemas.validation.BooleanEnumValidator;");
-                imports.add("import "+packageName + ".schemas.validation.BooleanValueMethod;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.BooleanEnumValidator;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.BooleanValueMethod;");
             }
             if (schema.enumInfo.typeToValues.containsKey("string")) {
-                imports.add("import "+packageName + ".schemas.validation.StringEnumValidator;");
-                imports.add("import "+packageName + ".schemas.validation.StringValueMethod;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.StringEnumValidator;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.StringValueMethod;");
             }
             if (schema.enumInfo.typeToValues.containsKey("Integer")) {
                 imports.add("import java.math.BigDecimal;");
-                imports.add("import "+packageName + ".schemas.validation.IntegerEnumValidator;");
-                imports.add("import "+packageName + ".schemas.validation.IntegerValueMethod;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.IntegerEnumValidator;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.IntegerValueMethod;");
             }
             if (schema.enumInfo.typeToValues.containsKey("Long")) {
                 imports.add("import java.math.BigDecimal;");
-                imports.add("import "+packageName + ".schemas.validation.LongEnumValidator;");
-                imports.add("import "+packageName + ".schemas.validation.LongValueMethod;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.LongEnumValidator;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.LongValueMethod;");
             }
             if (schema.enumInfo.typeToValues.containsKey("Float")) {
                 imports.add("import java.math.BigDecimal;");
-                imports.add("import "+packageName + ".schemas.validation.FloatEnumValidator;");
-                imports.add("import "+packageName + ".schemas.validation.FloatValueMethod;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.FloatEnumValidator;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.FloatValueMethod;");
             }
             if (schema.enumInfo.typeToValues.containsKey("Double")) {
                 imports.add("import java.math.BigDecimal;");
-                imports.add("import "+packageName + ".schemas.validation.DoubleEnumValidator;");
-                imports.add("import "+packageName + ".schemas.validation.DoubleValueMethod;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.DoubleEnumValidator;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.DoubleValueMethod;");
             }
         }
     }
@@ -1822,47 +1812,47 @@ private void addEnumValidator(CodegenSchema schema, Set<String> imports) {
     private void addConstImports(CodegenSchema schema, Set<String> imports) {
         if (schema.constInfo != null) {
             if (schema.constInfo.typeToValues.containsKey("null")) {
-                imports.add("import "+packageName + ".schemas.validation.NullEnumValidator;");
-                imports.add("import "+packageName + ".schemas.validation.NullValueMethod;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.NullEnumValidator;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.NullValueMethod;");
             }
             if (schema.constInfo.typeToValues.containsKey("boolean")) {
-                imports.add("import "+packageName + ".schemas.validation.BooleanEnumValidator;");
-                imports.add("import "+packageName + ".schemas.validation.BooleanValueMethod;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.BooleanEnumValidator;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.BooleanValueMethod;");
             }
             if (schema.constInfo.typeToValues.containsKey("string")) {
-                imports.add("import "+packageName + ".schemas.validation.StringEnumValidator;");
-                imports.add("import "+packageName + ".schemas.validation.StringValueMethod;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.StringEnumValidator;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.StringValueMethod;");
             }
             if (schema.constInfo.typeToValues.containsKey("Integer")) {
                 imports.add("import java.math.BigDecimal;");
-                imports.add("import "+packageName + ".schemas.validation.IntegerEnumValidator;");
-                imports.add("import "+packageName + ".schemas.validation.IntegerValueMethod;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.IntegerEnumValidator;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.IntegerValueMethod;");
             }
             if (schema.constInfo.typeToValues.containsKey("Long")) {
                 imports.add("import java.math.BigDecimal;");
-                imports.add("import "+packageName + ".schemas.validation.LongEnumValidator;");
-                imports.add("import "+packageName + ".schemas.validation.LongValueMethod;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.LongEnumValidator;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.LongValueMethod;");
             }
             if (schema.constInfo.typeToValues.containsKey("Float")) {
                 imports.add("import java.math.BigDecimal;");
-                imports.add("import "+packageName + ".schemas.validation.FloatEnumValidator;");
-                imports.add("import "+packageName + ".schemas.validation.FloatValueMethod;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.FloatEnumValidator;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.FloatValueMethod;");
             }
             if (schema.constInfo.typeToValues.containsKey("Double")) {
                 imports.add("import java.math.BigDecimal;");
-                imports.add("import "+packageName + ".schemas.validation.DoubleEnumValidator;");
-                imports.add("import "+packageName + ".schemas.validation.DoubleValueMethod;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.DoubleEnumValidator;");
+                imports.add("import "+generatorSettings.packageName + ".schemas.validation.DoubleValueMethod;");
             }
         }
     }
 
     private void addPropertiesImports(CodegenSchema schema, Set<String> imports) {
         if (schema.properties != null) {
-            imports.add("import " + packageName + ".schemas.validation.PropertyEntry;");
+            imports.add("import " + generatorSettings.packageName + ".schemas.validation.PropertyEntry;");
             imports.add("import java.util.Map;");
             imports.add("import java.util.Set;");
-            imports.add("import " + packageName + ".exceptions.UnsetPropertyException;");
-            imports.add("import " + packageName + ".schemas.GenericBuilder;");
+            imports.add("import " + generatorSettings.packageName + ".exceptions.UnsetPropertyException;");
+            imports.add("import " + generatorSettings.packageName + ".schemas.GenericBuilder;");
         }
     }
 
@@ -1876,16 +1866,16 @@ private void addPatternPropertiesImports(CodegenSchema schema, Set<String> impor
 
     private void addDependentSchemasImports(CodegenSchema schema, Set<String> imports) {
         if (schema.dependentSchemas != null) {
-            imports.add("import " + packageName + ".schemas.validation.PropertyEntry;");
+            imports.add("import " + generatorSettings.packageName + ".schemas.validation.PropertyEntry;");
             imports.add("import java.util.Map;");
         }
     }
 
     private void addDependentRequiredImports(CodegenSchema schema, Set<String> imports) {
         if (schema.dependentRequired != null) {
-            imports.add("import "+packageName + ".schemas.validation.MapUtils;");
+            imports.add("import "+generatorSettings.packageName + ".schemas.validation.MapUtils;");
             imports.add("import java.util.AbstractMap;");
-            imports.add("import "+packageName + ".schemas.SetMaker;");
+            imports.add("import "+generatorSettings.packageName + ".schemas.SetMaker;");
         }
     }
 
@@ -1909,14 +1899,14 @@ private void addOneOfValidator(CodegenSchema schema, Set<String> imports) {
 
     private void addAdditionalPropertiesImports(CodegenSchema schema, Set<String> imports) {
         if (schema.additionalProperties == null || !schema.additionalProperties.isBooleanSchemaFalse) {
-            imports.add("import "+packageName + ".exceptions.UnsetPropertyException;");
-            imports.add("import "+packageName + ".exceptions.InvalidAdditionalPropertyException;");
+            imports.add("import "+generatorSettings.packageName + ".exceptions.UnsetPropertyException;");
+            imports.add("import "+generatorSettings.packageName + ".exceptions.InvalidAdditionalPropertyException;");
         }
         if (schema.additionalProperties != null) {
-            imports.add("import "+packageName + ".schemas.GenericBuilder;");
-            imports.add("import "+packageName + ".schemas.validation.MapUtils;");
+            imports.add("import "+generatorSettings.packageName + ".schemas.GenericBuilder;");
+            imports.add("import "+generatorSettings.packageName + ".schemas.validation.MapUtils;");
         } else {
-            imports.add("import "+packageName + ".schemas.UnsetAddPropsSetter;");
+            imports.add("import "+generatorSettings.packageName + ".schemas.UnsetAddPropsSetter;");
         }
     }
 
@@ -1924,7 +1914,7 @@ private void addAdditionalPropertiesImports(CodegenSchema schema, Set<String> im
     private void addRequiredValidator(CodegenSchema schema, Set<String> imports) {
         if (schema.requiredProperties != null) {
             imports.add("import java.util.Set;");
-            imports.add("import "+packageName + ".schemas.GenericBuilder;");
+            imports.add("import "+generatorSettings.packageName + ".schemas.GenericBuilder;");
         }
     }
 
@@ -1935,23 +1925,23 @@ private void addMultipleOfValidator(CodegenSchema schema, Set<String> imports) {
     }
 
     private void addCustomSchemaImports(Set<String> imports, CodegenSchema schema) {
-        imports.add("import " + packageName + ".schemas.validation.JsonSchema;");
-        imports.add("import " + packageName + ".schemas.validation.JsonSchemaInfo;");
-        imports.add("import "+packageName + ".configurations.SchemaConfiguration;");
-        imports.add("import "+packageName + ".exceptions.ValidationException;");
+        imports.add("import " + generatorSettings.packageName + ".schemas.validation.JsonSchema;");
+        imports.add("import " + generatorSettings.packageName + ".schemas.validation.JsonSchemaInfo;");
+        imports.add("import "+generatorSettings.packageName + ".configurations.SchemaConfiguration;");
+        imports.add("import "+generatorSettings.packageName + ".exceptions.ValidationException;");
         imports.add("import java.util.Set;"); // for validate
         imports.add("import java.util.HashSet;"); // for validate
         imports.add("import java.util.Objects;"); // for validate
         imports.add("import java.util.LinkedHashSet;"); // for validate
         imports.add("import java.util.List;"); // for castToAllowedTypes
-        imports.add("import "+packageName + ".schemas.validation.PathToSchemasMap;"); // for getNewInstance
-        imports.add("import "+packageName + ".schemas.validation.ValidationMetadata;"); // for getNewInstance
-        imports.add("import "+packageName + ".configurations.JsonSchemaKeywordFlags;"); // for getNewInstance
+        imports.add("import "+generatorSettings.packageName + ".schemas.validation.PathToSchemasMap;"); // for getNewInstance
+        imports.add("import "+generatorSettings.packageName + ".schemas.validation.ValidationMetadata;"); // for getNewInstance
+        imports.add("import "+generatorSettings.packageName + ".configurations.JsonSchemaKeywordFlags;"); // for getNewInstance
         imports.add("import org.checkerframework.checker.nullness.qual.Nullable;");
     }
 
     private void addBooleanSchemaImports(Set<String> imports, CodegenSchema schema) {
-        imports.add("import " + packageName + ".schemas.validation.BooleanSchemaValidator;");
+        imports.add("import " + generatorSettings.packageName + ".schemas.validation.BooleanSchemaValidator;");
         addAllOfValidator(schema, imports);
         addAnyOfValidator(schema, imports);
         addOneOfValidator(schema, imports);
@@ -1961,7 +1951,7 @@ private void addBooleanSchemaImports(Set<String> imports, CodegenSchema schema)
     }
 
     private void addNullSchemaImports(Set<String> imports, CodegenSchema schema) {
-        imports.add("import " + packageName + ".schemas.validation.NullSchemaValidator;");
+        imports.add("import " + generatorSettings.packageName + ".schemas.validation.NullSchemaValidator;");
         addAllOfValidator(schema, imports);
         addAnyOfValidator(schema, imports);
         addOneOfValidator(schema, imports);
@@ -1971,8 +1961,8 @@ private void addNullSchemaImports(Set<String> imports, CodegenSchema schema) {
     }
 
     private void addMapSchemaImports(Set<String> imports, CodegenSchema schema) {
-        imports.add("import " + packageName + ".schemas.validation.MapSchemaValidator;");
-        imports.add("import "+packageName + ".schemas.validation.FrozenMap;");
+        imports.add("import " + generatorSettings.packageName + ".schemas.validation.MapSchemaValidator;");
+        imports.add("import "+generatorSettings.packageName + ".schemas.validation.FrozenMap;");
         imports.add("import java.util.Map;");
         imports.add("import java.util.ArrayList;"); // for castToAllowedTypes
         imports.add("import java.util.LinkedHashMap;");
@@ -1988,8 +1978,8 @@ private void addMapSchemaImports(Set<String> imports, CodegenSchema schema) {
     }
 
     private void addListSchemaImports(Set<String> imports, CodegenSchema schema) {
-        imports.add("import " + packageName + ".schemas.validation.ListSchemaValidator;");
-        imports.add("import "+packageName + ".schemas.validation.FrozenList;");
+        imports.add("import " + generatorSettings.packageName + ".schemas.validation.ListSchemaValidator;");
+        imports.add("import "+generatorSettings.packageName + ".schemas.validation.FrozenList;");
         imports.add("import java.util.List;");
         imports.add("import java.util.ArrayList;"); // for castToAllowedTypes
         imports.add("import java.util.LinkedHashMap;");
@@ -1999,7 +1989,7 @@ private void addListSchemaImports(Set<String> imports, CodegenSchema schema) {
     }
 
     private void addNumberSchemaImports(Set<String> imports, CodegenSchema schema) {
-        imports.add("import " + packageName + ".schemas.validation.NumberSchemaValidator;");
+        imports.add("import " + generatorSettings.packageName + ".schemas.validation.NumberSchemaValidator;");
         addAllOfValidator(schema, imports);
         addAnyOfValidator(schema, imports);
         addOneOfValidator(schema, imports);
@@ -2023,7 +2013,7 @@ private void addStringSchemaImports(Set<String> imports, CodegenSchema schema) {
                     break;
             }
         }
-        imports.add("import " + packageName + ".schemas.validation.StringSchemaValidator;");
+        imports.add("import " + generatorSettings.packageName + ".schemas.validation.StringSchemaValidator;");
         addAllOfValidator(schema, imports);
         addAnyOfValidator(schema, imports);
         addOneOfValidator(schema, imports);
@@ -2036,7 +2026,7 @@ private void addStringSchemaImports(Set<String> imports, CodegenSchema schema) {
 
     @Override
     public String getImport(CodegenRefInfo<?> refInfo) {
-        String prefix = "import " + packageName + ".components.";
+        String prefix = "import " + generatorSettings.packageName + ".components.";
         if (refInfo.ref instanceof CodegenSchema) {
             if (refInfo.refModuleAlias == null) {
                 return "import " + refInfo.refModuleLocation + "." + refInfo.refModule + ";";
@@ -2058,16 +2048,19 @@ public String getImport(CodegenRefInfo<?> refInfo) {
     }
 
     protected String getModuleLocation(String ref) {
-        String filePath = getFilepath(ref);
-        String prefix = outputFolder + File.separatorChar + "src" + File.separatorChar + "main" + File.separatorChar + "java" + File.separatorChar;
+        String filePath = getFilePath(GeneratedFileType.CODE, ref);
+        String prefix = generatorSettings.outputFolder + File.separatorChar + "src" + File.separatorChar + "main" + File.separatorChar + "java" + File.separatorChar;
         String localFilepath = filePath.substring(prefix.length());
         return localFilepath.replaceAll(String.valueOf(File.separatorChar), ".");
     }
 
     @Override
-    public String getTestFilepath(String jsonPath) {
+    public String getFilePath(GeneratedFileType type, String jsonPath) {
+        if (type != GeneratedFileType.TEST) {
+            return super.getFilePath(type, jsonPath);
+        }
         String[] pathPieces = jsonPath.split("/");
-        pathPieces[0] = outputFolder + File.separatorChar + testPackagePath();
+        pathPieces[0] = generatorSettings.outputFolder + File.separatorChar + testPackagePath();
         if (jsonPath.startsWith("#/components")) {
             // #/components/schemas/someSchema
             updateComponentsFilepath(pathPieces);
@@ -2077,8 +2070,8 @@ public String getTestFilepath(String jsonPath) {
             }
         }
         List<String> finalPathPieces = Arrays.stream(pathPieces)
-                .filter(Objects::nonNull)
-                .collect(Collectors.toList());
+            .filter(Objects::nonNull)
+            .collect(Collectors.toList());
         return String.join(File.separator, finalPathPieces);
     }
 
@@ -2223,7 +2216,7 @@ protected EnumInfo getEnumInfo(ArrayList<Object> values, Schema<?> schema, Strin
         LinkedHashMap<String, EnumValue> enumNameToValue = new LinkedHashMap<>();
         int truncateIdx = 0;
 
-        if (isRemoveEnumValuePrefix()) {
+        if (generatorSettings.removeEnumValuePrefix) {
             String commonPrefix = findCommonPrefixOfVars(values);
             truncateIdx = commonPrefix.length();
         }
@@ -2668,6 +2661,25 @@ public String getFilename(CodegenKeyType type, String lastJsonPathFragment, Stri
                 // #/paths/somePath/verb/security/0
                 String prefix = getPathClassNamePrefix(jsonPath);
                 return prefix + "SecurityRequirementObject"+pathPieces[pathPieces.length-1];
+            case RESPONSE:
+                if (jsonPath.startsWith("#/components/responses/")) {
+                    if (pathPieces.length == 4) {
+                        // #/components/responses/SomeResponse
+                        return toModelName(lastJsonPathFragment, null);
+                    }
+                    return toModuleFilename(lastJsonPathFragment, jsonPath);
+                }
+                String clsNamePrefix = getPathClassNamePrefix(jsonPath);
+                switch (pathPieces.length) {
+                    case 5:
+                        // #/paths/somePath/verb/responses
+                        return clsNamePrefix + "Responses";
+                    case 6:
+                        // #/paths/somePath/verb/responses/200
+                        return clsNamePrefix + "Code"+ lastJsonPathFragment + "Response";
+                    default:
+                        return toModuleFilename("code"+lastJsonPathFragment+"response", null);
+                }
             default:
                 return null;
         }
@@ -2765,11 +2777,6 @@ private void sanitizeConfig() {
         // Sanitize any config options here. We also have to update the additionalProperties because
         // the whole additionalProperties object is injected into the main object passed to the mustache layer
 
-        this.setApiPackage(sanitizePackageName(apiPackage));
-        if (additionalProperties.containsKey(CodegenConstants.API_PACKAGE)) {
-            this.additionalProperties.put(CodegenConstants.API_PACKAGE, apiPackage);
-        }
-
         this.setModelPackage(sanitizePackageName(modelPackage));
 
         this.setInvokerPackage(sanitizePackageName(invokerPackage));
@@ -2838,17 +2845,6 @@ private boolean startsWithTwoUppercaseLetters(String name) {
         return startsWithTwoUppercaseLetters;
     }
 
-    @Override
-    public String toParamName(String name) {
-        // to avoid conflicts with 'callback' parameter for async call
-        if ("callback".equals(name)) {
-            return "paramCallback";
-        }
-
-        // should be the same as variable name
-        return toVarName(name);
-    }
-
     @Override
     public String toModelName(final String name, String jsonPath) {
         // We need to check if schema-mapping has a different model for this class, so we use it
@@ -3220,7 +3216,18 @@ public void preprocessOpenAPI(OpenAPI openAPI) {
         }
         // must be sequential after initial setting above
         if (additionalProperties.containsKey(CodegenConstants.SNAPSHOT_VERSION)) {
-            if (convertPropertyToBooleanAndWriteBack(CodegenConstants.SNAPSHOT_VERSION)) {
+            final Object booleanValue = additionalProperties.get(CodegenConstants.SNAPSHOT_VERSION);
+            boolean result1 = Boolean.FALSE;
+            if (booleanValue instanceof Boolean) {
+                result1 = (Boolean) booleanValue;
+            } else if (booleanValue instanceof String) {
+                result1 = Boolean.parseBoolean((String) booleanValue);
+            } else {
+                LOGGER.warn("The value (generator's option) must be either boolean or string. Default to `false`.");
+            }
+            boolean result = result1;
+            additionalProperties.put(CodegenConstants.SNAPSHOT_VERSION, result);
+            if (result) {
                 this.setArtifactVersion(this.buildSnapshotVersion(this.getArtifactVersion()));
             }
         }
@@ -3252,14 +3259,6 @@ public void setGroupId(String groupId) {
         this.groupId = groupId;
     }
 
-    public String getArtifactId() {
-        return artifactId;
-    }
-
-    public void setArtifactId(String artifactId) {
-        this.artifactId = artifactId;
-    }
-
     public String getArtifactVersion() {
         return artifactVersion;
     }
@@ -3364,14 +3363,6 @@ public void setSourceFolder(String sourceFolder) {
         this.sourceFolder = sourceFolder;
     }
 
-    @Override
-    public void setOutputDir(String dir) {
-        super.setOutputDir(dir);
-        if (this.outputTestFolder.isEmpty()) {
-            setOutputTestFolder(dir);
-        }
-    }
-
     public void setOutputTestFolder(String outputTestFolder) {
         this.outputTestFolder = outputTestFolder;
     }
diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/OpenApiProcessor.java b/src/main/java/org/openapijsonschematools/codegen/generators/OpenApiProcessor.java
new file mode 100644
index 00000000000..e91afedee7c
--- /dev/null
+++ b/src/main/java/org/openapijsonschematools/codegen/generators/OpenApiProcessor.java
@@ -0,0 +1,53 @@
+package org.openapijsonschematools.codegen.generators;
+
+import io.swagger.v3.oas.models.Operation;
+import io.swagger.v3.oas.models.PathItem;
+import io.swagger.v3.oas.models.Paths;
+import io.swagger.v3.oas.models.headers.Header;
+import io.swagger.v3.oas.models.media.Schema;
+import io.swagger.v3.oas.models.parameters.Parameter;
+import io.swagger.v3.oas.models.parameters.RequestBody;
+import io.swagger.v3.oas.models.responses.ApiResponse;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import io.swagger.v3.oas.models.servers.Server;
+import io.swagger.v3.oas.models.servers.ServerVariable;
+import org.apache.commons.lang3.tuple.Pair;
+import org.openapijsonschematools.codegen.generators.openapimodels.CodegenHeader;
+import org.openapijsonschematools.codegen.generators.openapimodels.CodegenKey;
+import org.openapijsonschematools.codegen.generators.openapimodels.CodegenList;
+import org.openapijsonschematools.codegen.generators.openapimodels.CodegenOperation;
+import org.openapijsonschematools.codegen.generators.openapimodels.CodegenParameter;
+import org.openapijsonschematools.codegen.generators.openapimodels.CodegenPathItem;
+import org.openapijsonschematools.codegen.generators.openapimodels.CodegenRequestBody;
+import org.openapijsonschematools.codegen.generators.openapimodels.CodegenResponse;
+import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema;
+import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityRequirementObject;
+import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityRequirementValue;
+import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityScheme;
+import org.openapijsonschematools.codegen.generators.openapimodels.CodegenServer;
+import org.openapijsonschematools.codegen.generators.openapimodels.CodegenTag;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+public interface OpenApiProcessor {
+    CodegenSchema fromSchema(Schema<?> schema, String sourceJsonPath, String currentJsonPath);
+    CodegenTag fromTag(String name, String description);
+    CodegenList<CodegenSecurityRequirementObject> fromSecurity(List<SecurityRequirement> security, String jsonPath);
+    CodegenOperation fromOperation(Operation operation, String jsonPath, LinkedHashMap<Pair<String, String>, CodegenParameter> pathItemParameters, CodegenList<CodegenServer> rootOrPathServers, CodegenList<CodegenSecurityRequirementObject> rootSecurity);
+    CodegenSecurityScheme fromSecurityScheme(SecurityScheme securityScheme, String jsonPath);
+    HashMap<String, CodegenSecurityRequirementValue> fromSecurityRequirement(SecurityRequirement securityScheme, String jsonPath);
+    TreeMap<CodegenKey, CodegenPathItem> fromPaths(Paths paths, CodegenList<CodegenServer> rootServers, CodegenList<CodegenSecurityRequirementObject> rootSecurity);
+    CodegenPathItem fromPathItem(PathItem pathItem, String jsonPath, CodegenList<CodegenServer> rootServers, CodegenList<CodegenSecurityRequirementObject> rootSecurity);
+    CodegenList<CodegenServer> fromServers(List<Server> servers, String jsonPath);
+    CodegenSchema fromServerVariables(Map<String, ServerVariable> variables, String jsonPath);
+    CodegenRequestBody fromRequestBody(RequestBody body, String sourceJsonPath);
+    CodegenResponse fromResponse(ApiResponse response, String sourceJsonPath);
+    CodegenHeader fromHeader(Header parameter, String sourceJsonPath);
+    CodegenParameter fromParameter(Parameter parameter, String sourceJsonPath);
+
+}
diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java
index d6a70222a17..b524ab0312d 100644
--- a/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java
+++ b/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java
@@ -25,6 +25,9 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
+import org.openapijsonschematools.codegen.config.GeneratorSettings;
+import org.openapijsonschematools.codegen.config.WorkflowSettings;
+import org.openapijsonschematools.codegen.generators.generatormetadata.FeatureSet;
 import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorLanguage;
 import org.openapijsonschematools.codegen.generators.models.CliOption;
 import org.openapijsonschematools.codegen.common.CodegenConstants;
@@ -36,6 +39,7 @@
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenKeyType;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenPatternInfo;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema;
+import org.openapijsonschematools.codegen.generators.models.GeneratedFileType;
 import org.openapijsonschematools.codegen.templating.SupportingFile;
 import org.openapijsonschematools.codegen.generators.generatormetadata.features.DataTypeFeature;
 import org.openapijsonschematools.codegen.generators.generatormetadata.features.DocumentationFeature;
@@ -57,7 +61,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.validation.constraints.NotNull;
 import java.io.File;
 import java.io.IOException;
 import java.time.OffsetDateTime;
@@ -88,8 +91,6 @@ public class PythonClientGenerator extends DefaultGenerator implements Generator
 
     protected Map<Character, String> regexModifiers;
 
-    private final String testFolder;
-
     // A cache to efficiently look up a Schema instance based on the return value of `toModelName()`.
     private Map<String, Schema> modelNameToSchemaCache;
     private final DateTimeFormatter iso8601Date = DateTimeFormatter.ISO_DATE;
@@ -98,227 +99,233 @@ public class PythonClientGenerator extends DefaultGenerator implements Generator
     private final HashMap<PairCacheKey, String> modelNameCache = new HashMap<>();
     protected String packageVersion = "1.0.0";
     protected String projectName; // for setup.py, e.g. petstore-api
+    private final String testFolder;
 
-    public PythonClientGenerator() {
-        super();
+    private static final FeatureSet featureSet = FeatureSet.newBuilder()
+        .includeDataTypeFeatures(
+            DataTypeFeature.Int32,
+            DataTypeFeature.Int64,
+            DataTypeFeature.Integer,
+            DataTypeFeature.Float,
+            DataTypeFeature.Double,
+            DataTypeFeature.Number,
+            DataTypeFeature.String,
+            DataTypeFeature.Binary,
+            DataTypeFeature.Boolean,
+            DataTypeFeature.Date,
+            DataTypeFeature.DateTime,
+            DataTypeFeature.Uuid,
+            DataTypeFeature.File,
+            DataTypeFeature.Array,
+            DataTypeFeature.Object,
+            DataTypeFeature.Null,
+            DataTypeFeature.AnyType,
+            DataTypeFeature.Enum
+        )
+        .excludeDataTypeFeatures(
+            DataTypeFeature.Byte,
+            DataTypeFeature.Password
+        )
+        .includeSchemaFeatures(
+            SchemaFeature.AdditionalProperties,
+            SchemaFeature.AllOf,
+            SchemaFeature.AnyOf,
+            SchemaFeature.Const,
+            SchemaFeature.Contains,
+            SchemaFeature.Default,
+            SchemaFeature.DependentRequired,
+            SchemaFeature.DependentSchemas,
+            SchemaFeature.Discriminator,
+            SchemaFeature.Else,
+            SchemaFeature.Enum,
+            SchemaFeature.ExclusiveMaximum,
+            SchemaFeature.ExclusiveMinimum,
+            SchemaFeature.Format,
+            SchemaFeature.If,
+            SchemaFeature.Items,
+            SchemaFeature.MaxContains,
+            SchemaFeature.MaxItems,
+            SchemaFeature.MaxLength,
+            SchemaFeature.MaxProperties,
+            SchemaFeature.Maximum,
+            SchemaFeature.MinContains,
+            SchemaFeature.MinItems,
+            SchemaFeature.MinLength,
+            SchemaFeature.MinProperties,
+            SchemaFeature.Minimum,
+            SchemaFeature.MultipleOf,
+            SchemaFeature.Not,
+            SchemaFeature.Nullable,
+            SchemaFeature.OneOf,
+            SchemaFeature.Pattern,
+            SchemaFeature.PatternProperties,
+            SchemaFeature.PrefixItems,
+            SchemaFeature.Properties,
+            SchemaFeature.PropertyNames,
+            SchemaFeature.Ref,
+            SchemaFeature.Required,
+            SchemaFeature.Then,
+            SchemaFeature.Type,
+            SchemaFeature.UnevaluatedItems,
+            SchemaFeature.UnevaluatedProperties,
+            SchemaFeature.UniqueItems
+        )
+        .includeDocumentationFeatures(
+            DocumentationFeature.Readme,
+            DocumentationFeature.Servers,
+            DocumentationFeature.Security,
+            DocumentationFeature.ComponentSchemas,
+            DocumentationFeature.ComponentResponses,
+            DocumentationFeature.ComponentParameters,
+            DocumentationFeature.ComponentRequestBodies,
+            DocumentationFeature.ComponentHeaders,
+            DocumentationFeature.ComponentSecuritySchemes,
+            DocumentationFeature.Api
+        )
+        .includeWireFormatFeatures(WireFormatFeature.JSON, WireFormatFeature.Custom)
+        .includeSecurityFeatures(
+            SecurityFeature.ApiKey,
+            SecurityFeature.HTTP_Basic,
+            SecurityFeature.HTTP_Bearer
+        )
+        .includeGlobalFeatures(
+            GlobalFeature.Info,
+            GlobalFeature.Servers,
+            GlobalFeature.Paths,
+            GlobalFeature.Components,
+            GlobalFeature.Security,
+            GlobalFeature.Tags
+        )
+        .includeComponentsFeatures(
+            ComponentsFeature.schemas,
+            ComponentsFeature.responses,
+            ComponentsFeature.parameters,
+            ComponentsFeature.requestBodies,
+            ComponentsFeature.headers,
+            ComponentsFeature.securitySchemes
+        )
+        .includeParameterFeatures(
+            ParameterFeature.Name,
+            ParameterFeature.Required,
+            ParameterFeature.In_Path,
+            ParameterFeature.In_Query,
+            ParameterFeature.In_Header,
+            ParameterFeature.Style_Matrix,
+            ParameterFeature.Style_Label,
+            ParameterFeature.Style_Form,
+            ParameterFeature.Style_Simple,
+            ParameterFeature.Style_PipeDelimited,
+            ParameterFeature.Style_SpaceDelimited,
+            ParameterFeature.Explode,
+            ParameterFeature.Schema,
+            ParameterFeature.Content
+        )
+        .includeOperationFeatures(
+            OperationFeature.Responses_Default,
+            OperationFeature.Responses_HttpStatusCode,
+            OperationFeature.Responses_RangedResponseCodes,
+            OperationFeature.Responses_RedirectionResponse,
+            OperationFeature.Security,
+            OperationFeature.Servers
+        )
+    .build();
+    public static final GeneratorMetadata generatorMetadata = GeneratorMetadata.newBuilder()
+        .name("python")
+            .language(GeneratorLanguage.PYTHON)
+            .languageVersion(">=3.8")
+            .type(GeneratorType.CLIENT)
+            .stability(Stability.STABLE)
+            .featureSet(featureSet)
+            .generationMessage(String.format(Locale.ROOT, "OpenAPI JSON Schema Generator: %s (%s)", "python", GeneratorType.CLIENT))
+        .helpMsg(String.join(
+            "<br />",
+              "Generates a Python client library",
+            "",
+            "Features in this generator:",
+            "- type hints on endpoints and model creation",
+            "- model parameter names use the spec defined keys and cases",
+            "- robust composition (oneOf/anyOf/allOf/not) where payload data is stored in one instance only",
+            "- endpoint parameter names use the spec defined keys and cases",
+            "- inline schemas are supported at any location including composition",
+            "- multiple content types supported in request body and response bodies",
+            "- run time type checking + json schema validation",
+            "- json schema keyword validation may be selectively disabled with SchemaConfiguration",
+            "- enums of type string/integer/boolean typed using typing.Literal",
+            "- mypy static type checking run on generated sample",
+            "- Sending/receiving decimals as strings supported with type:string format: number -> DecimalSchema",
+            "- Sending/receiving uuids as strings supported with type:string format: uuid -> UUIDSchema",
+            "- quicker load time for python modules (a single endpoint can be imported and used without loading others)",
+            "- composed schemas with type constraints supported (type:object + oneOf/anyOf/allOf)",
+            "- schemas are not coerced/cast. For example string + date are both stored as string, and there is a date accessor"
+        ))
+        .postGenerationMsg(defaultPostGenerationMsg)
+        .reservedWords(
+            getLowerCaseWords(
+                Arrays.asList( // from https://docs.python.org/3/reference/lexical_analysis.html#keywords
+                    // local variable name used in API methods (endpoints)
+                    "resource_path", "path_params", "query_params",
+                    "header_params", "cookie_params",
+                    // @property
+                    "property", "@property",
+                    // python reserved words
+                    "and", "del", "from", "not", "while", "as", "elif", "global", "or", "with",
+                    "assert", "else", "if", "pass", "yield", "break", "except", "import",
+                    "print", "class", "exec", "in", "raise", "continue", "finally", "is",
+                    "return", "def", "for", "lambda", "try", "self", "nonlocal", "None", "True",
+                    "False", "async", "await",
+                    // imports, imports_schema_types.handlebars, include these to prevent name collision
+                    "datetime", "decimal", "functools", "io", "re",
+                    "typing", "typing_extensions", "uuid", "immutabledict", "schemas",
+                    // types
+                    "float", "int", "str", "bool", "dict", "immutabledict", "list", "tuple"
+                )
+            )
+        )
+        .instantiationTypes(
+            Map.ofEntries(
+                new AbstractMap.SimpleEntry<>("object", "immutabledict.immutabledict"),
+                new AbstractMap.SimpleEntry<>("array", "tuple"),
+                new AbstractMap.SimpleEntry<>("string", "str"),
+                new AbstractMap.SimpleEntry<>("number", "typing.Union[float, int]"),
+                new AbstractMap.SimpleEntry<>("integer", "int"),
+                new AbstractMap.SimpleEntry<>("boolean", "bool"),
+                new AbstractMap.SimpleEntry<>("null", "None")
+            )
+        )
+        .languageSpecificPrimitives(
+            Set.of(
+                "int",
+                "float",
+                "list",
+                "dict",
+                "bool",
+                "str",
+                "datetime",
+                "date",
+                "object",
+                "file",
+                "bytes",
+                "None"
+            )
+        )
+    .build();
+
+    public PythonClientGenerator(GeneratorSettings generatorSettings, WorkflowSettings workflowSettings) {
+        super(
+            generatorSettings,
+            workflowSettings,
+            "python",
+            "openapi_client",
+            "openapi_client",
+            "generated_code" + File.separator + "python"
+        );
+        testFolder = "test";
         loadDeepObjectIntoItems = false;
         importBaseType = false;
         addSchemaImportsFromV3SpecLocations = true;
         removeEnumValuePrefix = false;
 
-        packageName = "openapi_client";
-
-        // from https://docs.python.org/3/reference/lexical_analysis.html#keywords
-        setReservedWordsLowerCase(
-                Arrays.asList(
-                        // local variable name used in API methods (endpoints)
-                        "all_params", "resource_path", "path_params", "query_params",
-                        "header_params", "form_params", "local_var_files", "body_params", "auth_settings",
-                        // @property
-                        "property",
-                        // python reserved words
-                        "and", "del", "from", "not", "while", "as", "elif", "global", "or", "with",
-                        "assert", "else", "if", "pass", "yield", "break", "except", "import",
-                        "print", "class", "exec", "in", "raise", "continue", "finally", "is",
-                        "return", "def", "for", "lambda", "try", "self", "nonlocal", "None", "True",
-                        "False", "async", "await",
-                        // imports, imports_schema_types.handlebars, include these to prevent name collision
-                        "datetime", "decimal", "functools", "io", "re",
-                        "typing", "typing_extensions", "uuid", "immutabledict", "schemas"
-                ));
-
-        languageSpecificPrimitives.clear();
-        languageSpecificPrimitives.add("int");
-        languageSpecificPrimitives.add("float");
-        languageSpecificPrimitives.add("list");
-        languageSpecificPrimitives.add("dict");
-        languageSpecificPrimitives.add("bool");
-        languageSpecificPrimitives.add("str");
-        languageSpecificPrimitives.add("datetime");
-        languageSpecificPrimitives.add("date");
-        languageSpecificPrimitives.add("object");
-        // TODO file and binary is mapped as `file`
-        languageSpecificPrimitives.add("file");
-        languageSpecificPrimitives.add("bytes");
-
-        typeMapping.clear();
-        typeMapping.put("integer", "int");
-        typeMapping.put("float", "float");
-        typeMapping.put("number", "float");
-        typeMapping.put("long", "int");
-        typeMapping.put("double", "float");
-        typeMapping.put("array", "list");
-        typeMapping.put("set", "list");
-        typeMapping.put("map", "dict");
-        typeMapping.put("boolean", "bool");
-        typeMapping.put("string", "str");
-        typeMapping.put("date", "date");
-        typeMapping.put("DateTime", "datetime");
-        typeMapping.put("object", "object");
-        typeMapping.put("AnyType", "object");
-        typeMapping.put("file", "file");
-        // TODO binary should be mapped to byte array
-        // mapped to String as a workaround
-        typeMapping.put("binary", "str");
-        typeMapping.put("ByteArray", "str");
-        // map uuid to string for the time being
-        typeMapping.put("UUID", "str");
-        typeMapping.put("URI", "str");
-        typeMapping.put("null", "none_type");
-
-        modifyFeatureSet(features -> features
-                .includeDataTypeFeatures(
-                        DataTypeFeature.Int32,
-                        DataTypeFeature.Int64,
-                        DataTypeFeature.Integer,
-                        DataTypeFeature.Float,
-                        DataTypeFeature.Double,
-                        DataTypeFeature.Number,
-                        DataTypeFeature.String,
-                        DataTypeFeature.Binary,
-                        DataTypeFeature.Boolean,
-                        DataTypeFeature.Date,
-                        DataTypeFeature.DateTime,
-                        DataTypeFeature.Uuid,
-                        DataTypeFeature.File,
-                        DataTypeFeature.Array,
-                        DataTypeFeature.Object,
-                        DataTypeFeature.Null,
-                        DataTypeFeature.AnyType,
-                        DataTypeFeature.Enum
-                )
-                .excludeDataTypeFeatures(
-                        DataTypeFeature.Byte,
-                        DataTypeFeature.Password
-                )
-                .includeSchemaFeatures(
-                        SchemaFeature.AdditionalProperties,
-                        SchemaFeature.AllOf,
-                        SchemaFeature.AnyOf,
-                        SchemaFeature.Const,
-                        SchemaFeature.Contains,
-                        SchemaFeature.Default,
-                        SchemaFeature.DependentRequired,
-                        SchemaFeature.DependentSchemas,
-                        SchemaFeature.Discriminator,
-                        SchemaFeature.Else,
-                        SchemaFeature.Enum,
-                        SchemaFeature.ExclusiveMaximum,
-                        SchemaFeature.ExclusiveMinimum,
-                        SchemaFeature.Format,
-                        SchemaFeature.If,
-                        SchemaFeature.Items,
-                        SchemaFeature.MaxContains,
-                        SchemaFeature.MaxItems,
-                        SchemaFeature.MaxLength,
-                        SchemaFeature.MaxProperties,
-                        SchemaFeature.Maximum,
-                        SchemaFeature.MinContains,
-                        SchemaFeature.MinItems,
-                        SchemaFeature.MinLength,
-                        SchemaFeature.MinProperties,
-                        SchemaFeature.Minimum,
-                        SchemaFeature.MultipleOf,
-                        SchemaFeature.Not,
-                        SchemaFeature.Nullable,
-                        SchemaFeature.OneOf,
-                        SchemaFeature.Pattern,
-                        SchemaFeature.PatternProperties,
-                        SchemaFeature.PrefixItems,
-                        SchemaFeature.Properties,
-                        SchemaFeature.PropertyNames,
-                        SchemaFeature.Ref,
-                        SchemaFeature.Required,
-                        SchemaFeature.Then,
-                        SchemaFeature.Type,
-                        SchemaFeature.UnevaluatedItems,
-                        SchemaFeature.UnevaluatedProperties,
-                        SchemaFeature.UniqueItems
-                )
-                .includeDocumentationFeatures(
-                        DocumentationFeature.Readme,
-                        DocumentationFeature.Servers,
-                        DocumentationFeature.Security,
-                        DocumentationFeature.ComponentSchemas,
-                        DocumentationFeature.ComponentResponses,
-                        DocumentationFeature.ComponentParameters,
-                        DocumentationFeature.ComponentRequestBodies,
-                        DocumentationFeature.ComponentHeaders,
-                        DocumentationFeature.ComponentSecuritySchemes,
-                        DocumentationFeature.Api
-                )
-                .includeWireFormatFeatures(WireFormatFeature.JSON, WireFormatFeature.Custom)
-                .includeSecurityFeatures(
-                        SecurityFeature.ApiKey,
-                        SecurityFeature.HTTP_Basic,
-                        SecurityFeature.HTTP_Bearer
-                )
-                .includeGlobalFeatures(
-                        GlobalFeature.Info,
-                        GlobalFeature.Servers,
-                        GlobalFeature.Paths,
-                        GlobalFeature.Components,
-                        GlobalFeature.Security,
-                        GlobalFeature.Tags
-                )
-                .includeComponentsFeatures(
-                        ComponentsFeature.schemas,
-                        ComponentsFeature.responses,
-                        ComponentsFeature.parameters,
-                        ComponentsFeature.requestBodies,
-                        ComponentsFeature.headers,
-                        ComponentsFeature.securitySchemes
-                )
-                .includeParameterFeatures(
-                        ParameterFeature.Name,
-                        ParameterFeature.Required,
-                        ParameterFeature.In_Path,
-                        ParameterFeature.In_Query,
-                        ParameterFeature.In_Header,
-                        ParameterFeature.Style_Matrix,
-                        ParameterFeature.Style_Label,
-                        ParameterFeature.Style_Form,
-                        ParameterFeature.Style_Simple,
-                        ParameterFeature.Style_PipeDelimited,
-                        ParameterFeature.Style_SpaceDelimited,
-                        ParameterFeature.Explode,
-                        ParameterFeature.Schema,
-                        ParameterFeature.Content
-                )
-                .includeOperationFeatures(
-                        OperationFeature.Responses_Default,
-                        OperationFeature.Responses_HttpStatusCode,
-                        OperationFeature.Responses_RangedResponseCodes,
-                        OperationFeature.Responses_RedirectionResponse,
-                        OperationFeature.Security,
-                        OperationFeature.Servers
-                )
-        );
-
         modelPackage = "components.schema";
-        apiPackage = "apis";
-        outputFolder = "generated-code" + File.separatorChar + "python";
-
-        embeddedTemplateDir = templateDir = "python";
-
-        testFolder = "test";
-
-        // default HIDE_GENERATION_TIMESTAMP to true
-        hideGenerationTimestamp = Boolean.TRUE;
-
-        // from https://docs.python.org/3/reference/lexical_analysis.html#keywords
-        setReservedWordsLowerCase(
-                Arrays.asList(
-                        // @property
-                        "property",
-                        // python reserved words
-                        "and", "del", "from", "not", "while", "as", "elif", "global", "or", "with",
-                        "assert", "else", "if", "pass", "yield", "break", "except", "import",
-                        "print", "class", "exec", "in", "raise", "continue", "finally", "is",
-                        "return", "def", "for", "lambda", "try", "self", "nonlocal", "None", "True",
-                        "False", "async", "await",
-                        // types
-                        "float", "int", "str", "bool", "dict", "immutabledict", "list", "tuple"));
 
         regexModifiers = new HashMap<>();
         regexModifiers.put('i', "IGNORECASE");
@@ -328,11 +335,10 @@ public PythonClientGenerator() {
         regexModifiers.put('u', "UNICODE");
 
         cliOptions.clear();
-        cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "python package name (convention: snake_case).")
-                .defaultValue("openapi_client"));
+        // TODO ensure that PACKAGE_NAME + TEMPLATING_ENGINE is documented in help
         cliOptions.add(new CliOption(CodegenConstants.PROJECT_NAME, "python project name in setup.py (e.g. petstore-api)."));
         cliOptions.add(new CliOption(CodegenConstants.PACKAGE_VERSION, "python package version.")
-                .defaultValue("1.0.0"));
+            .defaultValue("1.0.0"));
         cliOptions.add(new CliOption(PACKAGE_URL, "python package URL."));
         // this generator does not use SORT_PARAMS_BY_REQUIRED_FLAG
         // this generator uses the following order for endpoint parameters and model properties
@@ -340,18 +346,12 @@ public PythonClientGenerator() {
         // optional params which are set to unset as their default for method signatures only
         // optional params as **kwargs
         cliOptions.add(new CliOption(CodegenConstants.HIDE_GENERATION_TIMESTAMP, CodegenConstants.HIDE_GENERATION_TIMESTAMP_DESC)
-                .defaultValue(Boolean.TRUE.toString()));
+            .defaultValue(Boolean.TRUE.toString()));
         cliOptions.add(new CliOption(CodegenConstants.SOURCECODEONLY_GENERATION, CodegenConstants.SOURCECODEONLY_GENERATION_DESC)
-                .defaultValue(Boolean.FALSE.toString()));
+            .defaultValue(Boolean.FALSE.toString()));
         cliOptions.add(CliOption.newBoolean(USE_NOSE, "use the nose test framework").
-                defaultValue(Boolean.FALSE.toString()));
+            defaultValue(Boolean.FALSE.toString()));
         cliOptions.add(new CliOption(RECURSION_LIMIT, "Set the recursion limit. If not set, use the system default value."));
-        CliOption templateEngineOption = new CliOption(CodegenConstants.TEMPLATING_ENGINE, "template engine");
-        templateEngineOption.setDefault("handlebars");
-        Map<String, String> templateEngineEnumValueToDesc = new HashMap<>();
-        templateEngineEnumValueToDesc.put("handlebars", "handlebars templating engine");
-        templateEngineOption.setEnum(templateEngineEnumValueToDesc);
-        cliOptions.add(templateEngineOption);
         CliOption nonCompliantUseDiscrIfCompositionFails = CliOption.newBoolean(CodegenConstants.NON_COMPLIANT_USE_DISCR_IF_COMPOSITION_FAILS, CodegenConstants.NON_COMPLIANT_USE_DISCR_IF_COMPOSITION_FAILS_DESC);
         Map<String, String> nonCompliantUseDiscrIfCompositionFailsOpts = new HashMap<>();
         nonCompliantUseDiscrIfCompositionFailsOpts.put("true", "If composition fails and a discriminator exists, the composition errors will be ignored and validation will be attempted with the discriminator");
@@ -364,22 +364,11 @@ public PythonClientGenerator() {
         // In principle, this should be enabled by default for all code generators. However, due to limitations
         // in other code generators, support needs to be enabled on a case-by-case basis.
         supportsAdditionalPropertiesWithComposedSchema = true;
+    }
 
-        // this tells users what openapi types turn in to
-        instantiationTypes.put("object", "immutabledict.immutabledict");
-        instantiationTypes.put("array", "tuple");
-        instantiationTypes.put("string", "str");
-        instantiationTypes.put("number", "typing.Union[float, int]");
-        instantiationTypes.put("integer", "int");
-        instantiationTypes.put("boolean", "bool");
-        instantiationTypes.put("null", "None");
-
-        languageSpecificPrimitives.add("file_type");
-        languageSpecificPrimitives.add("none_type");
-
-        generatorMetadata = GeneratorMetadata.newBuilder(generatorMetadata)
-                .stability(Stability.STABLE)
-                .build();
+    @Override
+    public GeneratorMetadata getGeneratorMetadata() {
+        return generatorMetadata;
     }
 
     @Override
@@ -396,7 +385,7 @@ public void processOpts() {
 
         super.processOpts();
 
-        if (!"handlebars".equals(this.templateEngineName)) {
+        if (!"handlebars".equals(generatorSettings.templateEngineName)) {
             throw new RuntimeException("Only the HandlebarsEngineAdapter is supported for this generator");
         }
 
@@ -681,24 +670,19 @@ public void processOpts() {
 
         boolean excludeTests = false;
 
-        if (additionalProperties.containsKey(CodegenConstants.PACKAGE_NAME)) {
-            setPackageName((String) additionalProperties.get(CodegenConstants.PACKAGE_NAME));
-        }
 
+        if (additionalProperties.containsKey(CodegenConstants.PACKAGE_VERSION)) {
+            setPackageVersion((String) additionalProperties.get(CodegenConstants.PACKAGE_VERSION));
+        }
         if (additionalProperties.containsKey(CodegenConstants.PROJECT_NAME)) {
             setProjectName((String) additionalProperties.get(CodegenConstants.PROJECT_NAME));
         } else {
             // default: set project based on package name
             // e.g. petstore_api (package name) => petstore-api (project name)
-            setProjectName(packageName.replaceAll("_", "-"));
-        }
-
-        if (additionalProperties.containsKey(CodegenConstants.PACKAGE_VERSION)) {
-            setPackageVersion((String) additionalProperties.get(CodegenConstants.PACKAGE_VERSION));
+            setProjectName(generatorSettings.packageName.replaceAll("_", "-"));
         }
 
         additionalProperties.put(CodegenConstants.PROJECT_NAME, projectName);
-        additionalProperties.put(CodegenConstants.PACKAGE_NAME, packageName);
         additionalProperties.put(CodegenConstants.PACKAGE_VERSION, packageVersion);
 
         if (additionalProperties.containsKey(CodegenConstants.EXCLUDE_TESTS)) {
@@ -766,7 +750,7 @@ public void processOpts() {
         supportingFiles.add(new SupportingFile("configurations" + File.separatorChar + "api_configuration.hbs", packagePath() + File.separatorChar + "configurations", "api_configuration.py"));
 
         // If the package name consists of dots(openapi.client), then we need to create the directory structure like openapi/client with __init__ files.
-        String[] packageNameSplits = packageName.split("\\.");
+        String[] packageNameSplits = generatorSettings.packageName.split("\\.");
         String currentPackagePath = "";
         for (int i = 0; i < packageNameSplits.length - 1; i++) {
             if (i > 0) {
@@ -909,29 +893,6 @@ public String getName() {
         return "python";
     }
 
-    @Override
-    public String getHelp() {
-        return String.join("<br />",
-                "Generates a Python client library",
-                "",
-                "Features in this generator:",
-                "- type hints on endpoints and model creation",
-                "- model parameter names use the spec defined keys and cases",
-                "- robust composition (oneOf/anyOf/allOf/not) where payload data is stored in one instance only",
-                "- endpoint parameter names use the spec defined keys and cases",
-                "- inline schemas are supported at any location including composition",
-                "- multiple content types supported in request body and response bodies",
-                "- run time type checking + json schema validation",
-                "- json schema keyword validation may be selectively disabled with SchemaConfiguration",
-                "- enums of type string/integer/boolean typed using typing.Literal",
-                "- mypy static type checking run on generated sample",
-                "- Sending/receiving decimals as strings supported with type:string format: number -> DecimalSchema",
-                "- Sending/receiving uuids as strings supported with type:string format: uuid -> UUIDSchema",
-                "- quicker load time for python modules (a single endpoint can be imported and used without loading others)",
-                "- composed schemas with type constraints supported (type:object + oneOf/anyOf/allOf)",
-                "- schemas are not coerced/cast. For example string + date are both stored as string, and there is a date accessor");
-    }
-
     public String pythonDate(Object dateValue) {
         String strValue;
         if (dateValue instanceof OffsetDateTime) {
@@ -974,7 +935,7 @@ public String toModelImport(String refClass) {
             return null;
         }
         String modelModule = refClassPieces[0];
-        return "from " + packageName + "." +  modelPackage() + " import " + modelModule;
+        return "from " + generatorSettings.packageName + "." +  modelPackage + " import " + modelModule;
     }
 
     /***
@@ -1004,7 +965,7 @@ public TreeMap<String, CodegenSchema> postProcessAllModels(TreeMap<String, Codeg
         boolean testFolderSet = testFolder != null;
         if (testFolderSet && anyModelContainsTestCases) {
             // delete the test folder because tests there will be autogenerated
-            String testPath = outputFolder + File.separatorChar + testFolder;
+            String testPath = generatorSettings.outputFolder + File.separatorChar + testFolder;
             File testDirectory = new File(testPath);
             try {
                 FileUtils.cleanDirectory(testDirectory);
@@ -1752,33 +1713,6 @@ protected Map<String, Schema> getModelNameToSchemaCache() {
         return modelNameToSchemaCache;
     }
 
-    @Override
-    public GeneratorType getTag() {
-        return GeneratorType.CLIENT;
-    }
-
-    @Override
-    public String toResponseModuleName(String componentName, String jsonPath) {
-        String[] pathPieces = jsonPath.split("/");
-        if (jsonPath.startsWith("#/components/responses")) {
-            if (pathPieces.length == 3) {
-                return "responses";
-            }// #/components/responses/SomeResponse
-            // #/components/responses/SomeResponse/content/schema
-            String suffix = toModuleFilename(componentName, jsonPath);
-            String spacer = "";
-            if (!suffix.startsWith("_")) {
-                spacer = "_";
-            }
-            return "response" + spacer + suffix;
-        }
-        if (pathPieces.length == 5) {// #/paths/somePath/verb/responses
-            return "responses";
-        }// #/paths/somePath/verb/responses/200
-        // #/paths/somePath/verb/responses/200/content/schema
-        return "response_" + componentName.toLowerCase(Locale.ROOT);
-    }
-
     public void setUseNose(String val) {
         this.useNose = Boolean.parseBoolean(val);
     }
@@ -1790,7 +1724,7 @@ public void setPackageUrl(String packageUrl) {
     public String packagePath() {
         // src is needed for modern packaging per
         // https://packaging.python.org/en/latest/tutorials/packaging-projects/
-        return "src" + File.separatorChar + packageName.replace('.', File.separatorChar);
+        return "src" + File.separatorChar + generatorSettings.packageName.replace('.', File.separatorChar);
     }
 
 
@@ -1803,9 +1737,6 @@ public String defaultTemplatingEngine() {
         return "handlebars";
     }
 
-    @Override
-    public String generatorLanguageVersion() { return ">=3.8"; }
-
     @Override
     public void preprocessOpenAPI(OpenAPI openAPI) {
         String originalSpecVersion;
@@ -1838,10 +1769,10 @@ protected String getRefClassWithModule(String ref, String sourceJsonPath) {
 
     @Override
     public String getFilename(CodegenKeyType type, String lastJsonPathFragment, String jsonPath) {
+        String[] pathPieces = jsonPath.split("/");
         switch(type) {
             case SCHEMA:
-                String[] pieces = jsonPath.split("/");
-                String name = pieces[pieces.length - 1];
+                String name = pathPieces[pathPieces.length - 1];
                 if (name.equals("Headers") && jsonPath.contains("/responses/")) {
                     // synthetic response headers jsonPath
                     return "header_parameters";
@@ -1857,8 +1788,7 @@ public String getFilename(CodegenKeyType type, String lastJsonPathFragment, Stri
             case OPERATION:
                 return lastJsonPathFragment;
             case PARAMETER:
-                String[] paramPathPieces = jsonPath.split("/");
-                if (operationVerbs.contains(paramPathPieces[3]) && paramPathPieces.length == 5) {
+                if (operationVerbs.contains(pathPieces[3]) && pathPieces.length == 5) {
                     // #/paths/somePath/verb/parameters
                     return "parameters";
                 }
@@ -1874,7 +1804,6 @@ public String getFilename(CodegenKeyType type, String lastJsonPathFragment, Stri
             case PATH:
                 return toModuleFilename(lastJsonPathFragment, jsonPath);
             case HEADER:
-                String[] pathPieces = jsonPath.split("/");
                 if ((pathPieces.length == 5 || pathPieces.length == 7) && lastJsonPathFragment.equals("headers")) {
                     // #/components/responses/SomeResponse/headers
                     // #/paths/somePath/verb/responses/200/headers
@@ -1893,16 +1822,29 @@ public String getFilename(CodegenKeyType type, String lastJsonPathFragment, Stri
                     return "security";
                 }
                 return "security_requirement_object_" + lastJsonPathFragment;
+            case RESPONSE:
+                if (jsonPath.startsWith("#/components/responses")) {
+                    if (pathPieces.length == 3) {
+                        return "responses";
+                    }// #/components/responses/SomeResponse
+                    // #/components/responses/SomeResponse/content/schema
+                    String suffix = toModuleFilename(lastJsonPathFragment, jsonPath);
+                    String spacer = "";
+                    if (!suffix.startsWith("_")) {
+                        spacer = "_";
+                    }
+                    return "response" + spacer + suffix;
+                }
+                if (pathPieces.length == 5) {// #/paths/somePath/verb/responses
+                    return "responses";
+                }// #/paths/somePath/verb/responses/200
+                // #/paths/somePath/verb/responses/200/content/schema
+                return "response_" + lastJsonPathFragment.toLowerCase(Locale.ROOT);
             default:
                 return null;
         }
     }
 
-    @Override
-    public String toParamName(String basename) {
-        return getFilename(CodegenKeyType.PARAMETER, basename, null);
-    }
-
     private String toSchemaRefClass(String ref, String sourceJsonPath) {
         String[] refPieces = ref.split("/");
         if (ref.equals(sourceJsonPath)) {
@@ -1929,7 +1871,7 @@ private String toSchemaRefClass(String ref, String sourceJsonPath) {
         if (sourceJsonPath != null && ref.startsWith(sourceJsonPath + "/")) {
             // internal in-schema reference, no import needed
             // TODO handle this in the future
-            if (getFilepath(sourceJsonPath).equals(getFilepath(ref))) {
+            if (getFilePath(GeneratedFileType.CODE, sourceJsonPath).equals(getFilePath(GeneratedFileType.CODE, ref))) {
                 // TODO ensure that getFilepath returns the same file for somePath/get/QueryParameters
                 // TODO ensure that getFilepath returns the same file for schemas/SomeSchema...
                 return null;
@@ -2093,18 +2035,6 @@ public String getOperationIdSnakeCase(String operationId) {
         return underscore(sanitizeName(operationId));
     }
 
-    @Override
-    public void postProcess() {
-        LOGGER.info("################################################################################");
-        LOGGER.info("# Thanks for using OpenAPI JSON Schema Generator.                              #");
-        LOGGER.info("# Please consider donation to help us maintain this project \uD83D\uDE4F                 #");
-        LOGGER.info("# https://github.com/sponsors/spacether                                        #");
-        LOGGER.info("#                                                                              #");
-        LOGGER.info("# This generator was written by Justin Black (https://github.com/spacether)    #");
-        LOGGER.info("# Please support his work directly via https://github.com/sponsors/spacether \uD83D\uDE4F#");
-        LOGGER.info("################################################################################");
-    }
-
     @Override
     public String getPascalCase(CodegenKeyType type, String lastJsonPathFragment, String jsonPath) {
         switch (type) {
@@ -2223,11 +2153,6 @@ public void postProcessFile(File file, String fileType) {
         }
     }
 
-    public void setPackageName(String packageName) {
-        this.packageName = packageName;
-        additionalProperties.put(CodegenConstants.PACKAGE_NAME, this.packageName);
-    }
-
     public void setProjectName(String projectName) {
         this.projectName = projectName;
     }
diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/generatorloader/GeneratorLoader.java b/src/main/java/org/openapijsonschematools/codegen/generators/generatorloader/GeneratorLoader.java
index fd0c72d4864..b74352ca021 100644
--- a/src/main/java/org/openapijsonschematools/codegen/generators/generatorloader/GeneratorLoader.java
+++ b/src/main/java/org/openapijsonschematools/codegen/generators/generatorloader/GeneratorLoader.java
@@ -17,19 +17,56 @@
 
 package org.openapijsonschematools.codegen.generators.generatorloader;
 
+import org.openapijsonschematools.codegen.config.GeneratorSettings;
+import org.openapijsonschematools.codegen.config.WorkflowSettings;
 import org.openapijsonschematools.codegen.generators.Generator;
+import org.openapijsonschematools.codegen.generators.JavaClientGenerator;
+import org.openapijsonschematools.codegen.generators.PythonClientGenerator;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.AbstractMap;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.ServiceLoader;
+import java.util.Set;
 
 public class GeneratorLoader {
+    private static final Map<String, Class<? extends Generator>> generatorNameToGenerator = Map.ofEntries(
+        new AbstractMap.SimpleEntry<>(JavaClientGenerator.generatorMetadata.getName(), JavaClientGenerator.class),
+        new AbstractMap.SimpleEntry<>(PythonClientGenerator.generatorMetadata.getName(), PythonClientGenerator.class)
+    );
+
+    public static Generator getGenerator(String name, GeneratorSettings generatorSettings, WorkflowSettings workflowSettings) {
+        StringBuilder availableConfigs = new StringBuilder();
+        for (String generatorName : generatorNameToGenerator.keySet()) {
+            availableConfigs.append(generatorName).append("\n");
+        }
+
+        GeneratorNotFoundException exc = new GeneratorNotFoundException("Can't load config class with name '".concat(name) + "'\nAvailable:\n" + availableConfigs);
+        for (Map.Entry<String,  Class<? extends Generator>> entry : generatorNameToGenerator.entrySet()) {
+            if (entry.getKey().equals(name)) {
+                try {
+                    Constructor<?> constructor = entry.getValue().getDeclaredConstructor(GeneratorSettings.class, WorkflowSettings.class);
+                    return (Generator) constructor.newInstance(generatorSettings, workflowSettings);
+                } catch (NoSuchMethodException | InvocationTargetException | InstantiationException |
+                         IllegalAccessException e) {
+                    throw exc;
+                }
+            }
+        }
+        throw exc;
+    }
+
     /**
      * Tries to load config class with SPI first, then with class name directly from classpath
      *
      * @param name name of config, or full qualified class name in classpath
      * @return config class
      */
+    @Deprecated
     public static Generator forName(String name) {
         ServiceLoader<Generator> loader = ServiceLoader.load(Generator.class, Generator.class.getClassLoader());
 
@@ -52,11 +89,11 @@ public static Generator forName(String name) {
     }
 
     public static List<Generator> getAll() {
-        ServiceLoader<Generator> loader = ServiceLoader.load(Generator.class, Generator.class.getClassLoader());
-        List<Generator> output = new ArrayList<Generator>();
-        for (Generator aLoader : loader) {
-            output.add(aLoader);
+        List<Generator> genrators = new ArrayList<Generator>();
+        for (String generatorName: generatorNameToGenerator.keySet()) {
+            Generator generator = getGenerator(generatorName, null, null);
+            genrators.add(generator);
         }
-        return output;
+        return genrators;
     }
 }
diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorMetadata.java b/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorMetadata.java
index 2741975c181..d25852be1f1 100644
--- a/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorMetadata.java
+++ b/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorMetadata.java
@@ -17,24 +17,44 @@
 package org.openapijsonschematools.codegen.generators.generatormetadata;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * Represents metadata about a generator.
  */
 @SuppressWarnings("WeakerAccess")
 public class GeneratorMetadata {
+    private String name;
+    private GeneratorLanguage language;
+    private String languageVersion;
+    private GeneratorType type;
     private Stability stability;
     private Map<String, FeatureSet> libraryFeatures;
     private FeatureSet featureSet;
     private String generationMessage;
+    private String helpMsg;
+    private List<String> postGenerationMsg;
+    private Set<String> reservedWords;
+    private Map<String, String> instantiationTypes;
+    private Set<String> languageSpecificPrimitives;
 
     private GeneratorMetadata(Builder builder) {
         if (builder != null) {
+            name = builder.name;
+            language = builder.language;
+            languageVersion = builder.languageVersion;
+            type = builder.type;
             stability = builder.stability;
             generationMessage = builder.generationMessage;
             libraryFeatures = builder.libraryFeatures;
             featureSet = builder.featureSet;
+            helpMsg = builder.helpMsg;
+            postGenerationMsg = builder.postGenerationMsg;
+            reservedWords = builder.reservedWords;
+            instantiationTypes = builder.instantiationTypes;
+            languageSpecificPrimitives = builder.languageSpecificPrimitives;
         }
     }
 
@@ -50,14 +70,31 @@ public static Builder newBuilder() {
     public static Builder newBuilder(GeneratorMetadata copy) {
         Builder builder = new Builder();
         if (copy != null) {
+            builder.name = copy.getName();
+            builder.language = copy.getLanguage();
+            builder.languageVersion = copy.getLanguageVersion();
+            builder.type = copy.getType();
             builder.stability = copy.getStability();
             builder.generationMessage = copy.getGenerationMessage();
             builder.libraryFeatures = copy.getLibraryFeatures();
             builder.featureSet = copy.getFeatureSet();
+            builder.helpMsg = copy.getHelpMsg();
+            builder.postGenerationMsg = copy.getPostGenerationMsg();
+            builder.reservedWords = copy.getReservedWords();
+            builder.instantiationTypes = copy.getInstantiationTypes();
+            builder.languageSpecificPrimitives = copy.getLanguageSpecificPrimitives();
         }
         return builder;
     }
 
+    public String getName() { return name; }
+
+    public GeneratorType getType() { return type; }
+
+    public GeneratorLanguage getLanguage() { return language; }
+
+    public String getLanguageVersion() { return languageVersion; }
+
     /**
      * Returns a message which can be displayed during generation.
      *
@@ -94,18 +131,57 @@ public Map<String, FeatureSet> getLibraryFeatures() {
         return libraryFeatures;
     }
 
+    public String getHelpMsg() { return helpMsg; }
+
+    public List<String> getPostGenerationMsg() { return postGenerationMsg; }
+
+    public Set<String> getReservedWords() { return reservedWords; }
+
+    public Map<String, String> getInstantiationTypes() { return instantiationTypes; }
+
+    public Set<String> getLanguageSpecificPrimitives() { return languageSpecificPrimitives; }
+
     /**
      * {@code GeneratorMetadata} builder static inner class.
      */
     public static final class Builder {
+        private String name;
+        private GeneratorLanguage language;
+        private String languageVersion;
+        private GeneratorType type;
         private Stability stability;
         private String generationMessage;
         private FeatureSet featureSet = FeatureSet.UNSPECIFIED;
         private Map<String, FeatureSet> libraryFeatures = new HashMap<>();
+        private String helpMsg;
+        private List<String> postGenerationMsg;
+        private Set<String> reservedWords;
+        private Map<String, String> instantiationTypes;
+        private Set<String> languageSpecificPrimitives;
 
         private Builder() {
         }
 
+        public Builder name(String name) {
+            this.name = name;
+            return this;
+        }
+
+        public Builder type(GeneratorType type) {
+            this.type = type;
+            return this;
+        }
+
+        public Builder language(GeneratorLanguage language) {
+            this.language = language;
+            return this;
+        }
+
+        public Builder languageVersion(String languageVersion) {
+            this.languageVersion = languageVersion;
+            return this;
+        }
+
         /**
          * Sets the {@code stability} and returns a reference to this Builder so that the methods can be chained together.
          *
@@ -154,6 +230,31 @@ public Builder generationMessage(String generationMessage) {
             return this;
         }
 
+        public Builder helpMsg(String helpMsg) {
+            this.helpMsg = helpMsg;
+            return this;
+        }
+
+        public Builder postGenerationMsg(List<String> postGenerationMsg) {
+            this.postGenerationMsg = postGenerationMsg;
+            return this;
+        }
+
+        public Builder reservedWords(Set<String> reservedWords) {
+            this.reservedWords = reservedWords;
+            return this;
+        }
+
+        public Builder instantiationTypes(Map<String, String> instantiationTypes) {
+            this.instantiationTypes = instantiationTypes;
+            return this;
+        }
+
+        public Builder languageSpecificPrimitives(Set<String> languageSpecificPrimitives) {
+            this.languageSpecificPrimitives = languageSpecificPrimitives;
+            return this;
+        }
+
         /**
          * Returns a {@code GeneratorMetadata} built from the parameters previously set.
          *
diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/models/CodeGeneratorSettings.java b/src/main/java/org/openapijsonschematools/codegen/generators/models/CodeGeneratorSettings.java
new file mode 100644
index 00000000000..8f1a4bfa682
--- /dev/null
+++ b/src/main/java/org/openapijsonschematools/codegen/generators/models/CodeGeneratorSettings.java
@@ -0,0 +1,102 @@
+package org.openapijsonschematools.codegen.generators.models;
+
+import org.openapijsonschematools.codegen.config.GeneratorSettings;
+import org.openapijsonschematools.codegen.config.WorkflowSettings;
+
+import java.util.Objects;
+
+public class CodeGeneratorSettings {
+    public final String apiPackage;
+    public final String artifactId;
+    public final String outputFolder;
+    public final String templateDir;
+    public final String embeddedTemplateDir;
+    public final String packageName;
+    public final boolean strictSpecBehavior;
+    public final boolean enableMinimalUpdate;  // flag to indicate whether to only update files whose contents have changed
+    public final boolean skipOverwrite;
+    public final boolean removeOperationIdPrefix;
+    public final String ignoreFilePathOverride;
+    public final boolean skipOperationExample;
+    public final boolean enablePostProcessFile;  // boolean value indicating the state of the option for post-processing file using environment variables.
+    public final String templateEngineName;
+    public final String inputSpecLocation;  // input spec's location, as URL or file
+    public final boolean removeEnumValuePrefix;
+    public final boolean hideGenerationTimestamp;
+    public CodeGeneratorSettings(
+        String apiPackage,
+        String artifactId,
+        String outputFolder,
+        String templateDir,
+        String embeddedTemplateDir,
+        String packageName,
+        boolean strictSpecBehavior,
+        boolean enableMinimalUpdate,
+        boolean skipOverwrite,
+        boolean removeOperationIdPrefix,
+        String ignoreFilePathOverride,
+        boolean skipOperationExample,
+        boolean enablePostProcessFile,
+        String templateEngineName,
+        String inputSpecLocation,
+        boolean removeEnumValuePrefix,
+        boolean hideGenerationTimestamp
+    ) {
+        this.apiPackage = apiPackage;
+        this.artifactId = artifactId;
+        this.outputFolder = outputFolder;
+        this.templateDir = templateDir;
+        this.embeddedTemplateDir = embeddedTemplateDir;
+        this.packageName = packageName;
+        this.strictSpecBehavior = strictSpecBehavior;
+        this.enableMinimalUpdate = enableMinimalUpdate;
+        this.skipOverwrite = skipOverwrite;
+        this.removeOperationIdPrefix = removeOperationIdPrefix;
+        this.ignoreFilePathOverride = ignoreFilePathOverride;
+        this.skipOperationExample = skipOperationExample;
+        this.enablePostProcessFile = enablePostProcessFile;
+        this.templateEngineName = templateEngineName;
+        this.inputSpecLocation = inputSpecLocation;
+        this.removeEnumValuePrefix = removeEnumValuePrefix;
+        this.hideGenerationTimestamp = hideGenerationTimestamp;
+    }
+
+    public static CodeGeneratorSettings of(GeneratorSettings generatorSettings, WorkflowSettings workflowSettings, String embeddedTemplateDir, String packageNameDefault, String artifactIdDefault, String outputFolderDefault) {
+        String apiPackageDefault = "apis";
+        String apiPackage = generatorSettings != null ? Objects.requireNonNullElse(generatorSettings.getApiPackage(), apiPackageDefault) : apiPackageDefault;
+        String artifactId = generatorSettings != null ? Objects.requireNonNullElse(generatorSettings.getArtifactId(), artifactIdDefault) : artifactIdDefault;
+        String packageName = generatorSettings != null ? Objects.requireNonNullElse(generatorSettings.getPackageName(), packageNameDefault) : packageNameDefault;
+        String outputDir = workflowSettings != null ? workflowSettings.getOutputDir() : outputFolderDefault;
+        String templateDir = workflowSettings != null ? workflowSettings.getTemplateDir() : null;
+        boolean strictSpecBehavior = workflowSettings != null ? workflowSettings.isStrictSpecBehavior() : WorkflowSettings.DEFAULT_STRICT_SPEC_BEHAVIOR;
+        boolean enableMinimalUpdate = workflowSettings != null ? workflowSettings.isEnableMinimalUpdate() : WorkflowSettings.DEFAULT_ENABLE_MINIMAL_UPDATE;
+        boolean skipOverwrite = workflowSettings != null ? workflowSettings.isSkipOverwrite() : WorkflowSettings.DEFAULT_SKIP_OVERWRITE;
+        boolean removeOperationIdPrefix = workflowSettings != null ? workflowSettings.isRemoveOperationIdPrefix() : WorkflowSettings.DEFAULT_REMOVE_OPERATION_ID_PREFIX;
+        String ignoreFileOverride = workflowSettings != null ? workflowSettings.getIgnoreFileOverride() : null;
+        boolean skipOperationExample = workflowSettings != null ? workflowSettings.isSkipOperationExample() : WorkflowSettings.DEFAULT_SKIP_OPERATION_EXAMPLE;
+        boolean enablePostProcessingFile = workflowSettings != null ? workflowSettings.isSkipOperationExample() : WorkflowSettings.DEFAULT_ENABLE_POST_PROCESS_FILE;
+        String templateEnginName = workflowSettings != null ? workflowSettings.getTemplatingEngineName() : WorkflowSettings.DEFAULT_TEMPLATING_ENGINE_NAME;
+        String inputSpecLocation = workflowSettings != null ? workflowSettings.getInputSpec() : null;
+        boolean removeEnumValuePrefix = workflowSettings != null ? workflowSettings.isRemoveEnumValuePrefix() : WorkflowSettings.DEFAULT_REMOVE_ENUM_VALUE_PREFIX;
+        boolean hideGenerationTimestamp = workflowSettings != null ? workflowSettings.isHideGenerationTimestamp() : WorkflowSettings.DEFAULT_HIDE_GENERATION_TIMESTAMP;
+        return new CodeGeneratorSettings(
+            apiPackage,
+            artifactId,
+            outputDir,
+            templateDir,
+            embeddedTemplateDir,
+            packageName,
+            strictSpecBehavior,
+            enableMinimalUpdate,
+            skipOverwrite,
+            removeOperationIdPrefix,
+            ignoreFileOverride,
+            skipOperationExample,
+            enablePostProcessingFile,
+            templateEnginName,
+            inputSpecLocation,
+            removeEnumValuePrefix,
+            hideGenerationTimestamp
+        );
+    }
+}
diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/models/GeneratedFileType.java b/src/main/java/org/openapijsonschematools/codegen/generators/models/GeneratedFileType.java
new file mode 100644
index 00000000000..1d47055c798
--- /dev/null
+++ b/src/main/java/org/openapijsonschematools/codegen/generators/models/GeneratedFileType.java
@@ -0,0 +1,7 @@
+package org.openapijsonschematools.codegen.generators.models;
+
+public enum GeneratedFileType {
+    CODE,
+    DOCUMENTATION,
+    TEST
+}
diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/models/ReportFileType.java b/src/main/java/org/openapijsonschematools/codegen/generators/models/ReportFileType.java
new file mode 100644
index 00000000000..1bc59a51d01
--- /dev/null
+++ b/src/main/java/org/openapijsonschematools/codegen/generators/models/ReportFileType.java
@@ -0,0 +1,6 @@
+package org.openapijsonschematools.codegen.generators.models;
+
+public enum ReportFileType {
+    FILES,
+    VERSION
+}
diff --git a/src/main/java/org/openapijsonschematools/codegen/templating/GeneratorTemplateContentLocator.java b/src/main/java/org/openapijsonschematools/codegen/templating/GeneratorTemplateContentLocator.java
index 0bf9473266e..d69b8da3578 100644
--- a/src/main/java/org/openapijsonschematools/codegen/templating/GeneratorTemplateContentLocator.java
+++ b/src/main/java/org/openapijsonschematools/codegen/templating/GeneratorTemplateContentLocator.java
@@ -54,7 +54,7 @@ public String getFullTemplatePath(String relativeTemplateFile) {
 
         // check the supplied template main folder for the file
         // File.separator is necessary here as the file load is OS-specific
-        final String template = config.templateDir() + File.separator + relativeTemplateFile;
+        final String template = config.generatorSettings().templateDir + File.separator + relativeTemplateFile;
         // looks for user-defined file or classpath
         // supports template dir which refers to local file system or custom path in classpath as defined by templateDir
         if (new File(template).exists() || classpathTemplateExists(template)) {
@@ -62,7 +62,7 @@ public String getFullTemplatePath(String relativeTemplateFile) {
         }
 
         // Fall back to the template file for generator root directory embedded/packaged in the JAR file...
-        String loc = config.embeddedTemplateDir() + File.separator + relativeTemplateFile;
+        String loc = config.generatorSettings().embeddedTemplateDir + File.separator + relativeTemplateFile;
         // *only* looks for those files in classpath as defined by embeddedTemplateDir
         if (embeddedTemplateExists(loc)) {
             return loc;
diff --git a/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambda.java b/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambda.java
deleted file mode 100644
index 16df641220b..00000000000
--- a/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambda.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech)
- * Copyright 2018 SmartBear Software
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.openapijsonschematools.codegen.templating.mustache;
-
-import com.samskivert.mustache.Mustache;
-import com.samskivert.mustache.Template;
-import org.openapijsonschematools.codegen.generators.Generator;
-
-import java.io.IOException;
-import java.io.Writer;
-
-import static org.openapijsonschematools.codegen.common.StringUtils.camelize;
-
-/**
- * Converts text in a fragment to camelCase.
- *
- * Register:
- * <pre>
- * additionalProperties.put("camelcase", new CamelCaseLambda());
- * </pre>
- *
- * Use:
- * <pre>
- * {{#camelcase}}{{name}}{{/camelcase}}
- * </pre>
- */
-public class CamelCaseLambda implements Mustache.Lambda {
-    private Generator generator = null;
-    private Boolean escapeParam = false;
-    private Boolean lowercaseFirstLetter = true;
-
-    public CamelCaseLambda(boolean lowercaseFirstLetter) {
-      this.lowercaseFirstLetter = lowercaseFirstLetter;
-    }
-
-    public CamelCaseLambda() {}
-
-    public CamelCaseLambda generator(final Generator generator) {
-        this.generator = generator;
-        return this;
-    }
-
-    public CamelCaseLambda escapeAsParamName(final Boolean escape) {
-        this.escapeParam = escape;
-        return this;
-    }
-
-    @Override
-    public void execute(Template.Fragment fragment, Writer writer) throws IOException {
-        String text = camelize(fragment.execute().replace(" ", "_"), lowercaseFirstLetter);
-        if (generator != null) {
-            text = generator.sanitizeName(text);
-            if (generator.reservedWords().contains(text)) {
-                // Escaping must be done *after* camelize, because generators may escape using characters removed by camelize function.
-                text = generator.escapeReservedWord(text);
-            }
-
-            if (escapeParam) {
-                // NOTE: many generators call escapeReservedWord in toParamName, but we can't assume that's always the case.
-                //       Here, we'll have to accept that we may be duplicating some work.
-                text = generator.toParamName(text);
-            }
-        }
-        writer.write(text);
-    }
-}
diff --git a/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CaseFormatLambda.java b/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CaseFormatLambda.java
index c3c49b3faf2..b919e6ea876 100644
--- a/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CaseFormatLambda.java
+++ b/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CaseFormatLambda.java
@@ -40,7 +40,7 @@ public CaseFormatLambda generator(final Generator generator) {
     @Override
     public void execute(Template.Fragment fragment, Writer writer) throws IOException {
         String text = initialFormat.converterTo(targetFormat).convert(fragment.execute());
-        if (generator != null && generator.reservedWords().contains(text)) {
+        if (generator != null && generator.getGeneratorMetadata().getReservedWords().contains(text)) {
             text = generator.escapeReservedWord(text);
         }
         writer.write(text);
diff --git a/src/main/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambda.java b/src/main/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambda.java
index ace03adc329..012629f6639 100644
--- a/src/main/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambda.java
+++ b/src/main/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambda.java
@@ -53,7 +53,7 @@ public LowercaseLambda generator(final Generator generator) {
     @Override
     public void execute(Template.Fragment fragment, Writer writer) throws IOException {
         String text = fragment.execute().toLowerCase(Locale.ROOT);
-        if (generator != null && generator.reservedWords().contains(text)) {
+        if (generator != null && generator.getGeneratorMetadata().getReservedWords().contains(text)) {
             text = generator.escapeReservedWord(text);
         }
         writer.write(text);
diff --git a/src/main/resources/codegen/generatorClass.mustache b/src/main/resources/codegen/generatorClass.mustache
index c45cb78d8fc..e92dfcd5e08 100644
--- a/src/main/resources/codegen/generatorClass.mustache
+++ b/src/main/resources/codegen/generatorClass.mustache
@@ -156,20 +156,20 @@ public class {{generatorClass}} extends DefaultCodegen implements CodegenConfig
   }
 
   /**
-   * Location to write model files.  You can use the modelPackage() as defined when the class is
+   * Location to write model files.  You can use the modelPackage as defined when the class is
    * instantiated
    */
   public String modelFileFolder() {
-    return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
+    return outputFolder + "/" + sourceFolder + "/" + modelPackage.replace('.', File.separatorChar);
   }
 
   /**
-   * Location to write api files.  You can use the apiPackage() as defined when the class is
+   * Location to write api files.  You can use the apiPackage as defined when the class is
    * instantiated
    */
   @Override
   public String apiFileFolder() {
-    return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
+    return outputFolder + "/" + sourceFolder + "/" + generatorSettings().apiPackage.replace('.', File.separatorChar);
   }
 
   /**
diff --git a/src/main/resources/codegen/kotlin/generatorClass.mustache b/src/main/resources/codegen/kotlin/generatorClass.mustache
index e19144f3288..97f008276ad 100644
--- a/src/main/resources/codegen/kotlin/generatorClass.mustache
+++ b/src/main/resources/codegen/kotlin/generatorClass.mustache
@@ -144,19 +144,19 @@ open class {{generatorClass}}() : DefaultCodegen(), CodegenConfig {
     }
 
     /**
-     * Location to write model files.  You can use the modelPackage() as defined when the class is
+     * Location to write model files.  You can use the modelPackage as defined when the class is
      * instantiated
      */
     override fun modelFileFolder(): String {
-        return """$outputFolder/$sourceFolder/${modelPackage().replace('.', File.separatorChar)}"""
+        return """$outputFolder/$sourceFolder/${modelPackage.replace('.', File.separatorChar)}"""
     }
 
     /**
-     * Location to write api files.  You can use the apiPackage() as defined when the class is
+     * Location to write api files.  You can use the apiPackage as defined when the class is
      * instantiated
      */
     override fun apiFileFolder(): String {
-        return """$outputFolder/$sourceFolder/${apiPackage().replace('.', File.separatorChar)}"""
+        return """$outputFolder/$sourceFolder/${generatorSettings().apiPackage.replace('.', File.separatorChar)}"""
     }
 
     /**
diff --git a/src/test/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunnerTest.java b/src/test/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunnerTest.java
index 62029d77118..d25dd54d343 100644
--- a/src/test/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunnerTest.java
+++ b/src/test/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunnerTest.java
@@ -13,6 +13,8 @@
 import io.swagger.v3.oas.models.responses.ApiResponses;
 import org.openapijsonschematools.codegen.TestUtils;
 import org.openapijsonschematools.codegen.config.ClientOptInput;
+import org.openapijsonschematools.codegen.config.GeneratorSettings;
+import org.openapijsonschematools.codegen.config.WorkflowSettings;
 import org.openapijsonschematools.codegen.generators.DefaultGenerator;
 import org.openapijsonschematools.codegen.generators.Generator;
 import org.openapijsonschematools.codegen.common.CodegenConstants;
@@ -279,8 +281,8 @@ public void testNonStrictFromPaths() throws Exception {
         openAPI.getPaths().addPathItem("path1/", new PathItem().get(new Operation().operationId("op1").responses(new ApiResponses().addApiResponse("201", new ApiResponse().description("OK")))));
         openAPI.getPaths().addPathItem("path2/", new PathItem().get(new Operation().operationId("op2").addParametersItem(new QueryParameter().name("p1").schema(new StringSchema())).responses(new ApiResponses().addApiResponse("201", new ApiResponse().description("OK")))));
 
-        Generator config = new DefaultGenerator();
-        config.setStrictSpecBehavior(false);
+        WorkflowSettings ws = WorkflowSettings.newBuilder().withStrictSpecBehavior(false).build();
+        Generator config = new DefaultGenerator(null, ws);
         ClientOptInput opts = new ClientOptInput(
                 openAPI,
                 config,
@@ -309,7 +311,7 @@ public void testFromPaths() throws Exception {
         openAPI.getPaths().addPathItem("/path3", new PathItem().addParametersItem(new QueryParameter().name("p1").schema(new StringSchema())).get(new Operation().operationId("op3").addParametersItem(new QueryParameter().name("p2").schema(new IntegerSchema())).responses(new ApiResponses().addApiResponse("201", new ApiResponse().description("OK")))));
         openAPI.getPaths().addPathItem("/path4", new PathItem().addParametersItem(new QueryParameter().name("p1").schema(new StringSchema())).get(new Operation().operationId("op4").responses(new ApiResponses().addApiResponse("201", new ApiResponse().description("OK")))));
 
-        Generator config = new DefaultGenerator();
+        Generator config = new DefaultGenerator(null, null);
         ClientOptInput opts = new ClientOptInput(
                 openAPI,
                 config,
@@ -335,9 +337,9 @@ public void testFromPaths() throws Exception {
     @Test
     public void testRefModelValidationProperties() {
         OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/refAliasedPrimitiveWithValidation.yml");
-        DefaultGenerator config = new DefaultGenerator();
+        WorkflowSettings ws = WorkflowSettings.newBuilder().withStrictSpecBehavior(false).build();
+        DefaultGenerator config = new DefaultGenerator(null, ws);
         config.setModelPackage("components.schema");
-        config.setStrictSpecBehavior(false);
         ClientOptInput opts = new ClientOptInput(
                 openAPI,
                 config,
@@ -598,8 +600,8 @@ public void testCustomNonLibraryTemplates() throws IOException {
     @Test
     public void testHandlesTrailingSlashInServers() {
         OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7533.yaml");
-        DefaultGenerator config = new DefaultGenerator();
-        config.setStrictSpecBehavior(false);
+        WorkflowSettings ws = WorkflowSettings.newBuilder().withStrictSpecBehavior(false).build();
+        DefaultGenerator config = new DefaultGenerator(null, ws);
         ClientOptInput opts = new ClientOptInput(
                 openAPI,
                 config,
@@ -622,8 +624,8 @@ public void testHandlesTrailingSlashInServers() {
     @Test
     public void testHandlesRelativeUrlsInServers() {
         OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_10056.yaml");
-        DefaultGenerator config = new DefaultGenerator();
-        config.setStrictSpecBehavior(true);
+        WorkflowSettings ws = WorkflowSettings.newBuilder().withStrictSpecBehavior(true).build();
+        DefaultGenerator config = new DefaultGenerator(null, ws);
         ClientOptInput opts = new ClientOptInput(
                 openAPI,
                 config,
@@ -704,8 +706,8 @@ public void testProcessUserDefinedTemplatesWithConfig() throws IOException {
     @Test
     public void testRecursionBug4650() {
         OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/bugs/recursion-bug-4650.yaml");
-        DefaultGenerator config = new DefaultGenerator();
-        config.setStrictSpecBehavior(false);
+        WorkflowSettings ws = WorkflowSettings.newBuilder().withStrictSpecBehavior(false).build();
+        DefaultGenerator config = new DefaultGenerator(null, ws);
         ClientOptInput opts = new ClientOptInput(
                 openAPI,
                 config,
diff --git a/src/test/java/org/openapijsonschematools/codegen/generators/DefaultGeneratorTest.java b/src/test/java/org/openapijsonschematools/codegen/generators/DefaultGeneratorTest.java
index a89b487bbec..3c31ce14cd7 100644
--- a/src/test/java/org/openapijsonschematools/codegen/generators/DefaultGeneratorTest.java
+++ b/src/test/java/org/openapijsonschematools/codegen/generators/DefaultGeneratorTest.java
@@ -39,6 +39,8 @@
 import io.swagger.v3.oas.models.security.SecurityScheme;
 import org.openapijsonschematools.codegen.TestUtils;
 import org.openapijsonschematools.codegen.common.CodegenConstants;
+import org.openapijsonschematools.codegen.config.GeneratorSettings;
+import org.openapijsonschematools.codegen.config.WorkflowSettings;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenDiscriminator;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenEncoding;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenHeader;
@@ -52,7 +54,6 @@
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema;
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityScheme;
 import org.openapijsonschematools.codegen.generators.openapimodels.EnumValue;
-import org.openapijsonschematools.codegen.templating.mustache.CamelCaseLambda;
 import org.openapijsonschematools.codegen.templating.mustache.IndentedLambda;
 import org.openapijsonschematools.codegen.templating.mustache.LowercaseLambda;
 import org.openapijsonschematools.codegen.templating.mustache.TitlecaseLambda;
@@ -86,6 +87,12 @@
 
 public class DefaultGeneratorTest {
     public static class ThisDefaultGenerator extends DefaultGenerator {
+        public ThisDefaultGenerator() {
+            super(null, null);
+        }
+        public ThisDefaultGenerator(WorkflowSettings ws) {
+            super(null, ws);
+        }
         @Override
         public String escapeUnsafeCharacters(String input) {
             return input;
@@ -243,27 +250,27 @@ public void testInitialConfigValues() throws Exception {
         codegen.processOpts();
 
         Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
-        Assert.assertTrue(codegen.isHideGenerationTimestamp());
+        Assert.assertTrue(codegen.generatorSettings.hideGenerationTimestamp);
     }
 
     @Test
     public void testSettersForConfigValues() throws Exception {
-        final DefaultGenerator codegen = new ThisDefaultGenerator();
-        codegen.setHideGenerationTimestamp(false);
+        WorkflowSettings ws = WorkflowSettings.newBuilder().withHideGenerationTimestamp(false).build();
+        final DefaultGenerator codegen = new ThisDefaultGenerator(ws);
         codegen.processOpts();
 
         Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
-        Assert.assertFalse(codegen.isHideGenerationTimestamp());
+        Assert.assertFalse(codegen.generatorSettings.hideGenerationTimestamp);
     }
 
     @Test
-    public void testAdditionalPropertiesPutForConfigValues() throws Exception {
-        final DefaultGenerator codegen = new ThisDefaultGenerator();
-        codegen.additionalProperties().put(CodegenConstants.HIDE_GENERATION_TIMESTAMP, false);
+    public void testAdditionalPropertiesPutForConfigValues() {
+        WorkflowSettings ws = WorkflowSettings.newBuilder().withHideGenerationTimestamp(false).build();
+        final DefaultGenerator codegen = new ThisDefaultGenerator(ws);
         codegen.processOpts();
 
         Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
-        Assert.assertFalse(codegen.isHideGenerationTimestamp());
+        Assert.assertFalse(codegen.generatorSettings.hideGenerationTimestamp);
     }
 
     @Test
@@ -455,21 +462,6 @@ public void testEscapeText() {
         Assert.assertEquals(codegen.escapeText("\\/"), "/");
     }
 
-    @Test
-    public void testEscapeTextWhileAllowingNewLines() {
-        final DefaultGenerator codegen = new ThisDefaultGenerator();
-
-        // allow new lines
-        Assert.assertEquals(codegen.escapeTextWhileAllowingNewLines("\n"), "\n");
-        Assert.assertEquals(codegen.escapeTextWhileAllowingNewLines("\r"), "\r");
-
-        // escape other special characters
-        Assert.assertEquals(codegen.escapeTextWhileAllowingNewLines("\t"), " ");
-        Assert.assertEquals(codegen.escapeTextWhileAllowingNewLines("\\"), "\\\\");
-        Assert.assertEquals(codegen.escapeTextWhileAllowingNewLines("\""), "\\\"");
-        Assert.assertEquals(codegen.escapeTextWhileAllowingNewLines("\\/"), "/");
-    }
-
     @Test
     public void updateCodegenPropertyEnum() {
         CodegenSchema array = codegenPropertyWithArrayOfIntegerValues();
@@ -516,7 +508,8 @@ public void updateCodegenPropertyEnumWithExtension() {
 
     @Test
     public void updateCodegenPropertyEnumWithPrefixRemoved() {
-        DefaultGenerator codegen = new ThisDefaultGenerator();
+        WorkflowSettings ws = WorkflowSettings.newBuilder().withRemoveEnumValuePrefix(true).build();
+        DefaultGenerator codegen = new ThisDefaultGenerator(ws);
         CodegenSchema enumProperty = codegenProperty(codegen, Arrays.asList("animal_dog", "animal_cat"), "updateCodegenPropertyEnumWithPrefixRemoved", null);
 
         Map<EnumValue, String> enumVars = enumProperty.items.enumInfo.valueToName;
@@ -527,8 +520,8 @@ public void updateCodegenPropertyEnumWithPrefixRemoved() {
 
     @Test
     public void updateCodegenPropertyEnumWithoutPrefixRemoved() {
-        final DefaultGenerator codegen = new ThisDefaultGenerator();
-        codegen.setRemoveEnumValuePrefix(false);
+        WorkflowSettings ws = WorkflowSettings.newBuilder().withRemoveEnumValuePrefix(false).build();
+        final DefaultGenerator codegen = new ThisDefaultGenerator(ws);
 
         CodegenSchema enumProperty = codegenProperty(codegen, Arrays.asList("animal_dog", "animal_cat"), "updateCodegenPropertyEnumWithoutPrefixRemoved", null);
 
@@ -540,7 +533,8 @@ public void updateCodegenPropertyEnumWithoutPrefixRemoved() {
 
     @Test
     public void postProcessModelsEnumWithPrefixRemoved() {
-        final DefaultGenerator codegen = new ThisDefaultGenerator();
+        WorkflowSettings ws = WorkflowSettings.newBuilder().withRemoveEnumValuePrefix(true).build();
+        final DefaultGenerator codegen = new ThisDefaultGenerator(ws);
         TreeMap<String, CodegenSchema> schemas = codegenModel(codegen, Arrays.asList("animal_dog", "animal_cat"), "postProcessModelsEnumWithPrefixRemoved", null, null);
         CodegenSchema cm = schemas.get("model");
 
@@ -552,8 +546,8 @@ public void postProcessModelsEnumWithPrefixRemoved() {
 
     @Test
     public void postProcessModelsEnumWithoutPrefixRemoved() {
-        final DefaultGenerator codegen = new ThisDefaultGenerator();
-        codegen.setRemoveEnumValuePrefix(false);
+        WorkflowSettings ws = WorkflowSettings.newBuilder().withRemoveEnumValuePrefix(false).build();
+        final DefaultGenerator codegen = new ThisDefaultGenerator(ws);
         TreeMap<String, CodegenSchema> objs = codegenModel(codegen, Arrays.asList("animal_dog", "animal_cat"), "postProcessModelsEnumWithoutPrefixRemoved", null, null);
         CodegenSchema cm = objs.get("model");
 
@@ -1710,7 +1704,6 @@ public void commonLambdasRegistrationTest() {
         assertTrue(lambdas.get("lowercase") instanceof LowercaseLambda, "Expecting LowercaseLambda class");
         assertTrue(lambdas.get("uppercase") instanceof UppercaseLambda, "Expecting UppercaseLambda class");
         assertTrue(lambdas.get("titlecase") instanceof TitlecaseLambda, "Expecting TitlecaseLambda class");
-        assertTrue(lambdas.get("camelcase") instanceof CamelCaseLambda, "Expecting CamelCaseLambda class");
         assertTrue(lambdas.get("indented") instanceof IndentedLambda, "Expecting IndentedLambda class");
         assertTrue(lambdas.get("indented_8") instanceof IndentedLambda, "Expecting IndentedLambda class");
         assertTrue(lambdas.get("indented_12") instanceof IndentedLambda, "Expecting IndentedLambda class");
@@ -3113,14 +3106,14 @@ public void testBooleansSetForIntSchemas() {
     @Test
     public void testRemoveOperationIdPrefix() {
         final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/bugs/issue_9719.yaml");
-        final DefaultGenerator codegen = new ThisDefaultGenerator();
+        WorkflowSettings ws = WorkflowSettings.newBuilder().withRemoveOperationIdPrefix(true).build();
+        final DefaultGenerator codegen = new ThisDefaultGenerator(ws);
         codegen.setOpenAPI(openAPI);
 
         String path;
         Operation operation;
         CodegenOperation co;
 
-        codegen.additionalProperties().put(CodegenConstants.REMOVE_OPERATION_ID_PREFIX, "True");
         codegen.additionalProperties().put(CodegenConstants.REMOVE_OPERATION_ID_PREFIX_DELIMITER, ".");
         codegen.additionalProperties().put(CodegenConstants.REMOVE_OPERATION_ID_PREFIX_COUNT, 2);
         codegen.processOpts();
@@ -3129,7 +3122,6 @@ public void testRemoveOperationIdPrefix() {
         co = codegen.fromOperation(operation, getOperationPath(path, "get"), null, null, null);
         assertEquals(co.operationId.pascalCase, "UsersGetAll");
 
-        codegen.additionalProperties().put(CodegenConstants.REMOVE_OPERATION_ID_PREFIX, "True");
         codegen.additionalProperties().put(CodegenConstants.REMOVE_OPERATION_ID_PREFIX_DELIMITER, ".");
         codegen.additionalProperties().put(CodegenConstants.REMOVE_OPERATION_ID_PREFIX_COUNT, -1);
         codegen.processOpts();
@@ -3138,7 +3130,6 @@ public void testRemoveOperationIdPrefix() {
         co = codegen.fromOperation(operation, getOperationPath(path, "get"), null, null, null);
         assertEquals(co.operationId.pascalCase, "GetAll");
 
-        codegen.additionalProperties().put(CodegenConstants.REMOVE_OPERATION_ID_PREFIX, "True");
         codegen.additionalProperties().put(CodegenConstants.REMOVE_OPERATION_ID_PREFIX_DELIMITER, ".");
         codegen.additionalProperties().put(CodegenConstants.REMOVE_OPERATION_ID_PREFIX_COUNT, 10);
         codegen.processOpts();
@@ -3147,7 +3138,6 @@ public void testRemoveOperationIdPrefix() {
         co = codegen.fromOperation(operation, getOperationPath(path, "get"), null, null, null);
         assertEquals(co.operationId.pascalCase, "GetAll");
 
-        codegen.additionalProperties().put(CodegenConstants.REMOVE_OPERATION_ID_PREFIX, "True");
         codegen.additionalProperties().put(CodegenConstants.REMOVE_OPERATION_ID_PREFIX_DELIMITER, "_");
         codegen.additionalProperties().put(CodegenConstants.REMOVE_OPERATION_ID_PREFIX_COUNT, 2);
         codegen.processOpts();
@@ -3156,7 +3146,6 @@ public void testRemoveOperationIdPrefix() {
         co = codegen.fromOperation(operation, getOperationPath(path, "get"), null, null, null);
         assertEquals(co.operationId.pascalCase, "UsersGetAll");
 
-        codegen.additionalProperties().put(CodegenConstants.REMOVE_OPERATION_ID_PREFIX, "True");
         codegen.additionalProperties().put(CodegenConstants.REMOVE_OPERATION_ID_PREFIX_DELIMITER, "_");
         codegen.additionalProperties().put(CodegenConstants.REMOVE_OPERATION_ID_PREFIX_COUNT, -1);
         codegen.processOpts();
@@ -3165,7 +3154,6 @@ public void testRemoveOperationIdPrefix() {
         co = codegen.fromOperation(operation, getOperationPath(path, "get"), null, null, null);
         assertEquals(co.operationId.pascalCase, "GetAll");
 
-        codegen.additionalProperties().put(CodegenConstants.REMOVE_OPERATION_ID_PREFIX, "True");
         codegen.additionalProperties().put(CodegenConstants.REMOVE_OPERATION_ID_PREFIX_DELIMITER, "_");
         codegen.additionalProperties().put(CodegenConstants.REMOVE_OPERATION_ID_PREFIX_COUNT, 10);
         codegen.processOpts();
@@ -4009,7 +3997,7 @@ public void setShouldExplode() {
 
     class GeneratorWithMultipleInheritance extends DefaultGenerator {
         public GeneratorWithMultipleInheritance() {
-            super();
+            super(null, null);
             supportsInheritance = true;
             supportsMultipleInheritance = true;
         }
diff --git a/src/test/java/org/openapijsonschematools/codegen/generators/JavaClientGeneratorTest.java b/src/test/java/org/openapijsonschematools/codegen/generators/JavaClientGeneratorTest.java
index 2094eab129e..95ca289ecd1 100644
--- a/src/test/java/org/openapijsonschematools/codegen/generators/JavaClientGeneratorTest.java
+++ b/src/test/java/org/openapijsonschematools/codegen/generators/JavaClientGeneratorTest.java
@@ -33,7 +33,7 @@
 
 public class JavaClientGeneratorTest {
 
-    private final JavaClientGenerator generator = new JavaClientGenerator();
+    private final JavaClientGenerator generator = new JavaClientGenerator(null, null);
 
     @Test
     void inlineEnum() {
@@ -135,7 +135,7 @@ void uuidGivenExample() {
     @Test
     public void testEnumNames() {
         OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/70_schema_enum_names.yaml");
-        var javaGenerator = new JavaClientGenerator();
+        var javaGenerator = new JavaClientGenerator(null, null);
         javaGenerator.setOpenAPI(openAPI);
 
         String modelName = "StringEnum";
diff --git a/src/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java b/src/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java
index 5fffba76b33..f34da0107b8 100644
--- a/src/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java
+++ b/src/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java
@@ -49,7 +49,7 @@ public class PythonClientGeneratorTest {
     public void testRecursiveExampleValueWithCycle() throws Exception {
 
         final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/issue_7532.yaml");
-        final PythonClientGenerator codegen = new PythonClientGenerator();
+        final PythonClientGenerator codegen = new PythonClientGenerator(null, null);
         codegen.setOpenAPI(openAPI);
         Schema schemaWithCycleInTreesProperty = openAPI.getComponents().getSchemas().get("Forest");
         String exampleValue = codegen.toExampleValue(schemaWithCycleInTreesProperty, null);
@@ -64,14 +64,14 @@ public void testRecursiveExampleValueWithCycle() throws Exception {
     @Test(expectedExceptions = RuntimeException.class)
     public void testSpecWithTooLowVersionThrowsException() {
         final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/sample_spec.yml");
-        final PythonClientGenerator codegen = new PythonClientGenerator();
+        final PythonClientGenerator codegen = new PythonClientGenerator(null, null);
         codegen.preprocessOpenAPI(openAPI);
     }
 
     @Test
     public void testSpecWithAcceptableVersion() {
         final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/petstore.yaml");
-        final PythonClientGenerator codegen = new PythonClientGenerator();
+        final PythonClientGenerator codegen = new PythonClientGenerator(null, null);
         codegen.preprocessOpenAPI(openAPI);
         Assert.assertEquals(openAPI.getOpenapi() , "3.0.0");
         Assert.assertTrue(openAPI.getExtensions() == null);
@@ -80,7 +80,7 @@ public void testSpecWithAcceptableVersion() {
     @Test
     public void testSpecWithAcceptableVersionAndExtension() {
         final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/issue_12196.yaml");
-        final PythonClientGenerator codegen = new PythonClientGenerator();
+        final PythonClientGenerator codegen = new PythonClientGenerator(null, null);
         codegen.preprocessOpenAPI(openAPI);
         Assert.assertEquals(openAPI.getOpenapi() , "3.0.0");
         Assert.assertFalse(openAPI.getExtensions().isEmpty());
@@ -108,7 +108,7 @@ public void testRecursiveGeoJsonExampleWhenTypeIsGeometryCollection() throws IOE
 
     private void testEndpointExampleValue(String endpoint, String specFilePath, String expectedAnswerPath) throws IOException {
         final OpenAPI openAPI = TestUtils.parseFlattenSpec(specFilePath);
-        final PythonClientGenerator codegen = new PythonClientGenerator();
+        final PythonClientGenerator codegen = new PythonClientGenerator(null, null);
         codegen.setOpenAPI(openAPI);
 
         final Operation operation = openAPI.getPaths().get(endpoint).getPost();
@@ -174,7 +174,7 @@ public void testApisNotGenerated() throws Exception {
     @Test
     public void testRegexWithoutTrailingSlashWorks() {
         OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/11_regex.yaml");
-        PythonClientGenerator codegen = new PythonClientGenerator();
+        PythonClientGenerator codegen = new PythonClientGenerator(null, null);
         codegen.setOpenAPI(openAPI);
 
         String modelName = "UUID";
@@ -193,7 +193,7 @@ public void testRegexWithoutTrailingSlashWorks() {
     @Test
     public void testRegexWithMultipleFlagsWorks() {
         OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/11_regex.yaml");
-        PythonClientGenerator codegen = new PythonClientGenerator();
+        PythonClientGenerator codegen = new PythonClientGenerator(null, null);
         codegen.setOpenAPI(openAPI);
 
         String modelName = "StringWithRegexWithThreeFlags";
@@ -212,7 +212,7 @@ public void testRegexWithMultipleFlagsWorks() {
     @Test
     public void testEnumNames() {
         OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/70_schema_enum_names.yaml");
-        PythonClientGenerator codegen = new PythonClientGenerator();
+        PythonClientGenerator codegen = new PythonClientGenerator(null, null);
         codegen.setOpenAPI(openAPI);
 
         String modelName = "StringEnum";
@@ -230,13 +230,4 @@ public void testEnumNames() {
         Assert.assertEquals(enumVars.get(new EnumValue("#FFA5A4", "string", null)), "NUMBER_SIGN_FFA5A4");
         Assert.assertEquals(enumVars.get(new EnumValue("2D_Object", "string", null)), "DIGIT_TWO_D_OBJECT");
     }
-
-    @Test(description = "format imports of models using a package containing dots")
-    public void testImportWithQualifiedPackageName() throws Exception {
-        final PythonClientGenerator codegen = new PythonClientGenerator();
-        codegen.setPackageName("openapi.client");
-
-        String importValue = codegen.toModelImport("model_name.ModelName");
-        Assert.assertEquals(importValue, "from openapi.client.components.schema import model_name");
-    }
 }
diff --git a/src/test/java/org/openapijsonschematools/codegen/generators/options/AbstractOptionsTest.java b/src/test/java/org/openapijsonschematools/codegen/generators/options/AbstractOptionsTest.java
index 5744f7356e8..a4fc90daec2 100644
--- a/src/test/java/org/openapijsonschematools/codegen/generators/options/AbstractOptionsTest.java
+++ b/src/test/java/org/openapijsonschematools/codegen/generators/options/AbstractOptionsTest.java
@@ -20,6 +20,8 @@
 import com.google.common.base.Function;
 import org.apache.commons.lang3.StringUtils;
 import org.mockito.MockSettings;
+import org.openapijsonschematools.codegen.config.WorkflowSettings;
+import org.openapijsonschematools.codegen.generators.PythonClientGenerator;
 import org.openapijsonschematools.codegen.generators.models.CliOption;
 import org.openapijsonschematools.codegen.generators.Generator;
 import org.testng.Assert;
@@ -32,14 +34,15 @@
 import java.util.stream.Collectors;
 
 import static org.mockito.Answers.CALLS_REAL_METHODS;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.withSettings;
 
 /**
  * Base class for applying and processing generator options, then invoking a helper method to verify those options.
  */
-public abstract class AbstractOptionsTest {
+public abstract class AbstractOptionsTest<T extends Generator> {
     protected MockSettings mockSettings = withSettings().useConstructor().defaultAnswer(CALLS_REAL_METHODS);
-    private final OptionsProvider optionsProvider;
+    protected final OptionsProvider optionsProvider;
 
     protected AbstractOptionsTest(OptionsProvider optionsProvider) {
         this.optionsProvider = optionsProvider;
@@ -48,14 +51,17 @@ protected AbstractOptionsTest(OptionsProvider optionsProvider) {
     @SuppressWarnings("unused")
     @Test
     public void checkOptionsProcessing() {
-        getCodegenConfig().additionalProperties().putAll(optionsProvider.createOptions());
-        getCodegenConfig().processOpts();
-        verifyOptions();
+        T generator = getCodegenConfig();
+        generator.additionalProperties().putAll(optionsProvider.createOptions());
+        T spyGen = spy(generator);
+        spyGen.processOpts();
+        verifyOptions(spyGen);
     }
 
     @Test(description = "check if all options described in documentation are presented in test case")
     public void checkOptionsHelp() {
-        final List<String> cliOptions = getCodegenConfig().cliOptions().stream().map(getCliOptionTransformer()).collect(Collectors.toList());
+        T generator = getCodegenConfig();
+        final List<String> cliOptions = generator.cliOptions().stream().map(getCliOptionTransformer()).collect(Collectors.toList());
         final Set<String> testOptions = optionsProvider.createOptions().keySet();
         final Set<String> skipped = new HashSet<String>(cliOptions);
         skipped.removeAll(testOptions);
@@ -78,7 +84,7 @@ public String apply(CliOption option) {
         };
     }
 
-    protected abstract Generator getCodegenConfig();
+    protected abstract T getCodegenConfig();
 
-    protected abstract void verifyOptions();
+    protected abstract void verifyOptions(T gen);
 }
diff --git a/src/test/java/org/openapijsonschematools/codegen/generators/options/OptionsProvider.java b/src/test/java/org/openapijsonschematools/codegen/generators/options/OptionsProvider.java
index 5aa717c29fc..69412b666fb 100644
--- a/src/test/java/org/openapijsonschematools/codegen/generators/options/OptionsProvider.java
+++ b/src/test/java/org/openapijsonschematools/codegen/generators/options/OptionsProvider.java
@@ -17,10 +17,16 @@
 
 package org.openapijsonschematools.codegen.generators.options;
 
+import org.openapijsonschematools.codegen.config.GeneratorSettings;
+import org.openapijsonschematools.codegen.config.WorkflowSettings;
+
 import java.util.Map;
 
 public interface OptionsProvider {
     String getLanguage();
     Map<String, String> createOptions();
+
+    WorkflowSettings createWorkflowInput();
+    GeneratorSettings createGeneratorInput();
     boolean isServer();
 }
diff --git a/src/test/java/org/openapijsonschematools/codegen/generators/options/PythonClientOptionsProvider.java b/src/test/java/org/openapijsonschematools/codegen/generators/options/PythonClientOptionsProvider.java
index 78af9d58cd8..acee175f576 100644
--- a/src/test/java/org/openapijsonschematools/codegen/generators/options/PythonClientOptionsProvider.java
+++ b/src/test/java/org/openapijsonschematools/codegen/generators/options/PythonClientOptionsProvider.java
@@ -19,6 +19,8 @@
 
 import com.google.common.collect.ImmutableMap;
 import org.openapijsonschematools.codegen.common.CodegenConstants;
+import org.openapijsonschematools.codegen.config.GeneratorSettings;
+import org.openapijsonschematools.codegen.config.WorkflowSettings;
 import org.openapijsonschematools.codegen.generators.PythonClientGenerator;
 
 import java.util.Map;
@@ -40,7 +42,6 @@ public String getLanguage() {
     public Map<String, String> createOptions() {
         ImmutableMap.Builder<String, String> builder = new ImmutableMap.Builder<String, String>();
         return builder.put(PythonClientGenerator.PACKAGE_URL, PACKAGE_URL_VALUE)
-                .put(CodegenConstants.PACKAGE_NAME, PACKAGE_NAME_VALUE)
                 .put(CodegenConstants.PROJECT_NAME, PROJECT_NAME_VALUE)
                 .put(CodegenConstants.PACKAGE_VERSION, PACKAGE_VERSION_VALUE)
                 .put(CodegenConstants.HIDE_GENERATION_TIMESTAMP, "true")
@@ -48,10 +49,19 @@ public Map<String, String> createOptions() {
                 .put(PythonClientGenerator.USE_NOSE, USE_NOSE_VALUE)
                 .put(PythonClientGenerator.RECURSION_LIMIT, RECURSION_LIMIT)
                 .put(CodegenConstants.NON_COMPLIANT_USE_DISCR_IF_COMPOSITION_FAILS, "false")
-                .put(CodegenConstants.TEMPLATING_ENGINE, "handlebars")
                 .build();
     }
 
+    @Override
+    public WorkflowSettings createWorkflowInput() {
+        return WorkflowSettings.newBuilder().withTemplatingEngineName("handlebars").build();
+    }
+
+    @Override
+    public GeneratorSettings createGeneratorInput() {
+        return GeneratorSettings.newBuilder().withPackageName(PACKAGE_NAME_VALUE).build();
+    }
+
     @Override
     public boolean isServer() {
         return false;
diff --git a/src/test/java/org/openapijsonschematools/codegen/generators/options/PythonClientOptionsTest.java b/src/test/java/org/openapijsonschematools/codegen/generators/options/PythonClientOptionsTest.java
index 9fc346e56ad..b8d2ad47404 100644
--- a/src/test/java/org/openapijsonschematools/codegen/generators/options/PythonClientOptionsTest.java
+++ b/src/test/java/org/openapijsonschematools/codegen/generators/options/PythonClientOptionsTest.java
@@ -21,27 +21,23 @@
 import org.openapijsonschematools.codegen.generators.PythonClientGenerator;
 
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
 
-public class PythonClientOptionsTest extends AbstractOptionsTest {
-
-    private PythonClientGenerator clientCodegen = mock(PythonClientGenerator.class, mockSettings);
-
+public class PythonClientOptionsTest extends AbstractOptionsTest<PythonClientGenerator> {
     public PythonClientOptionsTest() {
         super(new PythonClientOptionsProvider());
     }
 
     @Override
-    protected Generator getCodegenConfig() {
-        return clientCodegen;
+    protected PythonClientGenerator getCodegenConfig() {
+        return new PythonClientGenerator(optionsProvider.createGeneratorInput(), optionsProvider.createWorkflowInput());
     }
 
-    @SuppressWarnings("unused")
     @Override
-    protected void verifyOptions() {
-        verify(clientCodegen).setPackageVersion(PythonClientOptionsProvider.PACKAGE_VERSION_VALUE);
-        verify(clientCodegen).setPackageName(PythonClientOptionsProvider.PACKAGE_NAME_VALUE);
+    protected void verifyOptions(PythonClientGenerator spyGen) {
+        verify(spyGen).setPackageVersion(PythonClientOptionsProvider.PACKAGE_VERSION_VALUE);
     }
 }
 
diff --git a/src/test/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambdaTest.java b/src/test/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambdaTest.java
deleted file mode 100644
index b545e9733cc..00000000000
--- a/src/test/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambdaTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.openapijsonschematools.codegen.templating.mustache;
-
-import static org.mockito.AdditionalAnswers.returnsFirstArg;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.when;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Map;
-
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.openapijsonschematools.codegen.generators.Generator;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-public class CamelCaseLambdaTest extends LambdaTest {
-
-    @Mock
-    Generator generator;
-
-    @BeforeMethod
-    public void setup() {
-        MockitoAnnotations.initMocks(this);
-    }
-
-    @Test
-    public void camelCaseTest() {
-        // Given
-        Map<String, Object> ctx = context("camelcase", new CamelCaseLambda());
-
-        // When & Then
-        test("inputText", "{{#camelcase}}Input-text{{/camelcase}}", ctx);
-    }
-
-    @Test
-    public void camelCaseSpaceTest() {
-        // Given
-        Map<String, Object> ctx = context("camelcase", new CamelCaseLambda());
-
-        // When & Then
-        test("inputTextApi", "{{#camelcase}}Input text  api{{/camelcase}}", ctx);
-    }
-
-    @Test
-    public void camelCaseReservedWordTest() {
-        // Given
-        Map<String, Object> ctx = context("camelcase", new CamelCaseLambda().generator(generator));
-
-        when(generator.sanitizeName(anyString())).then(returnsFirstArg());
-        when(generator.reservedWords()).thenReturn(new HashSet<String>(Arrays.asList("reservedWord")));
-        when(generator.escapeReservedWord("reservedWord")).thenReturn("escapedReservedWord");
-
-        // When & Then
-        test("escapedReservedWord", "{{#camelcase}}reserved-word{{/camelcase}}", ctx);
-    }
-
-    @Test
-    public void camelCaseEscapeParamTest() {
-        // Given
-        Map<String, Object> ctx = context("camelcase", new CamelCaseLambda()
-                .generator(generator).escapeAsParamName(true));
-
-        when(generator.sanitizeName(anyString())).then(returnsFirstArg());
-        when(generator.reservedWords()).thenReturn(new HashSet<String>());
-        when(generator.toParamName("inputText")).thenReturn("inputTextAsParam");
-
-        // When & Then
-        test("inputTextAsParam", "{{#camelcase}}Input_text{{/camelcase}}", ctx);
-    }
-
-}
diff --git a/src/test/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambdaTest.java b/src/test/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambdaTest.java
index 0e1940aac34..919d0838cf8 100644
--- a/src/test/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambdaTest.java
+++ b/src/test/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambdaTest.java
@@ -11,6 +11,7 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.openapijsonschematools.codegen.generators.Generator;
+import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorMetadata;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
@@ -19,6 +20,9 @@ public class LowercaseLambdaTest extends LambdaTest {
     @Mock
     Generator generator;
 
+    @Mock
+    GeneratorMetadata metadata;
+
     @BeforeMethod
     public void setup() {
         MockitoAnnotations.initMocks(this);
@@ -39,7 +43,8 @@ public void lowercaseReservedWordTest() {
         Map<String, Object> ctx = context("lowercase", new LowercaseLambda().generator(generator));
 
         when(generator.sanitizeName(anyString())).then(returnsFirstArg());
-        when(generator.reservedWords()).thenReturn(new HashSet<String>(Arrays.asList("reserved")));
+        when(metadata.getReservedWords()).thenReturn(new HashSet<String>(Arrays.asList("reserved")));
+        when(generator.getGeneratorMetadata()).thenReturn(metadata);
         when(generator.escapeReservedWord("reserved")).thenReturn("escaped-reserved");
 
         // When & Then
diff --git a/src/test/java/org/openapijsonschematools/codegen/templating/mustache/PascalCaseLambdaTest.java b/src/test/java/org/openapijsonschematools/codegen/templating/mustache/PascalCaseLambdaTest.java
deleted file mode 100644
index 0e2db6b100a..00000000000
--- a/src/test/java/org/openapijsonschematools/codegen/templating/mustache/PascalCaseLambdaTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.openapijsonschematools.codegen.templating.mustache;
-
-import static org.mockito.AdditionalAnswers.returnsFirstArg;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.when;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Map;
-
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.openapijsonschematools.codegen.generators.Generator;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-public class PascalCaseLambdaTest extends LambdaTest {
-
-    @Mock
-    Generator generator;
-
-    @BeforeMethod
-    public void setup() {
-        MockitoAnnotations.initMocks(this);
-    }
-
-    @Test
-    public void pascalCaseTest() {
-        // Given
-        Map<String, Object> ctx = context("pascalcase", new CamelCaseLambda(false));
-
-        // When & Then
-        test("InputText", "{{#pascalcase}}Input-text{{/pascalcase}}", ctx);
-        test("InputText", "{{#pascalcase}}Input_text{{/pascalcase}}", ctx);
-        test("", "{{#pascalcase}}{{/pascalcase}}", ctx);
-
-    }
-
-    @Test
-    public void pascalCaseSpaceTest() {
-        // Given
-        Map<String, Object> ctx = context("pascalcase", new CamelCaseLambda(false));
-
-        // When & Then
-        test("InputTextApi", "{{#pascalcase}}Input text  api{{/pascalcase}}", ctx);
-    }
-
-    @Test
-    public void pascalCaseReservedWordTest() {
-        // Given
-        Map<String, Object> ctx = context("pascalcase", new CamelCaseLambda(false).generator(generator));
-
-        when(generator.sanitizeName(anyString())).then(returnsFirstArg());
-        when(generator.reservedWords()).thenReturn(new HashSet<String>(Arrays.asList("ReservedWord")));
-        when(generator.escapeReservedWord("ReservedWord")).thenReturn("escapedReservedWord");
-
-        // When & Then
-        test("escapedReservedWord", "{{#pascalcase}}reserved-word{{/pascalcase}}", ctx);
-    }
-
-    @Test
-    public void pascalCaseEscapeParamTest() {
-        // Given
-        Map<String, Object> ctx = context("pascalcase", new CamelCaseLambda(false)
-                .generator(generator).escapeAsParamName(true));
-
-        when(generator.sanitizeName(anyString())).then(returnsFirstArg());
-        when(generator.reservedWords()).thenReturn(new HashSet<String>());
-        when(generator.toParamName("InputText")).thenReturn("inputTextAsParam");
-
-        // When & Then
-        test("inputTextAsParam", "{{#pascalcase}}Input_text{{/pascalcase}}", ctx);
-    }
-
-}