diff --git a/.gitignore b/.gitignore
index 3eb73dfcfaa..53841be69e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -174,6 +174,8 @@ samples/server/petstore/aspnetcore/.vs/
 effective.pom
 # kotlin
 samples/client/petstore/kotlin/src/main/kotlin/test/
+samples/client/petstore/kotlin-threetenbp/build
+samples/client/petstore/kotlin-string/build
 \?
 
 # haskell
diff --git a/bin/kotlin-client-threetenbp.sh b/bin/kotlin-client-threetenbp.sh
index 0f6c65be797..395ebca14cf 100755
--- a/bin/kotlin-client-threetenbp.sh
+++ b/bin/kotlin-client-threetenbp.sh
@@ -30,3 +30,5 @@ export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/
 ags="generate -t modules/openapi-generator/src/main/resources/kotlin-client -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -l kotlin --artifact-id kotlin-petstore-threetenbp -D dateLibrary=threetenbp -o samples/client/petstore/kotlin-threetenbp $@"
 
 java ${JAVA_OPTS} -jar ${executable} ${ags}
+
+cp samples.ci/client/petstore/kotlin-threetenbp/pom.xml samples/client/petstore/kotlin-threetenbp/pom.xml
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java
index 5586c461cf7..c8be72eec93 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java
@@ -55,7 +55,7 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen {
         super();
 
         artifactId = "kotlin-client";
-        packageName = "io.swagger.client";
+        packageName = "org.openapitools.client";
 
         outputFolder = "generated-code" + File.separator + "kotlin-client";
         modelTemplateFiles.put("model.mustache", ".kt");
diff --git a/samples.ci/client/petstore/kotlin-threetenbp/pom.xml b/samples.ci/client/petstore/kotlin-threetenbp/pom.xml
new file mode 100644
index 00000000000..7a670388889
--- /dev/null
+++ b/samples.ci/client/petstore/kotlin-threetenbp/pom.xml
@@ -0,0 +1,46 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>KotlinPetstoreThreetenbpTests</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>kotlin-threetenbp</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>bundle-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>gradle</executable>
+                            <arguments>
+                                <argument>test</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/samples/client/petstore/kotlin-string/README.md b/samples/client/petstore/kotlin-string/README.md
index 57d6b9c67d5..b9ab400b15e 100644
--- a/samples/client/petstore/kotlin-string/README.md
+++ b/samples/client/petstore/kotlin-string/README.md
@@ -1,4 +1,4 @@
-# io.swagger.client - Kotlin client library for OpenAPI Petstore
+# org.openapitools.client - Kotlin client library for OpenAPI Petstore
 
 ## Requires
 
@@ -60,12 +60,12 @@ Class | Method | HTTP request | Description
 <a name="documentation-for-models"></a>
 ## Documentation for Models
 
- - [io.swagger.client.models.ApiResponse](docs/ApiResponse.md)
- - [io.swagger.client.models.Category](docs/Category.md)
- - [io.swagger.client.models.Order](docs/Order.md)
- - [io.swagger.client.models.Pet](docs/Pet.md)
- - [io.swagger.client.models.Tag](docs/Tag.md)
- - [io.swagger.client.models.User](docs/User.md)
+ - [org.openapitools.client.models.ApiResponse](docs/ApiResponse.md)
+ - [org.openapitools.client.models.Category](docs/Category.md)
+ - [org.openapitools.client.models.Order](docs/Order.md)
+ - [org.openapitools.client.models.Pet](docs/Pet.md)
+ - [org.openapitools.client.models.Tag](docs/Tag.md)
+ - [org.openapitools.client.models.User](docs/User.md)
 
 
 <a name="documentation-for-authorization"></a>
diff --git a/samples/client/petstore/kotlin-string/docs/PetApi.md b/samples/client/petstore/kotlin-string/docs/PetApi.md
index b86cca94113..6aef25bf53b 100644
--- a/samples/client/petstore/kotlin-string/docs/PetApi.md
+++ b/samples/client/petstore/kotlin-string/docs/PetApi.md
@@ -23,8 +23,8 @@ Add a new pet to the store
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
 val pet : Pet =  // Pet | Pet object that needs to be added to the store
@@ -67,8 +67,8 @@ Deletes a pet
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
 val petId : kotlin.Long = 789 // kotlin.Long | Pet id to delete
@@ -115,8 +115,8 @@ Multiple status values can be provided with comma separated strings
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
 val status : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Status values that need to be considered for filter
@@ -162,8 +162,8 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
 val tags : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Tags to filter by
@@ -209,8 +209,8 @@ Returns a single pet
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
 val petId : kotlin.Long = 789 // kotlin.Long | ID of pet to return
@@ -254,8 +254,8 @@ Update an existing pet
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
 val pet : Pet =  // Pet | Pet object that needs to be added to the store
@@ -298,8 +298,8 @@ Updates a pet in the store with form data
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
 val petId : kotlin.Long = 789 // kotlin.Long | ID of pet that needs to be updated
@@ -346,8 +346,8 @@ uploads an image
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
 val petId : kotlin.Long = 789 // kotlin.Long | ID of pet to update
diff --git a/samples/client/petstore/kotlin-string/docs/StoreApi.md b/samples/client/petstore/kotlin-string/docs/StoreApi.md
index b8647a0757d..13e978ac895 100644
--- a/samples/client/petstore/kotlin-string/docs/StoreApi.md
+++ b/samples/client/petstore/kotlin-string/docs/StoreApi.md
@@ -21,8 +21,8 @@ For valid response try integer IDs with value &lt; 1000. Anything above 1000 or
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = StoreApi()
 val orderId : kotlin.String = orderId_example // kotlin.String | ID of the order that needs to be deleted
@@ -67,8 +67,8 @@ Returns a map of status codes to quantities
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = StoreApi()
 try {
@@ -110,8 +110,8 @@ For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other val
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = StoreApi()
 val orderId : kotlin.Long = 789 // kotlin.Long | ID of pet that needs to be fetched
@@ -155,8 +155,8 @@ Place an order for a pet
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = StoreApi()
 val order : Order =  // Order | order placed for purchasing the pet
diff --git a/samples/client/petstore/kotlin-string/docs/UserApi.md b/samples/client/petstore/kotlin-string/docs/UserApi.md
index 1dd05e8f988..81fc42807d3 100644
--- a/samples/client/petstore/kotlin-string/docs/UserApi.md
+++ b/samples/client/petstore/kotlin-string/docs/UserApi.md
@@ -25,8 +25,8 @@ This can only be done by the logged in user.
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
 val user : User =  // User | Created user object
@@ -69,8 +69,8 @@ Creates list of users with given input array
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
 val user : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
@@ -113,8 +113,8 @@ Creates list of users with given input array
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
 val user : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
@@ -159,8 +159,8 @@ This can only be done by the logged in user.
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
 val username : kotlin.String = username_example // kotlin.String | The name that needs to be deleted
@@ -203,8 +203,8 @@ Get user by user name
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
 val username : kotlin.String = username_example // kotlin.String | The name that needs to be fetched. Use user1 for testing.
@@ -248,8 +248,8 @@ Logs user into the system
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
 val username : kotlin.String = username_example // kotlin.String | The user name for login
@@ -295,8 +295,8 @@ Logs out current logged in user session
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
 try {
@@ -337,8 +337,8 @@ This can only be done by the logged in user.
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
 val username : kotlin.String = username_example // kotlin.String | name that need to be deleted
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/apis/PetApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
similarity index 98%
rename from samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/apis/PetApi.kt
rename to samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index aa38098c766..c27887851c1 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -9,12 +9,12 @@
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
-package io.swagger.client.apis
+package org.openapitools.client.apis
 
-import io.swagger.client.models.ApiResponse
-import io.swagger.client.models.Pet
+import org.openapitools.client.models.ApiResponse
+import org.openapitools.client.models.Pet
 
-import io.swagger.client.infrastructure.*
+import org.openapitools.client.infrastructure.*
 
 class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) {
 
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
similarity index 97%
rename from samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/apis/StoreApi.kt
rename to samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 34fa399bb48..f785eb0a39d 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -9,11 +9,11 @@
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
-package io.swagger.client.apis
+package org.openapitools.client.apis
 
-import io.swagger.client.models.Order
+import org.openapitools.client.models.Order
 
-import io.swagger.client.infrastructure.*
+import org.openapitools.client.infrastructure.*
 
 class StoreApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) {
 
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/apis/UserApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
similarity index 98%
rename from samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/apis/UserApi.kt
rename to samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index 68e386bf090..e83ca0a7dfd 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -9,11 +9,11 @@
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
-package io.swagger.client.apis
+package org.openapitools.client.apis
 
-import io.swagger.client.models.User
+import org.openapitools.client.models.User
 
-import io.swagger.client.infrastructure.*
+import org.openapitools.client.infrastructure.*
 
 class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) {
 
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/ApiAbstractions.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt
similarity index 92%
rename from samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/ApiAbstractions.kt
rename to samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt
index 87cc13d045b..c2c3f1f0eae 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/ApiAbstractions.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt
@@ -1,4 +1,4 @@
-package io.swagger.client.infrastructure
+package org.openapitools.client.infrastructure
 
 typealias MultiValueMap = Map<String,List<String>>
 
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
similarity index 99%
rename from samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/ApiClient.kt
rename to samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
index 7e3a11664bd..5c4ebd2acbc 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/ApiClient.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -1,4 +1,4 @@
-package io.swagger.client.infrastructure
+package org.openapitools.client.infrastructure
 
 import okhttp3.*
 import java.io.File
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/ApiInfrastructureResponse.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
similarity index 96%
rename from samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/ApiInfrastructureResponse.kt
rename to samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
index b2b8a9cbc6b..1f5fbf1a3f0 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/ApiInfrastructureResponse.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
@@ -1,4 +1,4 @@
-package io.swagger.client.infrastructure
+package org.openapitools.client.infrastructure
 
 enum class ResponseType {
     Success, Informational, Redirection, ClientError, ServerError
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/ApplicationDelegates.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApplicationDelegates.kt
similarity index 95%
rename from samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/ApplicationDelegates.kt
rename to samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApplicationDelegates.kt
index 340d32e3211..dd34bd48b2c 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/ApplicationDelegates.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApplicationDelegates.kt
@@ -1,4 +1,4 @@
-package io.swagger.client.infrastructure
+package org.openapitools.client.infrastructure
 
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/Errors.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt
similarity index 95%
rename from samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/Errors.kt
rename to samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt
index ff908d53a92..2f3b0157ba7 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/Errors.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt
@@ -1,5 +1,5 @@
 @file:Suppress("unused")
-package io.swagger.client.infrastructure
+package org.openapitools.client.infrastructure
 
 import java.lang.RuntimeException
 
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/RequestConfig.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt
similarity index 91%
rename from samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/RequestConfig.kt
rename to samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt
index 3825588ce4a..b01f63a1013 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/RequestConfig.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt
@@ -1,4 +1,4 @@
-package io.swagger.client.infrastructure
+package org.openapitools.client.infrastructure
 
 /**
  * Defines a config object for a given request.
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/RequestMethod.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt
similarity index 71%
rename from samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/RequestMethod.kt
rename to samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt
index d9d04f02701..931b12b8bd7 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/RequestMethod.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt
@@ -1,4 +1,4 @@
-package io.swagger.client.infrastructure
+package org.openapitools.client.infrastructure
 
 /**
  * Provides enumerated HTTP verbs
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/ResponseExtensions.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt
similarity index 93%
rename from samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/ResponseExtensions.kt
rename to samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt
index 04e91720138..f50104a6f35 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/ResponseExtensions.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt
@@ -1,4 +1,4 @@
-package io.swagger.client.infrastructure
+package org.openapitools.client.infrastructure
 
 import okhttp3.Response
 
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt
similarity index 88%
rename from samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/Serializer.kt
rename to samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt
index a858407ff34..24dfb79dab1 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/Serializer.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt
@@ -1,4 +1,4 @@
-package io.swagger.client.infrastructure
+package org.openapitools.client.infrastructure
 
 import com.squareup.moshi.KotlinJsonAdapterFactory
 import com.squareup.moshi.Moshi
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
similarity index 94%
rename from samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/models/ApiResponse.kt
rename to samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index 57bdb8d0459..b950bdafb57 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -9,7 +9,7 @@
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
-package io.swagger.client.models
+package org.openapitools.client.models
 
 
 /**
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/models/Category.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Category.kt
similarity index 92%
rename from samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/models/Category.kt
rename to samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Category.kt
index a07d170d165..af700f5488a 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -9,7 +9,7 @@
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
-package io.swagger.client.models
+package org.openapitools.client.models
 
 
 /**
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/models/Order.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt
similarity index 96%
rename from samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/models/Order.kt
rename to samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt
index a54fdf69ab4..5e5696bbc6c 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -9,7 +9,7 @@
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
-package io.swagger.client.models
+package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/models/Pet.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Pet.kt
similarity index 89%
rename from samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/models/Pet.kt
rename to samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Pet.kt
index e5b0a4f034b..583dd3fb3ae 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -9,10 +9,10 @@
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
-package io.swagger.client.models
+package org.openapitools.client.models
 
-import io.swagger.client.models.Category
-import io.swagger.client.models.Tag
+import org.openapitools.client.models.Category
+import org.openapitools.client.models.Tag
 
 import com.squareup.moshi.Json
 /**
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/models/Tag.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Tag.kt
similarity index 92%
rename from samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/models/Tag.kt
rename to samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Tag.kt
index 3345b8fe88c..d2ae2ead613 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -9,7 +9,7 @@
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
-package io.swagger.client.models
+package org.openapitools.client.models
 
 
 /**
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/models/User.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/User.kt
similarity index 95%
rename from samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/models/User.kt
rename to samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/User.kt
index 12b69608705..a9695bb62ba 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/models/User.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -9,7 +9,7 @@
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
-package io.swagger.client.models
+package org.openapitools.client.models
 
 
 /**
diff --git a/samples/client/petstore/kotlin-threetenbp/.openapi-generator-ignore b/samples/client/petstore/kotlin-threetenbp/.openapi-generator-ignore
index c5fa491b4c5..7484ee590a3 100644
--- a/samples/client/petstore/kotlin-threetenbp/.openapi-generator-ignore
+++ b/samples/client/petstore/kotlin-threetenbp/.openapi-generator-ignore
@@ -1,11 +1,11 @@
-# Swagger Codegen Ignore
-# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
 
 # Use this file to prevent files from being overwritten by the generator.
 # The patterns follow closely to .gitignore or .dockerignore.
 
 # As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
 #ApiClient.cs
 
 # You can match any string of characters against a directory, file or extension with a single asterisk (*):
diff --git a/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION b/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION
index 855ff9501eb..096bf47efe3 100644
--- a/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION
+++ b/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION
@@ -1 +1 @@
-2.4.0-SNAPSHOT
\ No newline at end of file
+3.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-threetenbp/README.md b/samples/client/petstore/kotlin-threetenbp/README.md
index 410e14e4adb..b9ab400b15e 100644
--- a/samples/client/petstore/kotlin-threetenbp/README.md
+++ b/samples/client/petstore/kotlin-threetenbp/README.md
@@ -1,4 +1,4 @@
-# io.swagger.client - Kotlin client library for Swagger Petstore
+# org.openapitools.client - Kotlin client library for OpenAPI Petstore
 
 ## Requires
 
@@ -25,7 +25,7 @@ This runs all tests and packages the library.
 
 * Supports JSON inputs/outputs, File inputs, and Form inputs.
 * Supports collection formats for query parameters: csv, tsv, ssv, pipes.
-* Some Kotlin and Java types are fully qualified to avoid conflicts with types defined in Swagger definitions.
+* Some Kotlin and Java types are fully qualified to avoid conflicts with types defined in OpenAPI definitions.
 * Implementation of ApiClient is intended to reduce method counts, specifically to benefit Android targets.
 
 <a name="documentation-for-api-endpoints"></a>
@@ -60,12 +60,12 @@ Class | Method | HTTP request | Description
 <a name="documentation-for-models"></a>
 ## Documentation for Models
 
- - [io.swagger.client.models.ApiResponse](docs/ApiResponse.md)
- - [io.swagger.client.models.Category](docs/Category.md)
- - [io.swagger.client.models.Order](docs/Order.md)
- - [io.swagger.client.models.Pet](docs/Pet.md)
- - [io.swagger.client.models.Tag](docs/Tag.md)
- - [io.swagger.client.models.User](docs/User.md)
+ - [org.openapitools.client.models.ApiResponse](docs/ApiResponse.md)
+ - [org.openapitools.client.models.Category](docs/Category.md)
+ - [org.openapitools.client.models.Order](docs/Order.md)
+ - [org.openapitools.client.models.Pet](docs/Pet.md)
+ - [org.openapitools.client.models.Tag](docs/Tag.md)
+ - [org.openapitools.client.models.User](docs/User.md)
 
 
 <a name="documentation-for-authorization"></a>
diff --git a/samples/client/petstore/kotlin-threetenbp/build.gradle b/samples/client/petstore/kotlin-threetenbp/build.gradle
index 58319e1a7ad..8668dab3a7e 100644
--- a/samples/client/petstore/kotlin-threetenbp/build.gradle
+++ b/samples/client/petstore/kotlin-threetenbp/build.gradle
@@ -1,4 +1,4 @@
-group 'io.swagger'
+group 'org.openapitools'
 version '1.0.0'
 
 task wrapper(type: Wrapper) {
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/META-INF/kotlin-petstore-threetenbp_main.kotlin_module b/samples/client/petstore/kotlin-threetenbp/build/classes/main/META-INF/kotlin-petstore-threetenbp_main.kotlin_module
deleted file mode 100644
index 5fb11c48d1d..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/META-INF/kotlin-petstore-threetenbp_main.kotlin_module and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/apis/PetApi$WhenMappings.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/apis/PetApi$WhenMappings.class
deleted file mode 100644
index fd018d81be1..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/apis/PetApi$WhenMappings.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/apis/PetApi.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/apis/PetApi.class
deleted file mode 100644
index e142fa08e40..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/apis/PetApi.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/apis/StoreApi$WhenMappings.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/apis/StoreApi$WhenMappings.class
deleted file mode 100644
index c05a8359a97..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/apis/StoreApi$WhenMappings.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/apis/StoreApi.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/apis/StoreApi.class
deleted file mode 100644
index 2355932803b..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/apis/StoreApi.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/apis/UserApi$WhenMappings.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/apis/UserApi$WhenMappings.class
deleted file mode 100644
index 0398aba4c89..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/apis/UserApi$WhenMappings.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/apis/UserApi.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/apis/UserApi.class
deleted file mode 100644
index 2db1cfb63ae..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/apis/UserApi.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ApiAbstractionsKt$defaultMultiValueConverter$1.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ApiAbstractionsKt$defaultMultiValueConverter$1.class
deleted file mode 100644
index 3ec083a98a5..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ApiAbstractionsKt$defaultMultiValueConverter$1.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ApiAbstractionsKt.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ApiAbstractionsKt.class
deleted file mode 100644
index 6e7bfedce72..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ApiAbstractionsKt.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ApiClient$Companion.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ApiClient$Companion.class
deleted file mode 100644
index f709388299e..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ApiClient$Companion.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ApiClient$WhenMappings.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ApiClient$WhenMappings.class
deleted file mode 100644
index f725ffd747f..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ApiClient$WhenMappings.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ApiClient$requestBody$1.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ApiClient$requestBody$1.class
deleted file mode 100644
index 410129d5238..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ApiClient$requestBody$1.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ApiClient.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ApiClient.class
deleted file mode 100644
index 0783fe8b401..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ApiClient.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ApiInfrastructureResponse.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ApiInfrastructureResponse.class
deleted file mode 100644
index 67bf5132438..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ApiInfrastructureResponse.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ApplicationDelegates$SetOnce.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ApplicationDelegates$SetOnce.class
deleted file mode 100644
index 30fe7b7cc43..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ApplicationDelegates$SetOnce.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ApplicationDelegates.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ApplicationDelegates.class
deleted file mode 100644
index 91e7bba9b0a..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ApplicationDelegates.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ClientError.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ClientError.class
deleted file mode 100644
index 7e9926c18c1..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ClientError.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ClientException$Companion.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ClientException$Companion.class
deleted file mode 100644
index 93a9a728e7e..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ClientException$Companion.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ClientException.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ClientException.class
deleted file mode 100644
index e202eec1083..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ClientException.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/Informational.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/Informational.class
deleted file mode 100644
index c12bc3c21ac..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/Informational.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/Redirection.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/Redirection.class
deleted file mode 100644
index 30d7e219312..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/Redirection.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/RequestConfig.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/RequestConfig.class
deleted file mode 100644
index d2eb3516ab1..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/RequestConfig.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/RequestMethod.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/RequestMethod.class
deleted file mode 100644
index 169e3cbaac8..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/RequestMethod.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ResponseExtensionsKt.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ResponseExtensionsKt.class
deleted file mode 100644
index e817899b90d..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ResponseExtensionsKt.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ResponseType.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ResponseType.class
deleted file mode 100644
index 1a90dacf0cd..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ResponseType.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/Serializer.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/Serializer.class
deleted file mode 100644
index b9938311eca..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/Serializer.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ServerError.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ServerError.class
deleted file mode 100644
index 4c831fec3ab..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ServerError.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ServerException$Companion.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ServerException$Companion.class
deleted file mode 100644
index 04455fb2d5d..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ServerException$Companion.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ServerException.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ServerException.class
deleted file mode 100644
index 538e8b71d61..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/ServerException.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/Success.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/Success.class
deleted file mode 100644
index 8670bb9a565..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/infrastructure/Success.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/models/ApiResponse.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/models/ApiResponse.class
deleted file mode 100644
index 0c9d778af6c..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/models/ApiResponse.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/models/Category.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/models/Category.class
deleted file mode 100644
index c55a7ddc4bf..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/models/Category.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/models/Order$Status.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/models/Order$Status.class
deleted file mode 100644
index 3fcef8ee1f0..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/models/Order$Status.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/models/Order.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/models/Order.class
deleted file mode 100644
index 72a60e3bdee..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/models/Order.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/models/Pet$Status.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/models/Pet$Status.class
deleted file mode 100644
index 929260b549c..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/models/Pet$Status.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/models/Pet.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/models/Pet.class
deleted file mode 100644
index 108128b0902..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/models/Pet.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/models/Tag.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/models/Tag.class
deleted file mode 100644
index 13f3ef1899f..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/models/Tag.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/models/User.class b/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/models/User.class
deleted file mode 100644
index 3194e74c950..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/classes/main/io/swagger/client/models/User.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-build/caches/artifact-difference.tab b/samples/client/petstore/kotlin-threetenbp/build/kotlin-build/caches/artifact-difference.tab
deleted file mode 100644
index 0b7901cbc50..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-build/caches/artifact-difference.tab and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-build/caches/artifact-difference.tab.keystream b/samples/client/petstore/kotlin-threetenbp/build/kotlin-build/caches/artifact-difference.tab.keystream
deleted file mode 100644
index e0099310274..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-build/caches/artifact-difference.tab.keystream and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-build/caches/artifact-difference.tab.keystream.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin-build/caches/artifact-difference.tab.keystream.len
deleted file mode 100644
index 0764b5d2e04..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-build/caches/artifact-difference.tab.keystream.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-build/caches/artifact-difference.tab.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin-build/caches/artifact-difference.tab.len
deleted file mode 100644
index 60e2d8aa9e1..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-build/caches/artifact-difference.tab.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-build/caches/artifact-difference.tab.values.at b/samples/client/petstore/kotlin-threetenbp/build/kotlin-build/caches/artifact-difference.tab.values.at
deleted file mode 100644
index 2314aa1d2ef..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-build/caches/artifact-difference.tab.values.at and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-build/caches/artifact-difference.tab_i b/samples/client/petstore/kotlin-threetenbp/build/kotlin-build/caches/artifact-difference.tab_i
deleted file mode 100644
index 18714361f25..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-build/caches/artifact-difference.tab_i and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-build/caches/artifact-difference.tab_i.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin-build/caches/artifact-difference.tab_i.len
deleted file mode 100644
index 131e265740f..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-build/caches/artifact-difference.tab_i.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-build/caches/version.txt b/samples/client/petstore/kotlin-threetenbp/build/kotlin-build/caches/version.txt
deleted file mode 100644
index 01aabacbfd4..00000000000
--- a/samples/client/petstore/kotlin-threetenbp/build/kotlin-build/caches/version.txt
+++ /dev/null
@@ -1 +0,0 @@
-11001
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/META-INF/kotlin-petstore-threetenbp_main.kotlin_module b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/META-INF/kotlin-petstore-threetenbp_main.kotlin_module
deleted file mode 100644
index 5fb11c48d1d..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/META-INF/kotlin-petstore-threetenbp_main.kotlin_module and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/apis/PetApi$WhenMappings.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/apis/PetApi$WhenMappings.class
deleted file mode 100644
index fd018d81be1..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/apis/PetApi$WhenMappings.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/apis/PetApi.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/apis/PetApi.class
deleted file mode 100644
index e142fa08e40..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/apis/PetApi.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/apis/StoreApi$WhenMappings.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/apis/StoreApi$WhenMappings.class
deleted file mode 100644
index c05a8359a97..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/apis/StoreApi$WhenMappings.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/apis/StoreApi.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/apis/StoreApi.class
deleted file mode 100644
index 2355932803b..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/apis/StoreApi.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/apis/UserApi$WhenMappings.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/apis/UserApi$WhenMappings.class
deleted file mode 100644
index 0398aba4c89..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/apis/UserApi$WhenMappings.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/apis/UserApi.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/apis/UserApi.class
deleted file mode 100644
index 2db1cfb63ae..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/apis/UserApi.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ApiAbstractionsKt$defaultMultiValueConverter$1.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ApiAbstractionsKt$defaultMultiValueConverter$1.class
deleted file mode 100644
index 3ec083a98a5..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ApiAbstractionsKt$defaultMultiValueConverter$1.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ApiAbstractionsKt.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ApiAbstractionsKt.class
deleted file mode 100644
index 6e7bfedce72..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ApiAbstractionsKt.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ApiClient$Companion.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ApiClient$Companion.class
deleted file mode 100644
index f709388299e..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ApiClient$Companion.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ApiClient$WhenMappings.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ApiClient$WhenMappings.class
deleted file mode 100644
index f725ffd747f..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ApiClient$WhenMappings.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ApiClient$requestBody$1.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ApiClient$requestBody$1.class
deleted file mode 100644
index 410129d5238..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ApiClient$requestBody$1.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ApiClient.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ApiClient.class
deleted file mode 100644
index 0783fe8b401..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ApiClient.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ApiInfrastructureResponse.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ApiInfrastructureResponse.class
deleted file mode 100644
index 67bf5132438..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ApiInfrastructureResponse.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ApplicationDelegates$SetOnce.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ApplicationDelegates$SetOnce.class
deleted file mode 100644
index 30fe7b7cc43..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ApplicationDelegates$SetOnce.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ApplicationDelegates.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ApplicationDelegates.class
deleted file mode 100644
index 91e7bba9b0a..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ApplicationDelegates.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ClientError.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ClientError.class
deleted file mode 100644
index 7e9926c18c1..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ClientError.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ClientException$Companion.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ClientException$Companion.class
deleted file mode 100644
index 93a9a728e7e..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ClientException$Companion.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ClientException.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ClientException.class
deleted file mode 100644
index e202eec1083..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ClientException.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/Informational.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/Informational.class
deleted file mode 100644
index c12bc3c21ac..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/Informational.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/Redirection.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/Redirection.class
deleted file mode 100644
index 30d7e219312..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/Redirection.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/RequestConfig.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/RequestConfig.class
deleted file mode 100644
index d2eb3516ab1..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/RequestConfig.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/RequestMethod.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/RequestMethod.class
deleted file mode 100644
index 169e3cbaac8..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/RequestMethod.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ResponseExtensionsKt.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ResponseExtensionsKt.class
deleted file mode 100644
index e817899b90d..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ResponseExtensionsKt.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ResponseType.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ResponseType.class
deleted file mode 100644
index 1a90dacf0cd..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ResponseType.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/Serializer.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/Serializer.class
deleted file mode 100644
index b9938311eca..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/Serializer.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ServerError.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ServerError.class
deleted file mode 100644
index 4c831fec3ab..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ServerError.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ServerException$Companion.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ServerException$Companion.class
deleted file mode 100644
index 04455fb2d5d..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ServerException$Companion.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ServerException.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ServerException.class
deleted file mode 100644
index 538e8b71d61..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/ServerException.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/Success.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/Success.class
deleted file mode 100644
index 8670bb9a565..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/infrastructure/Success.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/models/ApiResponse.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/models/ApiResponse.class
deleted file mode 100644
index 0c9d778af6c..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/models/ApiResponse.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/models/Category.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/models/Category.class
deleted file mode 100644
index c55a7ddc4bf..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/models/Category.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/models/Order$Status.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/models/Order$Status.class
deleted file mode 100644
index 3fcef8ee1f0..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/models/Order$Status.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/models/Order.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/models/Order.class
deleted file mode 100644
index 72a60e3bdee..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/models/Order.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/models/Pet$Status.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/models/Pet$Status.class
deleted file mode 100644
index 929260b549c..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/models/Pet$Status.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/models/Pet.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/models/Pet.class
deleted file mode 100644
index 108128b0902..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/models/Pet.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/models/Tag.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/models/Tag.class
deleted file mode 100644
index 13f3ef1899f..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/models/Tag.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/models/User.class b/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/models/User.class
deleted file mode 100644
index 3194e74c950..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin-classes/main/io/swagger/client/models/User.class and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/class-fq-name-to-source.tab b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/class-fq-name-to-source.tab
deleted file mode 100644
index 9698c083271..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/class-fq-name-to-source.tab and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/class-fq-name-to-source.tab.keystream b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/class-fq-name-to-source.tab.keystream
deleted file mode 100644
index 51d41b8af15..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/class-fq-name-to-source.tab.keystream and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/class-fq-name-to-source.tab.keystream.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/class-fq-name-to-source.tab.keystream.len
deleted file mode 100644
index c734def4a5f..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/class-fq-name-to-source.tab.keystream.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/class-fq-name-to-source.tab.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/class-fq-name-to-source.tab.len
deleted file mode 100644
index c6e7e057904..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/class-fq-name-to-source.tab.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/class-fq-name-to-source.tab.values.at b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/class-fq-name-to-source.tab.values.at
deleted file mode 100644
index 242418aafdd..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/class-fq-name-to-source.tab.values.at and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/class-fq-name-to-source.tab_i b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/class-fq-name-to-source.tab_i
deleted file mode 100644
index bc536df2914..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/class-fq-name-to-source.tab_i and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/class-fq-name-to-source.tab_i.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/class-fq-name-to-source.tab_i.len
deleted file mode 100644
index 131e265740f..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/class-fq-name-to-source.tab_i.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/inline-functions.tab b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/inline-functions.tab
deleted file mode 100644
index 4e7b53fb343..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/inline-functions.tab and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/inline-functions.tab.keystream b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/inline-functions.tab.keystream
deleted file mode 100644
index 79f7a952772..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/inline-functions.tab.keystream and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/inline-functions.tab.keystream.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/inline-functions.tab.keystream.len
deleted file mode 100644
index 5b8e1acbb40..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/inline-functions.tab.keystream.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/inline-functions.tab.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/inline-functions.tab.len
deleted file mode 100644
index 60e2d8aa9e1..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/inline-functions.tab.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/inline-functions.tab.values.at b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/inline-functions.tab.values.at
deleted file mode 100644
index 6f180a8d9c8..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/inline-functions.tab.values.at and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/inline-functions.tab_i b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/inline-functions.tab_i
deleted file mode 100644
index 6db8e8b6ee9..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/inline-functions.tab_i and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/inline-functions.tab_i.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/inline-functions.tab_i.len
deleted file mode 100644
index 131e265740f..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/inline-functions.tab_i.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/internal-name-to-source.tab b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/internal-name-to-source.tab
deleted file mode 100644
index aed8f2f4ab2..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/internal-name-to-source.tab and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/internal-name-to-source.tab.keystream b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/internal-name-to-source.tab.keystream
deleted file mode 100644
index 8e5cc3df256..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/internal-name-to-source.tab.keystream and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/internal-name-to-source.tab.keystream.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/internal-name-to-source.tab.keystream.len
deleted file mode 100644
index f4e5765a19b..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/internal-name-to-source.tab.keystream.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/internal-name-to-source.tab.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/internal-name-to-source.tab.len
deleted file mode 100644
index f3c9bb2e414..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/internal-name-to-source.tab.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/internal-name-to-source.tab.values.at b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/internal-name-to-source.tab.values.at
deleted file mode 100644
index e283efecc88..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/internal-name-to-source.tab.values.at and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/internal-name-to-source.tab_i b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/internal-name-to-source.tab_i
deleted file mode 100644
index 04e6972ad61..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/internal-name-to-source.tab_i and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/internal-name-to-source.tab_i.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/internal-name-to-source.tab_i.len
deleted file mode 100644
index 131e265740f..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/internal-name-to-source.tab_i.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/package-parts.tab b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/package-parts.tab
deleted file mode 100644
index bdf69d76ea6..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/package-parts.tab and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/package-parts.tab.keystream b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/package-parts.tab.keystream
deleted file mode 100644
index 79ab7f96696..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/package-parts.tab.keystream and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/package-parts.tab.keystream.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/package-parts.tab.keystream.len
deleted file mode 100644
index 1e614067b17..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/package-parts.tab.keystream.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/package-parts.tab.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/package-parts.tab.len
deleted file mode 100644
index ad90f24106f..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/package-parts.tab.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/package-parts.tab.values.at b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/package-parts.tab.values.at
deleted file mode 100644
index 6fcb00a84b3..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/package-parts.tab.values.at and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/package-parts.tab_i b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/package-parts.tab_i
deleted file mode 100644
index 259bee5f3f6..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/package-parts.tab_i and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/package-parts.tab_i.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/package-parts.tab_i.len
deleted file mode 100644
index 131e265740f..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/package-parts.tab_i.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/proto.tab b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/proto.tab
deleted file mode 100644
index d05098849be..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/proto.tab and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/proto.tab.keystream b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/proto.tab.keystream
deleted file mode 100644
index 9243f15195c..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/proto.tab.keystream and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/proto.tab.keystream.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/proto.tab.keystream.len
deleted file mode 100644
index c9234486c2a..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/proto.tab.keystream.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/proto.tab.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/proto.tab.len
deleted file mode 100644
index b00eead6f26..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/proto.tab.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/proto.tab.values.at b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/proto.tab.values.at
deleted file mode 100644
index ed88f9607b1..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/proto.tab.values.at and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/proto.tab_i b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/proto.tab_i
deleted file mode 100644
index cd7ca76c4b0..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/proto.tab_i and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/proto.tab_i.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/proto.tab_i.len
deleted file mode 100644
index 131e265740f..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/proto.tab_i.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/source-to-classes.tab b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/source-to-classes.tab
deleted file mode 100644
index 7805aa3afb0..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/source-to-classes.tab and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/source-to-classes.tab.keystream b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/source-to-classes.tab.keystream
deleted file mode 100644
index 8605b7eed4b..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/source-to-classes.tab.keystream and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/source-to-classes.tab.keystream.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/source-to-classes.tab.keystream.len
deleted file mode 100644
index f507750d53d..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/source-to-classes.tab.keystream.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/source-to-classes.tab.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/source-to-classes.tab.len
deleted file mode 100644
index a2ad6d02528..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/source-to-classes.tab.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/source-to-classes.tab.values.at b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/source-to-classes.tab.values.at
deleted file mode 100644
index 76b2d124a48..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/source-to-classes.tab.values.at and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/source-to-classes.tab_i b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/source-to-classes.tab_i
deleted file mode 100644
index bed2aef2dd0..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/source-to-classes.tab_i and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/source-to-classes.tab_i.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/source-to-classes.tab_i.len
deleted file mode 100644
index 131e265740f..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/source-to-classes.tab_i.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/sources-to-classfiles.tab b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/sources-to-classfiles.tab
deleted file mode 100644
index fadd7710b7c..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/sources-to-classfiles.tab and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/sources-to-classfiles.tab.keystream b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/sources-to-classfiles.tab.keystream
deleted file mode 100644
index 1a80a25362d..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/sources-to-classfiles.tab.keystream and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/sources-to-classfiles.tab.keystream.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/sources-to-classfiles.tab.keystream.len
deleted file mode 100644
index f507750d53d..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/sources-to-classfiles.tab.keystream.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/sources-to-classfiles.tab.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/sources-to-classfiles.tab.len
deleted file mode 100644
index a2ad6d02528..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/sources-to-classfiles.tab.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/sources-to-classfiles.tab.values.at b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/sources-to-classfiles.tab.values.at
deleted file mode 100644
index cebd8177477..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/sources-to-classfiles.tab.values.at and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/sources-to-classfiles.tab_i b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/sources-to-classfiles.tab_i
deleted file mode 100644
index 90bc4b330ea..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/sources-to-classfiles.tab_i and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/sources-to-classfiles.tab_i.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/sources-to-classfiles.tab_i.len
deleted file mode 100644
index 131e265740f..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/sources-to-classfiles.tab_i.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/subtypes.tab b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/subtypes.tab
deleted file mode 100644
index f2c13ebf422..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/subtypes.tab and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/subtypes.tab.keystream b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/subtypes.tab.keystream
deleted file mode 100644
index dad1f4bb971..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/subtypes.tab.keystream and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/subtypes.tab.keystream.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/subtypes.tab.keystream.len
deleted file mode 100644
index 98b33a3c74a..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/subtypes.tab.keystream.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/subtypes.tab.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/subtypes.tab.len
deleted file mode 100644
index 9ab13912bc1..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/subtypes.tab.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/subtypes.tab.values.at b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/subtypes.tab.values.at
deleted file mode 100644
index 32e22aa918c..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/subtypes.tab.values.at and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/subtypes.tab_i b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/subtypes.tab_i
deleted file mode 100644
index a9a1fd01f32..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/subtypes.tab_i and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/subtypes.tab_i.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/subtypes.tab_i.len
deleted file mode 100644
index 131e265740f..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/subtypes.tab_i.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/supertypes.tab b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/supertypes.tab
deleted file mode 100644
index ccd74180ff9..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/supertypes.tab and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/supertypes.tab.keystream b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/supertypes.tab.keystream
deleted file mode 100644
index acceec86ff6..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/supertypes.tab.keystream and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/supertypes.tab.keystream.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/supertypes.tab.keystream.len
deleted file mode 100644
index 03695e1374e..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/supertypes.tab.keystream.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/supertypes.tab.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/supertypes.tab.len
deleted file mode 100644
index 672fe66962c..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/supertypes.tab.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/supertypes.tab.values.at b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/supertypes.tab.values.at
deleted file mode 100644
index ffc5beea855..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/supertypes.tab.values.at and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/supertypes.tab_i b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/supertypes.tab_i
deleted file mode 100644
index ad4ad79f33c..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/supertypes.tab_i and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/supertypes.tab_i.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/supertypes.tab_i.len
deleted file mode 100644
index 131e265740f..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/increCache.kotlin-petstore-threetenbp_main/kotlin/supertypes.tab_i.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/counters.tab b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/counters.tab
deleted file mode 100644
index 1dd29984626..00000000000
--- a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/counters.tab
+++ /dev/null
@@ -1,2 +0,0 @@
-26
-8
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/file-to-id.tab b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/file-to-id.tab
deleted file mode 100644
index 98f78f38dca..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/file-to-id.tab and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/file-to-id.tab.keystream b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/file-to-id.tab.keystream
deleted file mode 100644
index 33c17ef1a34..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/file-to-id.tab.keystream and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/file-to-id.tab.keystream.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/file-to-id.tab.keystream.len
deleted file mode 100644
index 5ff004b0b4b..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/file-to-id.tab.keystream.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/file-to-id.tab.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/file-to-id.tab.len
deleted file mode 100644
index a2ad6d02528..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/file-to-id.tab.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/file-to-id.tab.values.at b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/file-to-id.tab.values.at
deleted file mode 100644
index c5f71a077a3..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/file-to-id.tab.values.at and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/file-to-id.tab_i b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/file-to-id.tab_i
deleted file mode 100644
index 809edbffa14..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/file-to-id.tab_i and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/file-to-id.tab_i.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/file-to-id.tab_i.len
deleted file mode 100644
index 131e265740f..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/file-to-id.tab_i.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/id-to-file.tab b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/id-to-file.tab
deleted file mode 100644
index 1c0237c0acd..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/id-to-file.tab and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/id-to-file.tab.keystream b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/id-to-file.tab.keystream
deleted file mode 100644
index fc6376819cb..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/id-to-file.tab.keystream and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/id-to-file.tab.keystream.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/id-to-file.tab.keystream.len
deleted file mode 100644
index 6cf2665c8e7..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/id-to-file.tab.keystream.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/id-to-file.tab.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/id-to-file.tab.len
deleted file mode 100644
index 88cfb98ece7..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/id-to-file.tab.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/id-to-file.tab.values.at b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/id-to-file.tab.values.at
deleted file mode 100644
index 48170099cb9..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/id-to-file.tab.values.at and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/id-to-file.tab_i b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/id-to-file.tab_i
deleted file mode 100644
index ffacdef7072..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/id-to-file.tab_i and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/id-to-file.tab_i.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/id-to-file.tab_i.len
deleted file mode 100644
index 131e265740f..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/id-to-file.tab_i.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/lookups.tab b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/lookups.tab
deleted file mode 100644
index de0af9bb94c..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/lookups.tab and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/lookups.tab.keystream b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/lookups.tab.keystream
deleted file mode 100644
index 4b6094bfc93..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/lookups.tab.keystream and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/lookups.tab.keystream.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/lookups.tab.keystream.len
deleted file mode 100644
index c52ae5080f4..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/lookups.tab.keystream.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/lookups.tab.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/lookups.tab.len
deleted file mode 100644
index fcf22409368..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/lookups.tab.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/lookups.tab.values.at b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/lookups.tab.values.at
deleted file mode 100644
index 9cf6360374c..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/lookups.tab.values.at and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/lookups.tab_i b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/lookups.tab_i
deleted file mode 100644
index 47e49b72d38..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/lookups.tab_i and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/lookups.tab_i.len b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/lookups.tab_i.len
deleted file mode 100644
index 131e265740f..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/caches/lookups/lookups.tab_i.len and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/data-container-format-version.txt b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/data-container-format-version.txt
deleted file mode 100644
index b01b80f991e..00000000000
--- a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/data-container-format-version.txt
+++ /dev/null
@@ -1 +0,0 @@
-2011001
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/experimental-format-version.txt b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/experimental-format-version.txt
deleted file mode 100644
index 7289c6bdc48..00000000000
--- a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/experimental-format-version.txt
+++ /dev/null
@@ -1 +0,0 @@
-4011001
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/format-version.txt b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/format-version.txt
deleted file mode 100644
index 2408adbb9f3..00000000000
--- a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/format-version.txt
+++ /dev/null
@@ -1 +0,0 @@
-8011001
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/gradle-format-version.txt b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/gradle-format-version.txt
deleted file mode 100644
index 178119c8870..00000000000
--- a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/gradle-format-version.txt
+++ /dev/null
@@ -1 +0,0 @@
-3011001
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/last-build.bin b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/last-build.bin
deleted file mode 100644
index 13c724331d6..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/last-build.bin and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/sync/kotlin-files-in-java-timestamps.bin b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/sync/kotlin-files-in-java-timestamps.bin
deleted file mode 100644
index e6f90a3dd37..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileKotlin/sync/kotlin-files-in-java-timestamps.bin and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileTestKotlin/sync/kotlin-files-in-java-timestamps.bin b/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileTestKotlin/sync/kotlin-files-in-java-timestamps.bin
deleted file mode 100644
index 4170ef3ff24..00000000000
Binary files a/samples/client/petstore/kotlin-threetenbp/build/kotlin/compileTestKotlin/sync/kotlin-files-in-java-timestamps.bin and /dev/null differ
diff --git a/samples/client/petstore/kotlin-threetenbp/docs/PetApi.md b/samples/client/petstore/kotlin-threetenbp/docs/PetApi.md
index 29fb5bd0eeb..6aef25bf53b 100644
--- a/samples/client/petstore/kotlin-threetenbp/docs/PetApi.md
+++ b/samples/client/petstore/kotlin-threetenbp/docs/PetApi.md
@@ -16,22 +16,20 @@ Method | HTTP request | Description
 
 <a name="addPet"></a>
 # **addPet**
-> addPet(body)
+> addPet(pet)
 
 Add a new pet to the store
 
-
-
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val body : Pet =  // Pet | Pet object that needs to be added to the store
+val pet : Pet =  // Pet | Pet object that needs to be added to the store
 try {
-    apiInstance.addPet(body)
+    apiInstance.addPet(pet)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#addPet")
     e.printStackTrace()
@@ -45,7 +43,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
+ **pet** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
 
 ### Return type
 
@@ -58,7 +56,7 @@ null (empty response body)
 ### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
- - **Accept**: application/xml, application/json
+ - **Accept**: Not defined
 
 <a name="deletePet"></a>
 # **deletePet**
@@ -66,13 +64,11 @@ null (empty response body)
 
 Deletes a pet
 
-
-
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
 val petId : kotlin.Long = 789 // kotlin.Long | Pet id to delete
@@ -106,7 +102,7 @@ null (empty response body)
 ### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+ - **Accept**: Not defined
 
 <a name="findPetsByStatus"></a>
 # **findPetsByStatus**
@@ -119,8 +115,8 @@ Multiple status values can be provided with comma separated strings
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
 val status : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Status values that need to be considered for filter
@@ -166,8 +162,8 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
 val tags : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Tags to filter by
@@ -213,8 +209,8 @@ Returns a single pet
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
 val petId : kotlin.Long = 789 // kotlin.Long | ID of pet to return
@@ -251,22 +247,20 @@ Name | Type | Description  | Notes
 
 <a name="updatePet"></a>
 # **updatePet**
-> updatePet(body)
+> updatePet(pet)
 
 Update an existing pet
 
-
-
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
-val body : Pet =  // Pet | Pet object that needs to be added to the store
+val pet : Pet =  // Pet | Pet object that needs to be added to the store
 try {
-    apiInstance.updatePet(body)
+    apiInstance.updatePet(pet)
 } catch (e: ClientException) {
     println("4xx response calling PetApi#updatePet")
     e.printStackTrace()
@@ -280,7 +274,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
+ **pet** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
 
 ### Return type
 
@@ -293,7 +287,7 @@ null (empty response body)
 ### HTTP request headers
 
  - **Content-Type**: application/json, application/xml
- - **Accept**: application/xml, application/json
+ - **Accept**: Not defined
 
 <a name="updatePetWithForm"></a>
 # **updatePetWithForm**
@@ -301,13 +295,11 @@ null (empty response body)
 
 Updates a pet in the store with form data
 
-
-
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
 val petId : kotlin.Long = 789 // kotlin.Long | ID of pet that needs to be updated
@@ -329,8 +321,8 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **petId** | **kotlin.Long**| ID of pet that needs to be updated |
- **name** | **kotlin.String**| Updated name of the pet | [optional]
- **status** | **kotlin.String**| Updated status of the pet | [optional]
+ **name** | **kotlin.String**| Updated name of the pet | [optional] [default to null]
+ **status** | **kotlin.String**| Updated status of the pet | [optional] [default to null]
 
 ### Return type
 
@@ -343,7 +335,7 @@ null (empty response body)
 ### HTTP request headers
 
  - **Content-Type**: application/x-www-form-urlencoded
- - **Accept**: application/xml, application/json
+ - **Accept**: Not defined
 
 <a name="uploadFile"></a>
 # **uploadFile**
@@ -351,18 +343,16 @@ null (empty response body)
 
 uploads an image
 
-
-
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
 val petId : kotlin.Long = 789 // kotlin.Long | ID of pet to update
 val additionalMetadata : kotlin.String = additionalMetadata_example // kotlin.String | Additional data to pass to server
-val file : java.io.File = /path/to/file.txt // java.io.File | file to upload
+val file : java.io.File = BINARY_DATA_HERE // java.io.File | file to upload
 try {
     val result : ApiResponse = apiInstance.uploadFile(petId, additionalMetadata, file)
     println(result)
@@ -380,8 +370,8 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **petId** | **kotlin.Long**| ID of pet to update |
- **additionalMetadata** | **kotlin.String**| Additional data to pass to server | [optional]
- **file** | **java.io.File**| file to upload | [optional]
+ **additionalMetadata** | **kotlin.String**| Additional data to pass to server | [optional] [default to null]
+ **file** | **java.io.File**| file to upload | [optional] [default to null]
 
 ### Return type
 
diff --git a/samples/client/petstore/kotlin-threetenbp/docs/StoreApi.md b/samples/client/petstore/kotlin-threetenbp/docs/StoreApi.md
index 022e1362b0f..13e978ac895 100644
--- a/samples/client/petstore/kotlin-threetenbp/docs/StoreApi.md
+++ b/samples/client/petstore/kotlin-threetenbp/docs/StoreApi.md
@@ -21,8 +21,8 @@ For valid response try integer IDs with value &lt; 1000. Anything above 1000 or
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = StoreApi()
 val orderId : kotlin.String = orderId_example // kotlin.String | ID of the order that needs to be deleted
@@ -54,7 +54,7 @@ No authorization required
 ### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+ - **Accept**: Not defined
 
 <a name="getInventory"></a>
 # **getInventory**
@@ -67,8 +67,8 @@ Returns a map of status codes to quantities
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = StoreApi()
 try {
@@ -110,8 +110,8 @@ For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other val
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = StoreApi()
 val orderId : kotlin.Long = 789 // kotlin.Long | ID of pet that needs to be fetched
@@ -148,22 +148,20 @@ No authorization required
 
 <a name="placeOrder"></a>
 # **placeOrder**
-> Order placeOrder(body)
+> Order placeOrder(order)
 
 Place an order for a pet
 
-
-
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = StoreApi()
-val body : Order =  // Order | order placed for purchasing the pet
+val order : Order =  // Order | order placed for purchasing the pet
 try {
-    val result : Order = apiInstance.placeOrder(body)
+    val result : Order = apiInstance.placeOrder(order)
     println(result)
 } catch (e: ClientException) {
     println("4xx response calling StoreApi#placeOrder")
@@ -178,7 +176,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**Order**](Order.md)| order placed for purchasing the pet |
+ **order** | [**Order**](Order.md)| order placed for purchasing the pet |
 
 ### Return type
 
diff --git a/samples/client/petstore/kotlin-threetenbp/docs/UserApi.md b/samples/client/petstore/kotlin-threetenbp/docs/UserApi.md
index 0c4b9b79de8..81fc42807d3 100644
--- a/samples/client/petstore/kotlin-threetenbp/docs/UserApi.md
+++ b/samples/client/petstore/kotlin-threetenbp/docs/UserApi.md
@@ -16,7 +16,7 @@ Method | HTTP request | Description
 
 <a name="createUser"></a>
 # **createUser**
-> createUser(body)
+> createUser(user)
 
 Create user
 
@@ -25,13 +25,13 @@ This can only be done by the logged in user.
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val body : User =  // User | Created user object
+val user : User =  // User | Created user object
 try {
-    apiInstance.createUser(body)
+    apiInstance.createUser(user)
 } catch (e: ClientException) {
     println("4xx response calling UserApi#createUser")
     e.printStackTrace()
@@ -45,7 +45,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**User**](User.md)| Created user object |
+ **user** | [**User**](User.md)| Created user object |
 
 ### Return type
 
@@ -58,26 +58,24 @@ No authorization required
 ### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+ - **Accept**: Not defined
 
 <a name="createUsersWithArrayInput"></a>
 # **createUsersWithArrayInput**
-> createUsersWithArrayInput(body)
+> createUsersWithArrayInput(user)
 
 Creates list of users with given input array
 
-
-
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val user : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
 try {
-    apiInstance.createUsersWithArrayInput(body)
+    apiInstance.createUsersWithArrayInput(user)
 } catch (e: ClientException) {
     println("4xx response calling UserApi#createUsersWithArrayInput")
     e.printStackTrace()
@@ -91,7 +89,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **user** | [**kotlin.Array&lt;User&gt;**](kotlin.Array.md)| List of user object |
 
 ### Return type
 
@@ -104,26 +102,24 @@ No authorization required
 ### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+ - **Accept**: Not defined
 
 <a name="createUsersWithListInput"></a>
 # **createUsersWithListInput**
-> createUsersWithListInput(body)
+> createUsersWithListInput(user)
 
 Creates list of users with given input array
 
-
-
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
-val body : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
+val user : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
 try {
-    apiInstance.createUsersWithListInput(body)
+    apiInstance.createUsersWithListInput(user)
 } catch (e: ClientException) {
     println("4xx response calling UserApi#createUsersWithListInput")
     e.printStackTrace()
@@ -137,7 +133,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**kotlin.Array&lt;User&gt;**](User.md)| List of user object |
+ **user** | [**kotlin.Array&lt;User&gt;**](kotlin.Array.md)| List of user object |
 
 ### Return type
 
@@ -150,7 +146,7 @@ No authorization required
 ### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+ - **Accept**: Not defined
 
 <a name="deleteUser"></a>
 # **deleteUser**
@@ -163,8 +159,8 @@ This can only be done by the logged in user.
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
 val username : kotlin.String = username_example // kotlin.String | The name that needs to be deleted
@@ -196,7 +192,7 @@ No authorization required
 ### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+ - **Accept**: Not defined
 
 <a name="getUserByName"></a>
 # **getUserByName**
@@ -204,13 +200,11 @@ No authorization required
 
 Get user by user name
 
-
-
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
 val username : kotlin.String = username_example // kotlin.String | The name that needs to be fetched. Use user1 for testing.
@@ -251,13 +245,11 @@ No authorization required
 
 Logs user into the system
 
-
-
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
 val username : kotlin.String = username_example // kotlin.String | The user name for login
@@ -300,13 +292,11 @@ No authorization required
 
 Logs out current logged in user session
 
-
-
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
 try {
@@ -334,11 +324,11 @@ No authorization required
 ### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+ - **Accept**: Not defined
 
 <a name="updateUser"></a>
 # **updateUser**
-> updateUser(username, body)
+> updateUser(username, user)
 
 Updated user
 
@@ -347,14 +337,14 @@ This can only be done by the logged in user.
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
 val username : kotlin.String = username_example // kotlin.String | name that need to be deleted
-val body : User =  // User | Updated user object
+val user : User =  // User | Updated user object
 try {
-    apiInstance.updateUser(username, body)
+    apiInstance.updateUser(username, user)
 } catch (e: ClientException) {
     println("4xx response calling UserApi#updateUser")
     e.printStackTrace()
@@ -369,7 +359,7 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **username** | **kotlin.String**| name that need to be deleted |
- **body** | [**User**](User.md)| Updated user object |
+ **user** | [**User**](User.md)| Updated user object |
 
 ### Return type
 
@@ -382,5 +372,5 @@ No authorization required
 ### HTTP request headers
 
  - **Content-Type**: Not defined
- - **Accept**: application/xml, application/json
+ - **Accept**: Not defined
 
diff --git a/samples/client/petstore/kotlin-threetenbp/pom.xml b/samples/client/petstore/kotlin-threetenbp/pom.xml
index 12d2d229e87..7a670388889 100644
--- a/samples/client/petstore/kotlin-threetenbp/pom.xml
+++ b/samples/client/petstore/kotlin-threetenbp/pom.xml
@@ -1,10 +1,10 @@
 <project>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>io.swagger</groupId>
+    <groupId>org.openapitools</groupId>
     <artifactId>KotlinPetstoreThreetenbpTests</artifactId>
     <packaging>pom</packaging>
     <version>1.0-SNAPSHOT</version>
-    <name>Kotlin Swagger Threetenbp Client</name>
+    <name>kotlin-threetenbp</name>
     <build>
         <plugins>
             <plugin>
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/models/ApiResponse.kt
deleted file mode 100644
index f57d1aee9a6..00000000000
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/models/ApiResponse.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
-* Swagger Petstore
-* This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*/
-package io.swagger.client.models
-
-import org.threeten.bp.LocalDateTime
-
-/**
- * Describes the result of uploading an image resource
- * @param code 
- * @param type 
- * @param message 
- */
-data class ApiResponse (
-    val code: kotlin.Int? = null,
-    val type: kotlin.String? = null,
-    val message: kotlin.String? = null
-) {
-
-}
-
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/models/Category.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/models/Category.kt
deleted file mode 100644
index 26752b7c515..00000000000
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/models/Category.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
-* Swagger Petstore
-* This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*/
-package io.swagger.client.models
-
-import org.threeten.bp.LocalDateTime
-
-/**
- * A category for a pet
- * @param id 
- * @param name 
- */
-data class Category (
-    val id: kotlin.Long? = null,
-    val name: kotlin.String? = null
-) {
-
-}
-
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/models/Tag.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/models/Tag.kt
deleted file mode 100644
index ddedce7ec88..00000000000
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/models/Tag.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
-* Swagger Petstore
-* This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
-* Do not edit the class manually.
-*/
-package io.swagger.client.models
-
-import org.threeten.bp.LocalDateTime
-
-/**
- * A tag for a pet
- * @param id 
- * @param name 
- */
-data class Tag (
-    val id: kotlin.Long? = null,
-    val name: kotlin.String? = null
-) {
-
-}
-
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/apis/PetApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
similarity index 90%
rename from samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/apis/PetApi.kt
rename to samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index e974ea07f9e..4419bfda152 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -1,20 +1,20 @@
 /**
-* Swagger Petstore
-* This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+* OpenAPI Petstore
+* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
+* 
 *
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
 * Do not edit the class manually.
 */
-package io.swagger.client.apis
+package org.openapitools.client.apis
 
-import io.swagger.client.models.ApiResponse
-import io.swagger.client.models.Pet
+import org.openapitools.client.models.ApiResponse
+import org.openapitools.client.models.Pet
 
-import io.swagger.client.infrastructure.*
+import org.openapitools.client.infrastructure.*
 import org.threeten.bp.LocalDateTime
 
 class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) {
@@ -22,11 +22,11 @@ class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCli
     /**
     * Add a new pet to the store
     * 
-    * @param body Pet object that needs to be added to the store 
+    * @param pet Pet object that needs to be added to the store 
     * @return void
     */
-    fun addPet(body: Pet) : Unit {
-        val localVariableBody: kotlin.Any? = body
+    fun addPet(pet: Pet) : Unit {
+        val localVariableBody: kotlin.Any? = pet
         val localVariableQuery: MultiValueMap = mapOf()
         val localVariableHeaders: kotlin.collections.Map<kotlin.String,kotlin.String> = mapOf()
         val localVariableConfig = RequestConfig(
@@ -181,11 +181,11 @@ class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCli
     /**
     * Update an existing pet
     * 
-    * @param body Pet object that needs to be added to the store 
+    * @param pet Pet object that needs to be added to the store 
     * @return void
     */
-    fun updatePet(body: Pet) : Unit {
-        val localVariableBody: kotlin.Any? = body
+    fun updatePet(pet: Pet) : Unit {
+        val localVariableBody: kotlin.Any? = pet
         val localVariableQuery: MultiValueMap = mapOf()
         val localVariableHeaders: kotlin.collections.Map<kotlin.String,kotlin.String> = mapOf()
         val localVariableConfig = RequestConfig(
@@ -213,8 +213,8 @@ class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCli
     * Updates a pet in the store with form data
     * 
     * @param petId ID of pet that needs to be updated 
-    * @param name Updated name of the pet (optional)
-    * @param status Updated status of the pet (optional)
+    * @param name Updated name of the pet (optional, default to null)
+    * @param status Updated status of the pet (optional, default to null)
     * @return void
     */
     fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String, status: kotlin.String) : Unit {
@@ -246,8 +246,8 @@ class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCli
     * uploads an image
     * 
     * @param petId ID of pet to update 
-    * @param additionalMetadata Additional data to pass to server (optional)
-    * @param file file to upload (optional)
+    * @param additionalMetadata Additional data to pass to server (optional, default to null)
+    * @param file file to upload (optional, default to null)
     * @return ApiResponse
     */
     @Suppress("UNCHECKED_CAST")
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
similarity index 88%
rename from samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/apis/StoreApi.kt
rename to samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 56f6368fedf..78a9b60d440 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -1,19 +1,19 @@
 /**
-* Swagger Petstore
-* This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+* OpenAPI Petstore
+* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
+* 
 *
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
 * Do not edit the class manually.
 */
-package io.swagger.client.apis
+package org.openapitools.client.apis
 
-import io.swagger.client.models.Order
+import org.openapitools.client.models.Order
 
-import io.swagger.client.infrastructure.*
+import org.openapitools.client.infrastructure.*
 import org.threeten.bp.LocalDateTime
 
 class StoreApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) {
@@ -115,12 +115,12 @@ class StoreApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiC
     /**
     * Place an order for a pet
     * 
-    * @param body order placed for purchasing the pet 
+    * @param order order placed for purchasing the pet 
     * @return Order
     */
     @Suppress("UNCHECKED_CAST")
-    fun placeOrder(body: Order) : Order {
-        val localVariableBody: kotlin.Any? = body
+    fun placeOrder(order: Order) : Order {
+        val localVariableBody: kotlin.Any? = order
         val localVariableQuery: MultiValueMap = mapOf()
         val localVariableHeaders: kotlin.collections.Map<kotlin.String,kotlin.String> = mapOf()
         val localVariableConfig = RequestConfig(
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/apis/UserApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
similarity index 89%
rename from samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/apis/UserApi.kt
rename to samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index a7c647ce1e1..45775a597a6 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -1,19 +1,19 @@
 /**
-* Swagger Petstore
-* This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+* OpenAPI Petstore
+* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
+* 
 *
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
 * Do not edit the class manually.
 */
-package io.swagger.client.apis
+package org.openapitools.client.apis
 
-import io.swagger.client.models.User
+import org.openapitools.client.models.User
 
-import io.swagger.client.infrastructure.*
+import org.openapitools.client.infrastructure.*
 import org.threeten.bp.LocalDateTime
 
 class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) {
@@ -21,11 +21,11 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl
     /**
     * Create user
     * This can only be done by the logged in user.
-    * @param body Created user object 
+    * @param user Created user object 
     * @return void
     */
-    fun createUser(body: User) : Unit {
-        val localVariableBody: kotlin.Any? = body
+    fun createUser(user: User) : Unit {
+        val localVariableBody: kotlin.Any? = user
         val localVariableQuery: MultiValueMap = mapOf()
         val localVariableHeaders: kotlin.collections.Map<kotlin.String,kotlin.String> = mapOf()
         val localVariableConfig = RequestConfig(
@@ -52,11 +52,11 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl
     /**
     * Creates list of users with given input array
     * 
-    * @param body List of user object 
+    * @param user List of user object 
     * @return void
     */
-    fun createUsersWithArrayInput(body: kotlin.Array<User>) : Unit {
-        val localVariableBody: kotlin.Any? = body
+    fun createUsersWithArrayInput(user: kotlin.Array<User>) : Unit {
+        val localVariableBody: kotlin.Any? = user
         val localVariableQuery: MultiValueMap = mapOf()
         val localVariableHeaders: kotlin.collections.Map<kotlin.String,kotlin.String> = mapOf()
         val localVariableConfig = RequestConfig(
@@ -83,11 +83,11 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl
     /**
     * Creates list of users with given input array
     * 
-    * @param body List of user object 
+    * @param user List of user object 
     * @return void
     */
-    fun createUsersWithListInput(body: kotlin.Array<User>) : Unit {
-        val localVariableBody: kotlin.Any? = body
+    fun createUsersWithListInput(user: kotlin.Array<User>) : Unit {
+        val localVariableBody: kotlin.Any? = user
         val localVariableQuery: MultiValueMap = mapOf()
         val localVariableHeaders: kotlin.collections.Map<kotlin.String,kotlin.String> = mapOf()
         val localVariableConfig = RequestConfig(
@@ -241,11 +241,11 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl
     * Updated user
     * This can only be done by the logged in user.
     * @param username name that need to be deleted 
-    * @param body Updated user object 
+    * @param user Updated user object 
     * @return void
     */
-    fun updateUser(username: kotlin.String, body: User) : Unit {
-        val localVariableBody: kotlin.Any? = body
+    fun updateUser(username: kotlin.String, user: User) : Unit {
+        val localVariableBody: kotlin.Any? = user
         val localVariableQuery: MultiValueMap = mapOf()
         val localVariableHeaders: kotlin.collections.Map<kotlin.String,kotlin.String> = mapOf()
         val localVariableConfig = RequestConfig(
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/ApiAbstractions.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt
similarity index 92%
rename from samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/ApiAbstractions.kt
rename to samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt
index 87cc13d045b..c2c3f1f0eae 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/ApiAbstractions.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt
@@ -1,4 +1,4 @@
-package io.swagger.client.infrastructure
+package org.openapitools.client.infrastructure
 
 typealias MultiValueMap = Map<String,List<String>>
 
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
similarity index 99%
rename from samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/ApiClient.kt
rename to samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
index 7e3a11664bd..5c4ebd2acbc 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/ApiClient.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -1,4 +1,4 @@
-package io.swagger.client.infrastructure
+package org.openapitools.client.infrastructure
 
 import okhttp3.*
 import java.io.File
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/ApiInfrastructureResponse.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
similarity index 96%
rename from samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/ApiInfrastructureResponse.kt
rename to samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
index b2b8a9cbc6b..1f5fbf1a3f0 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/ApiInfrastructureResponse.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
@@ -1,4 +1,4 @@
-package io.swagger.client.infrastructure
+package org.openapitools.client.infrastructure
 
 enum class ResponseType {
     Success, Informational, Redirection, ClientError, ServerError
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/ApplicationDelegates.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApplicationDelegates.kt
similarity index 95%
rename from samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/ApplicationDelegates.kt
rename to samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApplicationDelegates.kt
index 340d32e3211..dd34bd48b2c 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/ApplicationDelegates.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApplicationDelegates.kt
@@ -1,4 +1,4 @@
-package io.swagger.client.infrastructure
+package org.openapitools.client.infrastructure
 
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/Errors.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt
similarity index 95%
rename from samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/Errors.kt
rename to samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt
index ff908d53a92..2f3b0157ba7 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/Errors.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt
@@ -1,5 +1,5 @@
 @file:Suppress("unused")
-package io.swagger.client.infrastructure
+package org.openapitools.client.infrastructure
 
 import java.lang.RuntimeException
 
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/RequestConfig.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt
similarity index 91%
rename from samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/RequestConfig.kt
rename to samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt
index 3825588ce4a..b01f63a1013 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/RequestConfig.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt
@@ -1,4 +1,4 @@
-package io.swagger.client.infrastructure
+package org.openapitools.client.infrastructure
 
 /**
  * Defines a config object for a given request.
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/RequestMethod.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt
similarity index 71%
rename from samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/RequestMethod.kt
rename to samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt
index d9d04f02701..931b12b8bd7 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/RequestMethod.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt
@@ -1,4 +1,4 @@
-package io.swagger.client.infrastructure
+package org.openapitools.client.infrastructure
 
 /**
  * Provides enumerated HTTP verbs
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/ResponseExtensions.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt
similarity index 93%
rename from samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/ResponseExtensions.kt
rename to samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt
index 04e91720138..f50104a6f35 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/ResponseExtensions.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt
@@ -1,4 +1,4 @@
-package io.swagger.client.infrastructure
+package org.openapitools.client.infrastructure
 
 import okhttp3.Response
 
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt
similarity index 88%
rename from samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/Serializer.kt
rename to samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt
index a858407ff34..24dfb79dab1 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/Serializer.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt
@@ -1,4 +1,4 @@
-package io.swagger.client.infrastructure
+package org.openapitools.client.infrastructure
 
 import com.squareup.moshi.KotlinJsonAdapterFactory
 import com.squareup.moshi.Moshi
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
new file mode 100644
index 00000000000..bcc34d18ece
--- /dev/null
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -0,0 +1,29 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+*
+* OpenAPI spec version: 1.0.0
+* 
+*
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
+* Do not edit the class manually.
+*/
+package org.openapitools.client.models
+
+import org.threeten.bp.LocalDateTime
+
+/**
+ * Describes the result of uploading an image resource
+ * @param code 
+ * @param type 
+ * @param message 
+ */
+data class ApiResponse (
+    val code: kotlin.Int? = null,
+    val type: kotlin.String? = null,
+    val message: kotlin.String? = null
+) {
+
+}
+
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Category.kt
new file mode 100644
index 00000000000..8edc6f2fc2f
--- /dev/null
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -0,0 +1,27 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+*
+* OpenAPI spec version: 1.0.0
+* 
+*
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
+* Do not edit the class manually.
+*/
+package org.openapitools.client.models
+
+import org.threeten.bp.LocalDateTime
+
+/**
+ * A category for a pet
+ * @param id 
+ * @param name 
+ */
+data class Category (
+    val id: kotlin.Long? = null,
+    val name: kotlin.String? = null
+) {
+
+}
+
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/models/Order.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Order.kt
similarity index 65%
rename from samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/models/Order.kt
rename to samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Order.kt
index ced79e3553c..cd456915249 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -1,15 +1,15 @@
 /**
-* Swagger Petstore
-* This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+* OpenAPI Petstore
+* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
+* 
 *
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
 * Do not edit the class manually.
 */
-package io.swagger.client.models
+package org.openapitools.client.models
 
 import org.threeten.bp.LocalDateTime
 
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/models/Pet.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Pet.kt
similarity index 61%
rename from samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/models/Pet.kt
rename to samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Pet.kt
index df45756efac..4e9003b0620 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -1,18 +1,18 @@
 /**
-* Swagger Petstore
-* This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+* OpenAPI Petstore
+* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
+* 
 *
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
 * Do not edit the class manually.
 */
-package io.swagger.client.models
+package org.openapitools.client.models
 
-import io.swagger.client.models.Category
-import io.swagger.client.models.Tag
+import org.openapitools.client.models.Category
+import org.openapitools.client.models.Tag
 import org.threeten.bp.LocalDateTime
 
 import com.squareup.moshi.Json
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Tag.kt
new file mode 100644
index 00000000000..b8ee45e1ca5
--- /dev/null
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -0,0 +1,27 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+*
+* OpenAPI spec version: 1.0.0
+* 
+*
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
+* Do not edit the class manually.
+*/
+package org.openapitools.client.models
+
+import org.threeten.bp.LocalDateTime
+
+/**
+ * A tag for a pet
+ * @param id 
+ * @param name 
+ */
+data class Tag (
+    val id: kotlin.Long? = null,
+    val name: kotlin.String? = null
+) {
+
+}
+
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/models/User.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/User.kt
similarity index 58%
rename from samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/models/User.kt
rename to samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/User.kt
index 5d5aaeffede..9dc3e19533b 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/models/User.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -1,15 +1,15 @@
 /**
-* Swagger Petstore
-* This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+* OpenAPI Petstore
+* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
-* Contact: apiteam@swagger.io
+* 
 *
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/swagger-api/swagger-codegen.git
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+* https://openapi-generator.tech
 * Do not edit the class manually.
 */
-package io.swagger.client.models
+package org.openapitools.client.models
 
 import org.threeten.bp.LocalDateTime
 
diff --git a/samples/client/petstore/kotlin/README.md b/samples/client/petstore/kotlin/README.md
index 57d6b9c67d5..b9ab400b15e 100644
--- a/samples/client/petstore/kotlin/README.md
+++ b/samples/client/petstore/kotlin/README.md
@@ -1,4 +1,4 @@
-# io.swagger.client - Kotlin client library for OpenAPI Petstore
+# org.openapitools.client - Kotlin client library for OpenAPI Petstore
 
 ## Requires
 
@@ -60,12 +60,12 @@ Class | Method | HTTP request | Description
 <a name="documentation-for-models"></a>
 ## Documentation for Models
 
- - [io.swagger.client.models.ApiResponse](docs/ApiResponse.md)
- - [io.swagger.client.models.Category](docs/Category.md)
- - [io.swagger.client.models.Order](docs/Order.md)
- - [io.swagger.client.models.Pet](docs/Pet.md)
- - [io.swagger.client.models.Tag](docs/Tag.md)
- - [io.swagger.client.models.User](docs/User.md)
+ - [org.openapitools.client.models.ApiResponse](docs/ApiResponse.md)
+ - [org.openapitools.client.models.Category](docs/Category.md)
+ - [org.openapitools.client.models.Order](docs/Order.md)
+ - [org.openapitools.client.models.Pet](docs/Pet.md)
+ - [org.openapitools.client.models.Tag](docs/Tag.md)
+ - [org.openapitools.client.models.User](docs/User.md)
 
 
 <a name="documentation-for-authorization"></a>
diff --git a/samples/client/petstore/kotlin/docs/PetApi.md b/samples/client/petstore/kotlin/docs/PetApi.md
index b86cca94113..6aef25bf53b 100644
--- a/samples/client/petstore/kotlin/docs/PetApi.md
+++ b/samples/client/petstore/kotlin/docs/PetApi.md
@@ -23,8 +23,8 @@ Add a new pet to the store
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
 val pet : Pet =  // Pet | Pet object that needs to be added to the store
@@ -67,8 +67,8 @@ Deletes a pet
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
 val petId : kotlin.Long = 789 // kotlin.Long | Pet id to delete
@@ -115,8 +115,8 @@ Multiple status values can be provided with comma separated strings
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
 val status : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Status values that need to be considered for filter
@@ -162,8 +162,8 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
 val tags : kotlin.Array<kotlin.String> =  // kotlin.Array<kotlin.String> | Tags to filter by
@@ -209,8 +209,8 @@ Returns a single pet
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
 val petId : kotlin.Long = 789 // kotlin.Long | ID of pet to return
@@ -254,8 +254,8 @@ Update an existing pet
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
 val pet : Pet =  // Pet | Pet object that needs to be added to the store
@@ -298,8 +298,8 @@ Updates a pet in the store with form data
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
 val petId : kotlin.Long = 789 // kotlin.Long | ID of pet that needs to be updated
@@ -346,8 +346,8 @@ uploads an image
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = PetApi()
 val petId : kotlin.Long = 789 // kotlin.Long | ID of pet to update
diff --git a/samples/client/petstore/kotlin/docs/StoreApi.md b/samples/client/petstore/kotlin/docs/StoreApi.md
index b8647a0757d..13e978ac895 100644
--- a/samples/client/petstore/kotlin/docs/StoreApi.md
+++ b/samples/client/petstore/kotlin/docs/StoreApi.md
@@ -21,8 +21,8 @@ For valid response try integer IDs with value &lt; 1000. Anything above 1000 or
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = StoreApi()
 val orderId : kotlin.String = orderId_example // kotlin.String | ID of the order that needs to be deleted
@@ -67,8 +67,8 @@ Returns a map of status codes to quantities
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = StoreApi()
 try {
@@ -110,8 +110,8 @@ For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other val
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = StoreApi()
 val orderId : kotlin.Long = 789 // kotlin.Long | ID of pet that needs to be fetched
@@ -155,8 +155,8 @@ Place an order for a pet
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = StoreApi()
 val order : Order =  // Order | order placed for purchasing the pet
diff --git a/samples/client/petstore/kotlin/docs/UserApi.md b/samples/client/petstore/kotlin/docs/UserApi.md
index 1dd05e8f988..81fc42807d3 100644
--- a/samples/client/petstore/kotlin/docs/UserApi.md
+++ b/samples/client/petstore/kotlin/docs/UserApi.md
@@ -25,8 +25,8 @@ This can only be done by the logged in user.
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
 val user : User =  // User | Created user object
@@ -69,8 +69,8 @@ Creates list of users with given input array
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
 val user : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
@@ -113,8 +113,8 @@ Creates list of users with given input array
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
 val user : kotlin.Array<User> =  // kotlin.Array<User> | List of user object
@@ -159,8 +159,8 @@ This can only be done by the logged in user.
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
 val username : kotlin.String = username_example // kotlin.String | The name that needs to be deleted
@@ -203,8 +203,8 @@ Get user by user name
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
 val username : kotlin.String = username_example // kotlin.String | The name that needs to be fetched. Use user1 for testing.
@@ -248,8 +248,8 @@ Logs user into the system
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
 val username : kotlin.String = username_example // kotlin.String | The user name for login
@@ -295,8 +295,8 @@ Logs out current logged in user session
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
 try {
@@ -337,8 +337,8 @@ This can only be done by the logged in user.
 ### Example
 ```kotlin
 // Import classes:
-//import io.swagger.client.infrastructure.*
-//import io.swagger.client.models.*
+//import org.openapitools.client.infrastructure.*
+//import org.openapitools.client.models.*
 
 val apiInstance = UserApi()
 val username : kotlin.String = username_example // kotlin.String | name that need to be deleted
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/apis/PetApi.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
similarity index 98%
rename from samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/apis/PetApi.kt
rename to samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index aa38098c766..c27887851c1 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -9,12 +9,12 @@
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
-package io.swagger.client.apis
+package org.openapitools.client.apis
 
-import io.swagger.client.models.ApiResponse
-import io.swagger.client.models.Pet
+import org.openapitools.client.models.ApiResponse
+import org.openapitools.client.models.Pet
 
-import io.swagger.client.infrastructure.*
+import org.openapitools.client.infrastructure.*
 
 class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) {
 
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/apis/StoreApi.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
similarity index 97%
rename from samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/apis/StoreApi.kt
rename to samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 34fa399bb48..f785eb0a39d 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -9,11 +9,11 @@
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
-package io.swagger.client.apis
+package org.openapitools.client.apis
 
-import io.swagger.client.models.Order
+import org.openapitools.client.models.Order
 
-import io.swagger.client.infrastructure.*
+import org.openapitools.client.infrastructure.*
 
 class StoreApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) {
 
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/apis/UserApi.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
similarity index 98%
rename from samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/apis/UserApi.kt
rename to samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index 68e386bf090..e83ca0a7dfd 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -9,11 +9,11 @@
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
-package io.swagger.client.apis
+package org.openapitools.client.apis
 
-import io.swagger.client.models.User
+import org.openapitools.client.models.User
 
-import io.swagger.client.infrastructure.*
+import org.openapitools.client.infrastructure.*
 
 class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) {
 
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/ApiAbstractions.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt
similarity index 92%
rename from samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/ApiAbstractions.kt
rename to samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt
index 87cc13d045b..c2c3f1f0eae 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/ApiAbstractions.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt
@@ -1,4 +1,4 @@
-package io.swagger.client.infrastructure
+package org.openapitools.client.infrastructure
 
 typealias MultiValueMap = Map<String,List<String>>
 
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
similarity index 99%
rename from samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/ApiClient.kt
rename to samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
index 7e3a11664bd..5c4ebd2acbc 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/ApiClient.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -1,4 +1,4 @@
-package io.swagger.client.infrastructure
+package org.openapitools.client.infrastructure
 
 import okhttp3.*
 import java.io.File
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/ApiInfrastructureResponse.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
similarity index 96%
rename from samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/ApiInfrastructureResponse.kt
rename to samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
index b2b8a9cbc6b..1f5fbf1a3f0 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/ApiInfrastructureResponse.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
@@ -1,4 +1,4 @@
-package io.swagger.client.infrastructure
+package org.openapitools.client.infrastructure
 
 enum class ResponseType {
     Success, Informational, Redirection, ClientError, ServerError
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/ApplicationDelegates.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApplicationDelegates.kt
similarity index 95%
rename from samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/ApplicationDelegates.kt
rename to samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApplicationDelegates.kt
index 340d32e3211..dd34bd48b2c 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/ApplicationDelegates.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApplicationDelegates.kt
@@ -1,4 +1,4 @@
-package io.swagger.client.infrastructure
+package org.openapitools.client.infrastructure
 
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/Errors.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt
similarity index 95%
rename from samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/Errors.kt
rename to samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt
index ff908d53a92..2f3b0157ba7 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/Errors.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt
@@ -1,5 +1,5 @@
 @file:Suppress("unused")
-package io.swagger.client.infrastructure
+package org.openapitools.client.infrastructure
 
 import java.lang.RuntimeException
 
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/RequestConfig.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt
similarity index 91%
rename from samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/RequestConfig.kt
rename to samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt
index 3825588ce4a..b01f63a1013 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/io/swagger/client/infrastructure/RequestConfig.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt
@@ -1,4 +1,4 @@
-package io.swagger.client.infrastructure
+package org.openapitools.client.infrastructure
 
 /**
  * Defines a config object for a given request.
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/RequestMethod.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt
similarity index 71%
rename from samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/RequestMethod.kt
rename to samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt
index d9d04f02701..931b12b8bd7 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/RequestMethod.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt
@@ -1,4 +1,4 @@
-package io.swagger.client.infrastructure
+package org.openapitools.client.infrastructure
 
 /**
  * Provides enumerated HTTP verbs
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/ResponseExtensions.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt
similarity index 93%
rename from samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/ResponseExtensions.kt
rename to samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt
index 04e91720138..f50104a6f35 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/infrastructure/ResponseExtensions.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt
@@ -1,4 +1,4 @@
-package io.swagger.client.infrastructure
+package org.openapitools.client.infrastructure
 
 import okhttp3.Response
 
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt
similarity index 88%
rename from samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/Serializer.kt
rename to samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt
index a858407ff34..24dfb79dab1 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/infrastructure/Serializer.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt
@@ -1,4 +1,4 @@
-package io.swagger.client.infrastructure
+package org.openapitools.client.infrastructure
 
 import com.squareup.moshi.KotlinJsonAdapterFactory
 import com.squareup.moshi.Moshi
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/models/ApiResponse.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
similarity index 94%
rename from samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/models/ApiResponse.kt
rename to samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index 57bdb8d0459..b950bdafb57 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -9,7 +9,7 @@
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
-package io.swagger.client.models
+package org.openapitools.client.models
 
 
 /**
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/models/Category.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt
similarity index 92%
rename from samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/models/Category.kt
rename to samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt
index a07d170d165..af700f5488a 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/models/Category.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -9,7 +9,7 @@
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
-package io.swagger.client.models
+package org.openapitools.client.models
 
 
 /**
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/models/Order.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt
similarity index 96%
rename from samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/models/Order.kt
rename to samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt
index 349c3c8610b..44a8b1f896c 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/io/swagger/client/models/Order.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -9,7 +9,7 @@
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
-package io.swagger.client.models
+package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/models/Pet.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt
similarity index 89%
rename from samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/models/Pet.kt
rename to samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt
index e5b0a4f034b..583dd3fb3ae 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -9,10 +9,10 @@
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
-package io.swagger.client.models
+package org.openapitools.client.models
 
-import io.swagger.client.models.Category
-import io.swagger.client.models.Tag
+import org.openapitools.client.models.Category
+import org.openapitools.client.models.Tag
 
 import com.squareup.moshi.Json
 /**
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/models/Tag.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt
similarity index 92%
rename from samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/models/Tag.kt
rename to samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt
index 3345b8fe88c..d2ae2ead613 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -9,7 +9,7 @@
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
-package io.swagger.client.models
+package org.openapitools.client.models
 
 
 /**
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/models/User.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt
similarity index 95%
rename from samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/models/User.kt
rename to samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt
index 12b69608705..a9695bb62ba 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/io/swagger/client/models/User.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -9,7 +9,7 @@
 * https://openapi-generator.tech
 * Do not edit the class manually.
 */
-package io.swagger.client.models
+package org.openapitools.client.models
 
 
 /**
diff --git a/samples/client/petstore/kotlin/src/test/kotlin/io/swagger/client/functional/EvaluateTest.kt b/samples/client/petstore/kotlin/src/test/kotlin/io/swagger/client/functional/EvaluateTest.kt
deleted file mode 100644
index 77f4f6b90ad..00000000000
--- a/samples/client/petstore/kotlin/src/test/kotlin/io/swagger/client/functional/EvaluateTest.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package io.swagger.client.functional
-
-import io.kotlintest.matchers.should
-import io.kotlintest.matchers.beGreaterThan
-import io.kotlintest.matchers.shouldEqual
-import io.kotlintest.specs.ShouldSpec
-import io.swagger.client.apis.PetApi
-import io.swagger.client.models.Pet
-
-class EvaluateTest : ShouldSpec() {
-    init {
-// TODO: comment out below due to error
-/*
-        should("query against pet statuses") {
-            val api = PetApi()
-            val results = api.findPetsByStatus(arrayOf("sold"))
-
-            results.size should beGreaterThan(1)
-
-            // Pet is lazily deserialized here. Need to iterate to verify all "sold" statuses.
-            results.all { it.status == Pet.Status.sold } shouldEqual true
-        }
-*/
-// TODO: Handle default (200) response
-/*
-        should("post data (new pet)") {
-            val api = PetApi()
-            val pet = Pet(
-                    id = 0,
-                    name = "kotlin client test",
-                    category = Category(0, "string"),
-                    tags = listOf(Tag(0, "string"))
-            )
-            val result = api.addPet(pet)
-
-            result.name shouldBe(pet.name)
-            result.category shouldBe(pet.category)
-            result.tags shouldBe(pet.tags)
-        }
-*/
-    }
-}