diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..90716ef8
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,6 @@
+# https://editorconfig.org
+root = true
+
+[*.{kt,kts}]
+ij_kotlin_allow_trailing_comma = false
+ij_kotlin_allow_trailing_comma_on_call_site = false
diff --git a/.github/workflows/lint-and-test-dev.yml b/.github/workflows/lint-and-test-dev.yml
index d116db9b..f3df20de 100644
--- a/.github/workflows/lint-and-test-dev.yml
+++ b/.github/workflows/lint-and-test-dev.yml
@@ -33,6 +33,8 @@ jobs:
     name: lint-and-test-dev
     runs-on: ubuntu-latest
     timeout-minutes: 15
+    permissions: # for gradle-dependency-submission
+      contents: write
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -51,3 +53,6 @@ jobs:
         uses: gradle/gradle-build-action@v2
         with:
           arguments: test
+      # TODO: Prepare a separate WF to be executed only when there is a change in build.gradle.
+      - name: Run snapshot action
+        uses: mikepenz/gradle-dependency-submission@v0.9.1
diff --git a/.github/workflows/test-main.yml b/.github/workflows/test-main.yml
index 502f501b..f477ce43 100644
--- a/.github/workflows/test-main.yml
+++ b/.github/workflows/test-main.yml
@@ -38,9 +38,6 @@ jobs:
         java-version: [ '8', '11', '17', '20' ]
         # Minimum version, latest release version, latest pre-release version (if exists)
         kotlin:
-          - name: '1.7.21'
-            version: '1.7.21'
-            k2: false
           - name: '1.8.22'
             version: '1.8.22'
             k2: false
@@ -50,6 +47,12 @@ jobs:
           - name: '1.9.20 K2'
             version: '1.9.20'
             k2: true
+          - name: '2.0.0-Beta1'
+            version: '2.0.0-Beta1'
+            k2: false
+          - name: '2.0.0-Beta1 K2'
+            version: '2.0.0-Beta1'
+            k2: true
     env:
       KOTLIN_VERSION: ${{ matrix.kotlin.version }}
       USE_K2: ${{ matrix.kotlin.k2 }}
diff --git a/README.md b/README.md
index 76fba97e..128943ad 100644
--- a/README.md
+++ b/README.md
@@ -34,9 +34,9 @@ This project makes several disruptive changes to achieve more `Kotlin-like` beha
 Details are summarized in [KogeraSpecificImplementations](./docs/KogeraSpecificImplementations.md).
 
 # Compatibility
-- `jackson 2.15.0`
+- `jackson 2.16.x`
 - `Java 8+`
-- `Kotlin 1.7.21+`
+- `Kotlin 1.8.22+`
 
 ## About compatibility checks
 Compatibility checks for `Java` and `Kotlin` are done by `CI` grid tests.
@@ -44,9 +44,8 @@ Compatibility checks for `Java` and `Kotlin` are done by `CI` grid tests.
 The `Java` test covers all currently supported LTS versions and the latest versions.  
 Currently 8,11,17 and 20 are covered.
 
-`Kotlin` is tested on the latest patch version and the latest `Beta` or `RC` version within each minor version since 1.7.21.  
-Currently 1.7.21 and 1.9.20-Beta are covered.  
-I hope to lower this version in the future, but currently the minimum `Kotlin` version that can be supported is 1.7 due to `kotlinx-metadata-jvm` constraints.
+`Kotlin` is tested with the latest patch version and the latest `Beta` or `RC` version within each minor version after the minimum version.  
+The `Kotlin` version is the lowest version available with the latest `kotlinx-metadata-jvm`.
 
 # Installation
 The package is temporarily published in `JitPack`.  
diff --git a/build.gradle.kts b/build.gradle.kts
index 10d30fbc..b07e6858 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,20 +1,20 @@
 plugins {
     `maven-publish` // for JitPack
 
-    val kotlinVersion: String = System.getenv("KOTLIN_VERSION")?.takeIf { it.isNotEmpty() } ?: "1.7.21"
+    val kotlinVersion: String = System.getenv("KOTLIN_VERSION")?.takeIf { it.isNotEmpty() } ?: "1.8.22"
     kotlin("jvm") version kotlinVersion
 
     java
-    id("org.jmailen.kotlinter") version "3.13.0"
+    id("org.jmailen.kotlinter") version "3.16.0"
 }
 
 // Since group cannot be obtained by generateKogeraVersion, it is defined as a constant.
 val groupStr = "io.github.projectmapk"
-val jacksonVersion = "2.15.3"
+val jacksonVersion = "2.16.0"
 val generatedSrcPath = "${layout.buildDirectory.get()}/generated/kotlin"
 
 group = groupStr
-version = "${jacksonVersion}-beta6"
+version = "${jacksonVersion}-beta7"
 
 repositories {
     mavenCentral()
@@ -22,13 +22,14 @@ repositories {
 
 dependencies {
     implementation(kotlin("stdlib"))
-    implementation("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.6.2")
+    implementation("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.7.0")
 
     api("com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}")
     api("com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}")
 
     // test libs
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
+    testImplementation("org.junit.jupiter:junit-jupiter-params:5.10.1")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
     testImplementation("io.mockk:mockk:1.13.7")
 
@@ -60,15 +61,15 @@ java {
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-kotlinter {
-    // see https://github.com/pinterest/ktlint/blob/master/docs/rules/standard.md
-    this.disabledRules = arrayOf(
-        "package-name", // This project allows for the inclusion of _ to represent the package name in the snake case.
-        "filename" // For clarity in future extensions, this rule is disabled.
-    )
-}
-
 tasks {
+    // For ported tests, they are excluded from the formatting because they are not new code.
+    lintKotlinTest {
+        exclude { it.path.contains("zPorted") }
+    }
+    formatKotlinTest {
+        exclude { it.path.contains("zPorted") }
+    }
+
     // Task to generate version file
     val generateKogeraVersion by registering(Copy::class) {
         val packageStr = "$groupStr.jackson.module.kogera"
diff --git a/src/main/java/io/github/projectmapk/jackson/module/kogera/deser/value_instantiator/ReflectProperties.java b/src/main/java/io/github/projectmapk/jackson/module/kogera/deser/valueInstantiator/ReflectProperties.java
similarity index 96%
rename from src/main/java/io/github/projectmapk/jackson/module/kogera/deser/value_instantiator/ReflectProperties.java
rename to src/main/java/io/github/projectmapk/jackson/module/kogera/deser/valueInstantiator/ReflectProperties.java
index a01efebc..0ad6c358 100644
--- a/src/main/java/io/github/projectmapk/jackson/module/kogera/deser/value_instantiator/ReflectProperties.java
+++ b/src/main/java/io/github/projectmapk/jackson/module/kogera/deser/valueInstantiator/ReflectProperties.java
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera.deser.value_instantiator;
+package io.github.projectmapk.jackson.module.kogera.deser.valueInstantiator;
 
 import kotlin.jvm.functions.Function0;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/ClosedRangeResolver.kt b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/ClosedRangeSupport.kt
similarity index 69%
rename from src/main/kotlin/io/github/projectmapk/jackson/module/kogera/ClosedRangeResolver.kt
rename to src/main/kotlin/io/github/projectmapk/jackson/module/kogera/ClosedRangeSupport.kt
index c4f77739..7921700d 100644
--- a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/ClosedRangeResolver.kt
+++ b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/ClosedRangeSupport.kt
@@ -1,8 +1,37 @@
 package io.github.projectmapk.jackson.module.kogera
 
-import com.fasterxml.jackson.databind.AbstractTypeResolver
+import com.fasterxml.jackson.annotation.JsonCreator
+import com.fasterxml.jackson.annotation.JsonIgnore
+import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.DeserializationConfig
 import com.fasterxml.jackson.databind.JavaType
+import com.fasterxml.jackson.databind.module.SimpleAbstractTypeResolver
+
+internal abstract class ClosedRangeMixin<T> @JsonCreator constructor(
+    public val start: T,
+    @get:JsonProperty("end") public val endInclusive: T
+) {
+    @JsonIgnore
+    public abstract fun getEnd(): T
+
+    @JsonIgnore
+    public abstract fun getFirst(): T
+
+    @JsonIgnore
+    public abstract fun getLast(): T
+
+    @JsonIgnore
+    public abstract fun getIncrement(): T
+
+    @JsonIgnore
+    public abstract fun isEmpty(): Boolean
+
+    @JsonIgnore
+    public abstract fun getStep(): T
+
+    @JsonIgnore
+    public abstract fun getEndExclusive(): T
+}
 
 /*
  * ClosedRange, which is not a concrete type like IntRange, does not have a type to deserialize to,
@@ -12,7 +41,9 @@ import com.fasterxml.jackson.databind.JavaType
  * The target of processing is ClosedRange and interfaces or abstract classes that inherit from it.
  * As of Kotlin 1.5.32, ClosedRange and ClosedFloatingPointRange are processed.
  */
-internal object ClosedRangeResolver : AbstractTypeResolver() {
+internal object ClosedRangeResolver : SimpleAbstractTypeResolver() {
+    private fun readResolve(): Any = ClosedRangeResolver
+
     // At present, it depends on the private class, but if it is made public, it must be switched to a direct reference.
     // see https://youtrack.jetbrains.com/issue/KT-55376
     val closedDoubleRangeRef: Class<*> by lazy {
diff --git a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/Converters.kt b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/Converters.kt
index 7eb8d540..efcdacbe 100644
--- a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/Converters.kt
+++ b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/Converters.kt
@@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.util.StdConverter
  * A converter that only performs box processing for the value class.
  * Note that constructor-impl is not called.
  * @param S is nullable because value corresponds to a nullable value class.
- *   see [io.github.projectmapk.jackson.module.kogera.annotation_introspector.KotlinFallbackAnnotationIntrospector.findNullSerializer]
+ *   see [io.github.projectmapk.jackson.module.kogera.annotationIntrospector.KotlinFallbackAnnotationIntrospector.findNullSerializer]
  */
 internal class ValueClassBoxConverter<S : Any?, D : Any>(
     unboxedClass: Class<S>,
diff --git a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/KotlinMixins.kt b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/KotlinMixins.kt
deleted file mode 100644
index 0547190d..00000000
--- a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/KotlinMixins.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.github.projectmapk.jackson.module.kogera
-
-import com.fasterxml.jackson.annotation.JsonCreator
-import com.fasterxml.jackson.annotation.JsonIgnore
-import com.fasterxml.jackson.annotation.JsonProperty
-
-internal abstract class ClosedRangeMixin<T> @JsonCreator constructor(
-    public val start: T,
-    @get:JsonProperty("end") public val endInclusive: T
-) {
-    @JsonIgnore public abstract fun getEnd(): T
-
-    @JsonIgnore public abstract fun getFirst(): T
-
-    @JsonIgnore public abstract fun getLast(): T
-
-    @JsonIgnore public abstract fun getIncrement(): T
-
-    @JsonIgnore public abstract fun isEmpty(): Boolean
-
-    @JsonIgnore public abstract fun getStep(): T
-
-    @JsonIgnore public abstract fun getEndExclusive(): T
-}
diff --git a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/KotlinModule.kt b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/KotlinModule.kt
index 4a256a62..a49b8e64 100644
--- a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/KotlinModule.kt
+++ b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/KotlinModule.kt
@@ -9,21 +9,20 @@ import io.github.projectmapk.jackson.module.kogera.KotlinFeature.NullToEmptyMap
 import io.github.projectmapk.jackson.module.kogera.KotlinFeature.SingletonSupport
 import io.github.projectmapk.jackson.module.kogera.KotlinFeature.StrictNullChecks
 import io.github.projectmapk.jackson.module.kogera.KotlinFeature.UseJavaDurationConversion
-import io.github.projectmapk.jackson.module.kogera.annotation_introspector.KotlinFallbackAnnotationIntrospector
-import io.github.projectmapk.jackson.module.kogera.annotation_introspector.KotlinPrimaryAnnotationIntrospector
+import io.github.projectmapk.jackson.module.kogera.annotationIntrospector.KotlinFallbackAnnotationIntrospector
+import io.github.projectmapk.jackson.module.kogera.annotationIntrospector.KotlinPrimaryAnnotationIntrospector
 import io.github.projectmapk.jackson.module.kogera.deser.deserializers.KotlinDeserializers
 import io.github.projectmapk.jackson.module.kogera.deser.deserializers.KotlinKeyDeserializers
-import io.github.projectmapk.jackson.module.kogera.deser.singleton_support.KotlinBeanDeserializerModifier
-import io.github.projectmapk.jackson.module.kogera.deser.value_instantiator.KotlinInstantiators
+import io.github.projectmapk.jackson.module.kogera.deser.singletonSupport.KotlinBeanDeserializerModifier
+import io.github.projectmapk.jackson.module.kogera.deser.valueInstantiator.KotlinInstantiators
 import io.github.projectmapk.jackson.module.kogera.ser.serializers.KotlinKeySerializers
 import io.github.projectmapk.jackson.module.kogera.ser.serializers.KotlinSerializers
+import java.io.Serializable
 import java.util.*
 
 /**
- * @param initialCacheSize
- *   Default: [Builder.DEFAULT_CACHE_SIZE]. See [Builder.withInitialCacheSize] for details.
- * @param maxCacheSize
- *   Default: [Builder.DEFAULT_CACHE_SIZE]. See [Builder.withMaxCacheSize] for details.
+ * @param cacheSize
+ *   Default: [Builder.DEFAULT_CACHE_SIZE]. See [CacheSize] for details.
  * @param nullToEmptyCollection
  *   Default: false. See [KotlinFeature.NullToEmptyCollection] for details.
  * @param nullToEmptyMap
@@ -42,8 +41,7 @@ import java.util.*
 // Do not delete default arguments,
 // as this will cause an error during initialization by Spring's Jackson2ObjectMapperBuilder.
 public class KotlinModule private constructor(
-    public val initialCacheSize: Int = Builder.DEFAULT_CACHE_SIZE,
-    public val maxCacheSize: Int = Builder.DEFAULT_CACHE_SIZE,
+    public val cacheSize: CacheSize = CacheSize(),
     public val nullToEmptyCollection: Boolean = NullToEmptyCollection.enabledByDefault,
     public val nullToEmptyMap: Boolean = NullToEmptyMap.enabledByDefault,
     public val nullIsSameAsDefault: Boolean = NullIsSameAsDefault.enabledByDefault,
@@ -54,8 +52,7 @@ public class KotlinModule private constructor(
     public val useJavaDurationConversion: Boolean = UseJavaDurationConversion.enabledByDefault
 ) : SimpleModule(KotlinModule::class.java.name, kogeraVersion) { // kogeraVersion is generated by building.
     private constructor(builder: Builder) : this(
-        builder.initialCacheSize,
-        builder.maxCacheSize,
+        builder.cacheSize,
         builder.isEnabled(NullToEmptyCollection),
         builder.isEnabled(NullToEmptyMap),
         builder.isEnabled(NullIsSameAsDefault),
@@ -71,26 +68,33 @@ public class KotlinModule private constructor(
     )
     public constructor() : this(Builder())
 
+    private val cache: ReflectionCache = ReflectionCache(cacheSize.initialCacheSize, cacheSize.maxCacheSize)
+    private val primaryAnnotationIntrospector: KotlinPrimaryAnnotationIntrospector =
+        KotlinPrimaryAnnotationIntrospector(nullToEmptyCollection, nullToEmptyMap, cache)
+    private val fallbackAnnotationIntrospector: KotlinFallbackAnnotationIntrospector =
+        KotlinFallbackAnnotationIntrospector(strictNullChecks, useJavaDurationConversion, cache)
+
     init {
-        checkMaxCacheSize(maxCacheSize)
-        checkCacheSize(initialCacheSize, maxCacheSize)
-    }
+        _serializers = KotlinSerializers(cache)
+        _deserializers = KotlinDeserializers(cache, useJavaDurationConversion)
 
-    public companion object {
-        @Suppress("ConstPropertyName")
-        private const val serialVersionUID = 2L
+        _keySerializers = KotlinKeySerializers(cache)
+        _keyDeserializers = KotlinKeyDeserializers
 
-        private fun checkMaxCacheSize(maxCacheSize: Int) {
-            if (maxCacheSize < 16) throw IllegalArgumentException("16 or higher must be specified")
-        }
+        _abstractTypes = ClosedRangeResolver
 
-        private fun checkCacheSize(initialCacheSize: Int, maxCacheSize: Int) {
-            if (maxCacheSize < initialCacheSize) {
-                throw IllegalArgumentException(
-                    "maxCacheSize($maxCacheSize) was less than initialCacheSize($initialCacheSize)."
-                )
-            }
+        _valueInstantiators = KotlinInstantiators(cache, nullToEmptyCollection, nullToEmptyMap, nullIsSameAsDefault)
+
+        if (singletonSupport) {
+            _deserializerModifier = KotlinBeanDeserializerModifier(cache)
         }
+
+        setMixInAnnotation(ClosedRange::class.java, ClosedRangeMixin::class.java)
+    }
+
+    public companion object {
+        @Suppress("ConstPropertyName")
+        private const val serialVersionUID = 3L
     }
 
     override fun setupModule(context: SetupContext) {
@@ -102,35 +106,43 @@ public class KotlinModule private constructor(
             )
         }
 
-        val cache = ReflectionCache(initialCacheSize, maxCacheSize)
-
-        context.addValueInstantiators(
-            KotlinInstantiators(cache, nullToEmptyCollection, nullToEmptyMap, nullIsSameAsDefault)
-        )
-
-        if (singletonSupport) {
-            context.addBeanDeserializerModifier(KotlinBeanDeserializerModifier(cache))
-        }
-
-        context.insertAnnotationIntrospector(
-            KotlinPrimaryAnnotationIntrospector(nullToEmptyCollection, nullToEmptyMap, cache)
-        )
-        context.appendAnnotationIntrospector(
-            KotlinFallbackAnnotationIntrospector(strictNullChecks, useJavaDurationConversion, cache)
-        )
+        context.insertAnnotationIntrospector(primaryAnnotationIntrospector)
+        context.appendAnnotationIntrospector(fallbackAnnotationIntrospector)
 
         if (copySyntheticConstructorParameterAnnotations) {
             context.setClassIntrospector(KotlinClassIntrospector)
         }
+    }
 
-        context.addDeserializers(KotlinDeserializers(cache, useJavaDurationConversion))
-        context.addKeyDeserializers(KotlinKeyDeserializers)
-        context.addSerializers(KotlinSerializers(cache))
-        context.addKeySerializers(KotlinKeySerializers(cache))
+    /**
+     * @property maxCacheSize Kogera's internal processing requires a certain cache size.
+     *   The lower limit is set to 16 for extreme use cases,
+     *   but it is recommended to set it to 100 or more unless there is a very clear reason.
+     *
+     * @throws IllegalArgumentException Specified [maxCacheSize] was less than the 16.
+     * @throws IllegalArgumentException A value less than [maxCacheSize] was entered for [initialCacheSize].
+     */
+    public data class CacheSize(
+        val initialCacheSize: Int = Builder.DEFAULT_CACHE_SIZE,
+        val maxCacheSize: Int = Builder.DEFAULT_CACHE_SIZE
+    ) : Serializable {
+        /**
+         * Set the same size for [initialCacheSize] and [maxCacheSize].
+         */
+        public constructor(cacheSize: Int) : this(cacheSize, cacheSize)
 
-        // ranges
-        context.setMixInAnnotations(ClosedRange::class.java, ClosedRangeMixin::class.java)
-        context.addAbstractTypeResolver(ClosedRangeResolver)
+        init {
+            if (maxCacheSize < 16) {
+                throw IllegalArgumentException(
+                    "The maxCacheSize must be at least 16. The recommended value is 100 or more."
+                )
+            }
+            if (maxCacheSize < initialCacheSize) {
+                throw IllegalArgumentException(
+                    "maxCacheSize($maxCacheSize) was less than initialCacheSize($initialCacheSize)."
+                )
+            }
+        }
     }
 
     public class Builder {
@@ -138,35 +150,13 @@ public class KotlinModule private constructor(
             internal const val DEFAULT_CACHE_SIZE = 512
         }
 
-        public var initialCacheSize: Int = DEFAULT_CACHE_SIZE
-            private set
-        public var maxCacheSize: Int = DEFAULT_CACHE_SIZE
+        public var cacheSize: CacheSize = CacheSize()
             private set
 
         private val bitSet: BitSet = KotlinFeature.defaults
 
-        /**
-         * @throws IllegalArgumentException A value less than [maxCacheSize] was entered for [initialCacheSize].
-         */
-        public fun withInitialCacheSize(initialCacheSize: Int): Builder = apply {
-            checkCacheSize(initialCacheSize, maxCacheSize)
-
-            this.initialCacheSize = initialCacheSize
-        }
-
-        /**
-         * Kogera's internal processing requires a certain cache size.
-         * The lower limit of [maxCacheSize] is set to 16 for extreme use cases,
-         * but it is recommended to set it to 100 or more unless there is a very clear reason.
-         *
-         * @throws IllegalArgumentException Specified size was less than the 16.
-         * @throws IllegalArgumentException A value less than [initialCacheSize] was entered for maxCacheSize.
-         */
-        public fun withMaxCacheSize(maxCacheSize: Int): Builder = apply {
-            checkMaxCacheSize(maxCacheSize)
-            checkCacheSize(initialCacheSize, maxCacheSize)
-
-            this.maxCacheSize = maxCacheSize
+        public fun withCacheSize(cacheSize: CacheSize): Builder = apply {
+            this.cacheSize = cacheSize
         }
 
         public fun enable(feature: KotlinFeature): Builder = apply {
diff --git a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/annotation_introspector/KotlinFallbackAnnotationIntrospector.kt b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/annotationIntrospector/KotlinFallbackAnnotationIntrospector.kt
similarity index 98%
rename from src/main/kotlin/io/github/projectmapk/jackson/module/kogera/annotation_introspector/KotlinFallbackAnnotationIntrospector.kt
rename to src/main/kotlin/io/github/projectmapk/jackson/module/kogera/annotationIntrospector/KotlinFallbackAnnotationIntrospector.kt
index e721a9d8..ba82a026 100644
--- a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/annotation_introspector/KotlinFallbackAnnotationIntrospector.kt
+++ b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/annotationIntrospector/KotlinFallbackAnnotationIntrospector.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera.annotation_introspector
+package io.github.projectmapk.jackson.module.kogera.annotationIntrospector
 
 import com.fasterxml.jackson.annotation.JsonSetter
 import com.fasterxml.jackson.annotation.Nulls
diff --git a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/annotation_introspector/KotlinPrimaryAnnotationIntrospector.kt b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/annotationIntrospector/KotlinPrimaryAnnotationIntrospector.kt
similarity index 99%
rename from src/main/kotlin/io/github/projectmapk/jackson/module/kogera/annotation_introspector/KotlinPrimaryAnnotationIntrospector.kt
rename to src/main/kotlin/io/github/projectmapk/jackson/module/kogera/annotationIntrospector/KotlinPrimaryAnnotationIntrospector.kt
index d69f7746..96cf7808 100644
--- a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/annotation_introspector/KotlinPrimaryAnnotationIntrospector.kt
+++ b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/annotationIntrospector/KotlinPrimaryAnnotationIntrospector.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera.annotation_introspector
+package io.github.projectmapk.jackson.module.kogera.annotationIntrospector
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonProperty
diff --git a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/Converters.kt b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/JavaToKotlinDurationConverter.kt
similarity index 100%
rename from src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/Converters.kt
rename to src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/JavaToKotlinDurationConverter.kt
diff --git a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/deserializers/KotlinDeserializers.kt b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/deserializers/KotlinDeserializers.kt
index 8b833e03..96997a58 100644
--- a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/deserializers/KotlinDeserializers.kt
+++ b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/deserializers/KotlinDeserializers.kt
@@ -6,9 +6,9 @@ import com.fasterxml.jackson.databind.DeserializationConfig
 import com.fasterxml.jackson.databind.DeserializationContext
 import com.fasterxml.jackson.databind.JavaType
 import com.fasterxml.jackson.databind.JsonDeserializer
-import com.fasterxml.jackson.databind.deser.Deserializers
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer
 import com.fasterxml.jackson.databind.exc.InvalidDefinitionException
+import com.fasterxml.jackson.databind.module.SimpleDeserializers
 import io.github.projectmapk.jackson.module.kogera.JmClass
 import io.github.projectmapk.jackson.module.kogera.KotlinDuration
 import io.github.projectmapk.jackson.module.kogera.ReflectionCache
@@ -23,12 +23,16 @@ import java.lang.reflect.Method
 import java.lang.reflect.Modifier
 
 internal object SequenceDeserializer : StdDeserializer<Sequence<*>>(Sequence::class.java) {
+    private fun readResolve(): Any = SequenceDeserializer
+
     override fun deserialize(p: JsonParser, ctxt: DeserializationContext): Sequence<*> {
         return ctxt.readValue(p, List::class.java).asSequence()
     }
 }
 
 internal object RegexDeserializer : StdDeserializer<Regex>(Regex::class.java) {
+    private fun readResolve(): Any = RegexDeserializer
+
     override fun deserialize(p: JsonParser, ctxt: DeserializationContext): Regex {
         val node = ctxt.readTree(p)
 
@@ -57,21 +61,29 @@ internal object RegexDeserializer : StdDeserializer<Regex>(Regex::class.java) {
 }
 
 internal object UByteDeserializer : StdDeserializer<UByte>(UByte::class.java) {
+    private fun readResolve(): Any = UByteDeserializer
+
     override fun deserialize(p: JsonParser, ctxt: DeserializationContext) =
         UByteChecker.readWithRangeCheck(p, p.intValue)
 }
 
 internal object UShortDeserializer : StdDeserializer<UShort>(UShort::class.java) {
+    private fun readResolve(): Any = UShortDeserializer
+
     override fun deserialize(p: JsonParser, ctxt: DeserializationContext) =
         UShortChecker.readWithRangeCheck(p, p.intValue)
 }
 
 internal object UIntDeserializer : StdDeserializer<UInt>(UInt::class.java) {
+    private fun readResolve(): Any = UIntDeserializer
+
     override fun deserialize(p: JsonParser, ctxt: DeserializationContext) =
         UIntChecker.readWithRangeCheck(p, p.longValue)
 }
 
 internal object ULongDeserializer : StdDeserializer<ULong>(ULong::class.java) {
+    private fun readResolve(): Any = ULongDeserializer
+
     override fun deserialize(p: JsonParser, ctxt: DeserializationContext) =
         ULongChecker.readWithRangeCheck(p, p.bigIntegerValue)
 }
@@ -130,7 +142,7 @@ private fun findValueCreator(type: JavaType, clazz: Class<*>, jmClass: JmClass):
 internal class KotlinDeserializers(
     private val cache: ReflectionCache,
     private val useJavaDurationConversion: Boolean
-) : Deserializers.Base() {
+) : SimpleDeserializers() {
     override fun findBeanDeserializer(
         type: JavaType,
         config: DeserializationConfig?,
diff --git a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/deserializers/KotlinKeyDeserializers.kt b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/deserializers/KotlinKeyDeserializers.kt
index c727d5e3..accc19ae 100644
--- a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/deserializers/KotlinKeyDeserializers.kt
+++ b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/deserializers/KotlinKeyDeserializers.kt
@@ -6,33 +6,43 @@ import com.fasterxml.jackson.databind.DeserializationContext
 import com.fasterxml.jackson.databind.JavaType
 import com.fasterxml.jackson.databind.KeyDeserializer
 import com.fasterxml.jackson.databind.deser.std.StdKeyDeserializer
-import com.fasterxml.jackson.databind.deser.std.StdKeyDeserializers
+import com.fasterxml.jackson.databind.module.SimpleKeyDeserializers
 import java.math.BigInteger
 
 // The reason why key is treated as nullable is to match the tentative behavior of StdKeyDeserializer.
 // If StdKeyDeserializer is modified, need to modify this too.
 
 internal object UByteKeyDeserializer : StdKeyDeserializer(TYPE_SHORT, UByte::class.java) {
+    private fun readResolve(): Any = UByteKeyDeserializer
+
     override fun deserializeKey(key: String?, ctxt: DeserializationContext): UByte? =
         key?.let { UByteChecker.readWithRangeCheck(null, _parseInt(it)) }
 }
 
 internal object UShortKeyDeserializer : StdKeyDeserializer(TYPE_INT, UShort::class.java) {
+    private fun readResolve(): Any = UShortKeyDeserializer
+
     override fun deserializeKey(key: String?, ctxt: DeserializationContext): UShort? =
         key?.let { UShortChecker.readWithRangeCheck(null, _parseInt(it)) }
 }
 
 internal object UIntKeyDeserializer : StdKeyDeserializer(TYPE_LONG, UInt::class.java) {
+    private fun readResolve(): Any = UIntKeyDeserializer
+
     override fun deserializeKey(key: String?, ctxt: DeserializationContext): UInt? =
         key?.let { UIntChecker.readWithRangeCheck(null, _parseLong(it)) }
 }
 
 internal object ULongKeyDeserializer : StdKeyDeserializer(-1, ULong::class.java) {
+    private fun readResolve(): Any = ULongKeyDeserializer
+
     override fun deserializeKey(key: String?, ctxt: DeserializationContext): ULong? =
         key?.let { ULongChecker.readWithRangeCheck(null, BigInteger(it)) }
 }
 
-internal object KotlinKeyDeserializers : StdKeyDeserializers() {
+internal object KotlinKeyDeserializers : SimpleKeyDeserializers() {
+    private fun readResolve(): Any = KotlinKeyDeserializers
+
     override fun findKeyDeserializer(
         type: JavaType,
         config: DeserializationConfig?,
diff --git a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/singleton_support/KotlinBeanDeserializerModifier.kt b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/singletonSupport/KotlinBeanDeserializerModifier.kt
similarity index 78%
rename from src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/singleton_support/KotlinBeanDeserializerModifier.kt
rename to src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/singletonSupport/KotlinBeanDeserializerModifier.kt
index 9f7bff47..db2d9d66 100644
--- a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/singleton_support/KotlinBeanDeserializerModifier.kt
+++ b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/singletonSupport/KotlinBeanDeserializerModifier.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera.deser.singleton_support
+package io.github.projectmapk.jackson.module.kogera.deser.singletonSupport
 
 import com.fasterxml.jackson.databind.BeanDescription
 import com.fasterxml.jackson.databind.DeserializationConfig
@@ -6,9 +6,18 @@ import com.fasterxml.jackson.databind.JsonDeserializer
 import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier
 import io.github.projectmapk.jackson.module.kogera.ReflectionCache
 import kotlinx.metadata.Flag
+import java.io.Serializable
 
 // [module-kotlin#225]: keep Kotlin singletons as singletons
-internal class KotlinBeanDeserializerModifier(private val cache: ReflectionCache) : BeanDeserializerModifier() {
+internal class KotlinBeanDeserializerModifier(
+    private val cache: ReflectionCache
+) : BeanDeserializerModifier(), Serializable {
+    companion object {
+        // Increment is required when properties that use LRUMap are changed.
+        @Suppress("ConstPropertyName")
+        private const val serialVersionUID = 1L
+    }
+
     private fun objectSingletonInstance(beanClass: Class<*>): Any? = cache.getJmClass(beanClass)?.let {
         val flags = it.flags
 
diff --git a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/singleton_support/KotlinObjectSingletonDeserializer.kt b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/singletonSupport/KotlinObjectSingletonDeserializer.kt
similarity index 99%
rename from src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/singleton_support/KotlinObjectSingletonDeserializer.kt
rename to src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/singletonSupport/KotlinObjectSingletonDeserializer.kt
index 3ec0b5fd..9c082c78 100644
--- a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/singleton_support/KotlinObjectSingletonDeserializer.kt
+++ b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/singletonSupport/KotlinObjectSingletonDeserializer.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera.deser.singleton_support
+package io.github.projectmapk.jackson.module.kogera.deser.singletonSupport
 
 import com.fasterxml.jackson.core.JsonParser
 import com.fasterxml.jackson.databind.BeanProperty
diff --git a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/value_instantiator/Commons.kt b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/valueInstantiator/Commons.kt
similarity index 56%
rename from src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/value_instantiator/Commons.kt
rename to src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/valueInstantiator/Commons.kt
index 42c26366..5764aeb8 100644
--- a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/value_instantiator/Commons.kt
+++ b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/valueInstantiator/Commons.kt
@@ -1,3 +1,3 @@
-package io.github.projectmapk.jackson.module.kogera.deser.value_instantiator
+package io.github.projectmapk.jackson.module.kogera.deser.valueInstantiator
 
 internal fun calcMaskSize(argumentSize: Int): Int = (argumentSize + Integer.SIZE - 1) / Integer.SIZE
diff --git a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/value_instantiator/KotlinValueInstantiator.kt b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/valueInstantiator/KotlinValueInstantiator.kt
similarity index 92%
rename from src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/value_instantiator/KotlinValueInstantiator.kt
rename to src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/valueInstantiator/KotlinValueInstantiator.kt
index 283abeb4..c886ceef 100644
--- a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/value_instantiator/KotlinValueInstantiator.kt
+++ b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/valueInstantiator/KotlinValueInstantiator.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera.deser.value_instantiator
+package io.github.projectmapk.jackson.module.kogera.deser.valueInstantiator
 
 import com.fasterxml.jackson.annotation.Nulls
 import com.fasterxml.jackson.databind.BeanDescription
@@ -8,15 +8,15 @@ import com.fasterxml.jackson.databind.JavaType
 import com.fasterxml.jackson.databind.JsonMappingException
 import com.fasterxml.jackson.databind.deser.SettableBeanProperty
 import com.fasterxml.jackson.databind.deser.ValueInstantiator
-import com.fasterxml.jackson.databind.deser.ValueInstantiators
 import com.fasterxml.jackson.databind.deser.impl.NullsAsEmptyProvider
 import com.fasterxml.jackson.databind.deser.impl.PropertyValueBuffer
 import com.fasterxml.jackson.databind.deser.std.StdValueInstantiator
 import com.fasterxml.jackson.databind.exc.MismatchedInputException
+import com.fasterxml.jackson.databind.module.SimpleValueInstantiators
 import io.github.projectmapk.jackson.module.kogera.ReflectionCache
-import io.github.projectmapk.jackson.module.kogera.deser.value_instantiator.creator.ConstructorValueCreator
-import io.github.projectmapk.jackson.module.kogera.deser.value_instantiator.creator.MethodValueCreator
-import io.github.projectmapk.jackson.module.kogera.deser.value_instantiator.creator.ValueCreator
+import io.github.projectmapk.jackson.module.kogera.deser.valueInstantiator.creator.ConstructorValueCreator
+import io.github.projectmapk.jackson.module.kogera.deser.valueInstantiator.creator.MethodValueCreator
+import io.github.projectmapk.jackson.module.kogera.deser.valueInstantiator.creator.ValueCreator
 import java.lang.reflect.Constructor
 import java.lang.reflect.Executable
 import java.lang.reflect.Method
@@ -113,7 +113,7 @@ internal class KotlinInstantiators(
     private val nullToEmptyCollection: Boolean,
     private val nullToEmptyMap: Boolean,
     private val nullIsSameAsDefault: Boolean
-) : ValueInstantiators {
+) : SimpleValueInstantiators() {
     override fun findValueInstantiator(
         deserConfig: DeserializationConfig,
         beanDescriptor: BeanDescription,
diff --git a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/value_instantiator/argument_bucket/ArgumentBucket.kt b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/valueInstantiator/argumentBucket/ArgumentBucket.kt
similarity index 93%
rename from src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/value_instantiator/argument_bucket/ArgumentBucket.kt
rename to src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/valueInstantiator/argumentBucket/ArgumentBucket.kt
index b471d1d8..d53abaf6 100644
--- a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/value_instantiator/argument_bucket/ArgumentBucket.kt
+++ b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/valueInstantiator/argumentBucket/ArgumentBucket.kt
@@ -1,6 +1,6 @@
-package io.github.projectmapk.jackson.module.kogera.deser.value_instantiator.argument_bucket
+package io.github.projectmapk.jackson.module.kogera.deser.valueInstantiator.argumentBucket
 
-import io.github.projectmapk.jackson.module.kogera.deser.value_instantiator.calcMaskSize
+import io.github.projectmapk.jackson.module.kogera.deser.valueInstantiator.calcMaskSize
 import java.lang.reflect.Array as ReflectArray
 
 private fun defaultPrimitiveValue(type: Class<*>): Any = when (type) {
diff --git a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/value_instantiator/creator/ConstructorValueCreator.kt b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/valueInstantiator/creator/ConstructorValueCreator.kt
similarity index 86%
rename from src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/value_instantiator/creator/ConstructorValueCreator.kt
rename to src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/valueInstantiator/creator/ConstructorValueCreator.kt
index adac4eee..18092d80 100644
--- a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/value_instantiator/creator/ConstructorValueCreator.kt
+++ b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/valueInstantiator/creator/ConstructorValueCreator.kt
@@ -1,11 +1,11 @@
-package io.github.projectmapk.jackson.module.kogera.deser.value_instantiator.creator
+package io.github.projectmapk.jackson.module.kogera.deser.valueInstantiator.creator
 
 import io.github.projectmapk.jackson.module.kogera.JmClass
 import io.github.projectmapk.jackson.module.kogera.call
 import io.github.projectmapk.jackson.module.kogera.defaultConstructorMarker
-import io.github.projectmapk.jackson.module.kogera.deser.value_instantiator.argument_bucket.ArgumentBucket
-import io.github.projectmapk.jackson.module.kogera.deser.value_instantiator.argument_bucket.BucketGenerator
-import io.github.projectmapk.jackson.module.kogera.deser.value_instantiator.calcMaskSize
+import io.github.projectmapk.jackson.module.kogera.deser.valueInstantiator.argumentBucket.ArgumentBucket
+import io.github.projectmapk.jackson.module.kogera.deser.valueInstantiator.argumentBucket.BucketGenerator
+import io.github.projectmapk.jackson.module.kogera.deser.valueInstantiator.calcMaskSize
 import io.github.projectmapk.jackson.module.kogera.getDeclaredConstructorBy
 import io.github.projectmapk.jackson.module.kogera.hasVarargParam
 import java.lang.reflect.Constructor
diff --git a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/value_instantiator/creator/MethodValueCreator.kt b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/valueInstantiator/creator/MethodValueCreator.kt
similarity index 88%
rename from src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/value_instantiator/creator/MethodValueCreator.kt
rename to src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/valueInstantiator/creator/MethodValueCreator.kt
index 6fee6fce..e8956d67 100644
--- a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/value_instantiator/creator/MethodValueCreator.kt
+++ b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/valueInstantiator/creator/MethodValueCreator.kt
@@ -1,10 +1,10 @@
-package io.github.projectmapk.jackson.module.kogera.deser.value_instantiator.creator
+package io.github.projectmapk.jackson.module.kogera.deser.valueInstantiator.creator
 
 import io.github.projectmapk.jackson.module.kogera.JmClass
 import io.github.projectmapk.jackson.module.kogera.call
-import io.github.projectmapk.jackson.module.kogera.deser.value_instantiator.argument_bucket.ArgumentBucket
-import io.github.projectmapk.jackson.module.kogera.deser.value_instantiator.argument_bucket.BucketGenerator
-import io.github.projectmapk.jackson.module.kogera.deser.value_instantiator.calcMaskSize
+import io.github.projectmapk.jackson.module.kogera.deser.valueInstantiator.argumentBucket.ArgumentBucket
+import io.github.projectmapk.jackson.module.kogera.deser.valueInstantiator.argumentBucket.BucketGenerator
+import io.github.projectmapk.jackson.module.kogera.deser.valueInstantiator.calcMaskSize
 import io.github.projectmapk.jackson.module.kogera.getDeclaredMethodBy
 import io.github.projectmapk.jackson.module.kogera.hasVarargParam
 import kotlinx.metadata.KmFunction
diff --git a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/value_instantiator/creator/ValueCreator.kt b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/valueInstantiator/creator/ValueCreator.kt
similarity index 80%
rename from src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/value_instantiator/creator/ValueCreator.kt
rename to src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/valueInstantiator/creator/ValueCreator.kt
index 349cb6a1..0fe59434 100644
--- a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/value_instantiator/creator/ValueCreator.kt
+++ b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/valueInstantiator/creator/ValueCreator.kt
@@ -1,13 +1,13 @@
-package io.github.projectmapk.jackson.module.kogera.deser.value_instantiator.creator
+package io.github.projectmapk.jackson.module.kogera.deser.valueInstantiator.creator
 
 import com.fasterxml.jackson.databind.DeserializationContext
 import com.fasterxml.jackson.databind.MapperFeature
-import io.github.projectmapk.jackson.module.kogera.deser.value_instantiator.argument_bucket.ArgumentBucket
-import io.github.projectmapk.jackson.module.kogera.deser.value_instantiator.argument_bucket.BucketGenerator
+import io.github.projectmapk.jackson.module.kogera.deser.valueInstantiator.argumentBucket.ArgumentBucket
+import io.github.projectmapk.jackson.module.kogera.deser.valueInstantiator.argumentBucket.BucketGenerator
 
 /**
  * A class that abstracts the creation of instances by calling KFunction.
- * @see io.github.projectmapk.jackson.module.kogera.deser.value_instantiator
+ * @see io.github.projectmapk.jackson.module.kogera.deser.valueInstantiator
  */
 internal sealed class ValueCreator<T> {
     /**
diff --git a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/value_instantiator/creator/ValueParameter.kt b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/valueInstantiator/creator/ValueParameter.kt
similarity index 90%
rename from src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/value_instantiator/creator/ValueParameter.kt
rename to src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/valueInstantiator/creator/ValueParameter.kt
index 1a05b7c0..9e1bc76d 100644
--- a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/value_instantiator/creator/ValueParameter.kt
+++ b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/valueInstantiator/creator/ValueParameter.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera.deser.value_instantiator.creator
+package io.github.projectmapk.jackson.module.kogera.deser.valueInstantiator.creator
 
 import io.github.projectmapk.jackson.module.kogera.isNullable
 import kotlinx.metadata.Flag
diff --git a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/ser/serializers/KotlinKeySerializers.kt b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/ser/serializers/KotlinKeySerializers.kt
index 0b887805..b142991d 100644
--- a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/ser/serializers/KotlinKeySerializers.kt
+++ b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/ser/serializers/KotlinKeySerializers.kt
@@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.JavaType
 import com.fasterxml.jackson.databind.JsonSerializer
 import com.fasterxml.jackson.databind.SerializationConfig
 import com.fasterxml.jackson.databind.SerializerProvider
-import com.fasterxml.jackson.databind.ser.Serializers
+import com.fasterxml.jackson.databind.module.SimpleSerializers
 import com.fasterxml.jackson.databind.ser.std.StdSerializer
 import io.github.projectmapk.jackson.module.kogera.ReflectionCache
 import io.github.projectmapk.jackson.module.kogera.ValueClassUnboxConverter
@@ -64,7 +64,7 @@ internal class ValueClassStaticJsonKeySerializer<T : Any>(
     }
 }
 
-internal class KotlinKeySerializers(private val cache: ReflectionCache) : Serializers.Base() {
+internal class KotlinKeySerializers(private val cache: ReflectionCache) : SimpleSerializers() {
     override fun findSerializer(
         config: SerializationConfig,
         type: JavaType,
diff --git a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/ser/serializers/KotlinSerializers.kt b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/ser/serializers/KotlinSerializers.kt
index 9a58d5e4..75949f9f 100644
--- a/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/ser/serializers/KotlinSerializers.kt
+++ b/src/main/kotlin/io/github/projectmapk/jackson/module/kogera/ser/serializers/KotlinSerializers.kt
@@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.JavaType
 import com.fasterxml.jackson.databind.JsonSerializer
 import com.fasterxml.jackson.databind.SerializationConfig
 import com.fasterxml.jackson.databind.SerializerProvider
-import com.fasterxml.jackson.databind.ser.Serializers
+import com.fasterxml.jackson.databind.module.SimpleSerializers
 import com.fasterxml.jackson.databind.ser.std.StdSerializer
 import io.github.projectmapk.jackson.module.kogera.ReflectionCache
 import io.github.projectmapk.jackson.module.kogera.ValueClassUnboxConverter
@@ -17,21 +17,29 @@ import java.lang.reflect.Modifier
 import java.math.BigInteger
 
 internal object UByteSerializer : StdSerializer<UByte>(UByte::class.java) {
+    private fun readResolve(): Any = UByteSerializer
+
     override fun serialize(value: UByte, gen: JsonGenerator, provider: SerializerProvider) =
         gen.writeNumber(value.toShort())
 }
 
 internal object UShortSerializer : StdSerializer<UShort>(UShort::class.java) {
+    private fun readResolve(): Any = UShortSerializer
+
     override fun serialize(value: UShort, gen: JsonGenerator, provider: SerializerProvider) =
         gen.writeNumber(value.toInt())
 }
 
 internal object UIntSerializer : StdSerializer<UInt>(UInt::class.java) {
+    private fun readResolve(): Any = UIntSerializer
+
     override fun serialize(value: UInt, gen: JsonGenerator, provider: SerializerProvider) =
         gen.writeNumber(value.toLong())
 }
 
 internal object ULongSerializer : StdSerializer<ULong>(ULong::class.java) {
+    private fun readResolve(): Any = ULongSerializer
+
     override fun serialize(value: ULong, gen: JsonGenerator, provider: SerializerProvider) {
         val longValue = value.toLong()
         when {
@@ -67,7 +75,7 @@ internal class ValueClassStaticJsonValueSerializer<T : Any>(
     }
 }
 
-internal class KotlinSerializers(private val cache: ReflectionCache) : Serializers.Base() {
+internal class KotlinSerializers(private val cache: ReflectionCache) : SimpleSerializers() {
     override fun findSerializer(
         config: SerializationConfig?,
         type: JavaType,
diff --git a/src/test/java/io/github/projectmapk/jackson/module/kogera/test/github/_ported/CloneableJavaObj.java b/src/test/java/io/github/projectmapk/jackson/module/kogera/test/github/zPported/CloneableJavaObj.java
similarity index 97%
rename from src/test/java/io/github/projectmapk/jackson/module/kogera/test/github/_ported/CloneableJavaObj.java
rename to src/test/java/io/github/projectmapk/jackson/module/kogera/test/github/zPported/CloneableJavaObj.java
index 075df6b7..a801e468 100644
--- a/src/test/java/io/github/projectmapk/jackson/module/kogera/test/github/_ported/CloneableJavaObj.java
+++ b/src/test/java/io/github/projectmapk/jackson/module/kogera/test/github/zPported/CloneableJavaObj.java
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera.test.github._ported;
+package io.github.projectmapk.jackson.module.kogera.test.github.zPported;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 
diff --git a/src/test/java/io/github/projectmapk/jackson/module/kogera/test/github/_ported/Github165JavaTest.java b/src/test/java/io/github/projectmapk/jackson/module/kogera/test/github/zPported/Github165JavaTest.java
similarity index 98%
rename from src/test/java/io/github/projectmapk/jackson/module/kogera/test/github/_ported/Github165JavaTest.java
rename to src/test/java/io/github/projectmapk/jackson/module/kogera/test/github/zPported/Github165JavaTest.java
index 9145ad46..077fbac2 100644
--- a/src/test/java/io/github/projectmapk/jackson/module/kogera/test/github/_ported/Github165JavaTest.java
+++ b/src/test/java/io/github/projectmapk/jackson/module/kogera/test/github/zPported/Github165JavaTest.java
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera.test.github._ported;
+package io.github.projectmapk.jackson.module.kogera.test.github.zPported;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSetter;
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/KotlinModuleTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/KotlinModuleTest.kt
index 055ddba8..2199456d 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/KotlinModuleTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/KotlinModuleTest.kt
@@ -8,6 +8,8 @@ import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertDoesNotThrow
 import org.junit.jupiter.api.assertThrows
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.ValueSource
 
 class KotlinModuleTest {
     @Test
@@ -43,7 +45,7 @@ class KotlinModuleTest {
         fun `Cannot set initialCacheSize to a value larger than maxCacheSize`() {
             assertThrows<IllegalArgumentException> {
                 KotlinModule.Builder().apply {
-                    withInitialCacheSize(maxCacheSize + 1)
+                    withCacheSize(KotlinModule.CacheSize(initialCacheSize = KotlinModule.Builder.DEFAULT_CACHE_SIZE + 1))
                 }
             }
         }
@@ -52,7 +54,7 @@ class KotlinModuleTest {
         fun `Cannot set maxCacheSize to a value smaller than initialCacheSize`() {
             assertThrows<IllegalArgumentException> {
                 KotlinModule.Builder().apply {
-                    withMaxCacheSize(initialCacheSize - 1)
+                    withCacheSize(KotlinModule.CacheSize(maxCacheSize = KotlinModule.Builder.DEFAULT_CACHE_SIZE - 1))
                 }
             }
         }
@@ -61,8 +63,7 @@ class KotlinModuleTest {
         fun `Cannot set maxCacheSize to a value smaller than 15`() {
             assertThrows<IllegalArgumentException> {
                 KotlinModule.Builder().apply {
-                    withInitialCacheSize(0)
-                    withMaxCacheSize(15)
+                    KotlinModule.CacheSize(0, 15)
                 }
             }
         }
@@ -71,21 +72,20 @@ class KotlinModuleTest {
         fun test() {
             assertDoesNotThrow {
                 KotlinModule.Builder().apply {
-                    withInitialCacheSize(0)
-                    withMaxCacheSize(16)
+                    KotlinModule.CacheSize(0, 16)
                 }
             }
         }
     }
 
-    @Test
-    fun jdkSerializabilityTest() {
+    @ParameterizedTest
+    @ValueSource(booleans = [true, false])
+    fun jdkSerializabilityTest(enabled: Boolean) {
         val module = KotlinModule.Builder().apply {
-            withInitialCacheSize(123)
-            withMaxCacheSize(321)
+            withCacheSize(KotlinModule.CacheSize(123, 321))
 
             KotlinFeature.values().forEach {
-                enable(it)
+                configure(it, enabled)
             }
         }.build()
 
@@ -95,8 +95,7 @@ class KotlinModuleTest {
             val deserialized = jdkDeserialize<KotlinModule>(serialized)
 
             assertNotNull(deserialized)
-            assertEquals(123, deserialized.initialCacheSize)
-            assertEquals(321, deserialized.maxCacheSize)
+            assertEquals(KotlinModule.CacheSize(123, 321), deserialized.cacheSize)
             assertEquals(module.nullToEmptyCollection, deserialized.nullToEmptyCollection)
             assertEquals(module.nullToEmptyMap, deserialized.nullToEmptyMap)
             assertEquals(module.nullIsSameAsDefault, deserialized.nullIsSameAsDefault)
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/README.md b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/README.md
index 1d873ceb..e6e75f73 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/README.md
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/README.md
@@ -3,10 +3,10 @@ There are three types of tests in `jacksom-module-kogera`: unit tests, integrati
 These are placed in the following packages respectively.
 
 - unit tests: (package in which the test target is located)
-- integration tests: `_integration`
-- ported tests: `_ported`
+- integration tests: `zIntegration`
+- ported tests: `zPorted`
 
-Do not create new tests in the `_ported` package.
+Do not create new tests in the `zPorted` package.
 
 # Failing tests
 
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/deser/value_instantiator/argument_bucket/ArgumentBucketTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/deser/valueInstantiator/argumentBucket/ArgumentBucketTest.kt
similarity index 97%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/deser/value_instantiator/argument_bucket/ArgumentBucketTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/deser/valueInstantiator/argumentBucket/ArgumentBucketTest.kt
index cc8a339b..c6de5dc8 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/deser/value_instantiator/argument_bucket/ArgumentBucketTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/deser/valueInstantiator/argumentBucket/ArgumentBucketTest.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera.deser.value_instantiator.argument_bucket
+package io.github.projectmapk.jackson.module.kogera.deser.valueInstantiator.argumentBucket
 
 import org.junit.jupiter.api.Assertions.assertArrayEquals
 import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ClosedRangesTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ClosedRangesTest.kt
similarity index 97%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ClosedRangesTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ClosedRangesTest.kt
index 0eb420ae..03af2437 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ClosedRangesTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ClosedRangesTest.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._integration
+package io.github.projectmapk.jackson.module.kogera.zIntegration
 
 import io.github.projectmapk.jackson.module.kogera.ClosedRangeResolver
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/DurationTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/DurationTest.kt
similarity index 99%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/DurationTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/DurationTest.kt
index c763aee6..752386ca 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/DurationTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/DurationTest.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._integration
+package io.github.projectmapk.jackson.module.kogera.zIntegration
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonFormat
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/InitModuleTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/InitModuleTest.kt
similarity index 81%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/InitModuleTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/InitModuleTest.kt
index ea734427..b300c80b 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/InitModuleTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/InitModuleTest.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._integration
+package io.github.projectmapk.jackson.module.kogera.zIntegration
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.junit.jupiter.api.Test
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/DeserializeWithDefaultArgumentsTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/DeserializeWithDefaultArgumentsTest.kt
similarity index 97%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/DeserializeWithDefaultArgumentsTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/DeserializeWithDefaultArgumentsTest.kt
index f0c3b2bb..7b33007c 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/DeserializeWithDefaultArgumentsTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/DeserializeWithDefaultArgumentsTest.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._integration.deser
+package io.github.projectmapk.jackson.module.kogera.zIntegration.deser
 
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import io.github.projectmapk.jackson.module.kogera.readValue
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/HasRequiredMarkerTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/HasRequiredMarkerTest.kt
similarity index 99%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/HasRequiredMarkerTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/HasRequiredMarkerTest.kt
index 41067607..660c17dd 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/HasRequiredMarkerTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/HasRequiredMarkerTest.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._integration.deser
+package io.github.projectmapk.jackson.module.kogera.zIntegration.deser
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonProperty
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/StrictNullChecksTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/StrictNullChecksTest.kt
similarity index 98%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/StrictNullChecksTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/StrictNullChecksTest.kt
index ede25800..f5c16d16 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/StrictNullChecksTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/StrictNullChecksTest.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._integration.deser
+package io.github.projectmapk.jackson.module.kogera.zIntegration.deser
 
 import com.fasterxml.jackson.annotation.JsonSetter
 import com.fasterxml.jackson.annotation.Nulls
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/NoSpecifiedTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/NoSpecifiedTest.kt
similarity index 96%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/NoSpecifiedTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/NoSpecifiedTest.kt
index cf906ed6..c060e11a 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/NoSpecifiedTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/NoSpecifiedTest.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._integration.deser.value_class
+package io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass
 
 import com.fasterxml.jackson.databind.exc.MismatchedInputException
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/ValueClasses.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/ValueClasses.kt
similarity index 93%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/ValueClasses.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/ValueClasses.kt
index 24564bb3..1f346d19 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/ValueClasses.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/ValueClasses.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._integration.deser.value_class
+package io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass
 
 import com.fasterxml.jackson.core.JsonParser
 import com.fasterxml.jackson.databind.DeserializationContext
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/default_argument/NonNullObjectTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/defaultArgument/NonNullObjectTest.kt
similarity index 86%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/default_argument/NonNullObjectTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/defaultArgument/NonNullObjectTest.kt
index 8a371ccd..73d8cd06 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/default_argument/NonNullObjectTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/defaultArgument/NonNullObjectTest.kt
@@ -1,9 +1,9 @@
-package io.github.projectmapk.jackson.module.kogera._integration.deser.value_class.default_argument
+package io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass.defaultArgument
 
 import com.fasterxml.jackson.annotation.JsonCreator
-import io.github.projectmapk.jackson.module.kogera._integration.deser.value_class.NonNullObject
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import io.github.projectmapk.jackson.module.kogera.readValue
+import io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass.NonNullObject
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/default_argument/NullableObjectTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/defaultArgument/NullableObjectTest.kt
similarity index 90%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/default_argument/NullableObjectTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/defaultArgument/NullableObjectTest.kt
index fb9d9d76..0afe09f8 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/default_argument/NullableObjectTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/defaultArgument/NullableObjectTest.kt
@@ -1,10 +1,10 @@
-package io.github.projectmapk.jackson.module.kogera._integration.deser.value_class.default_argument
+package io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass.defaultArgument
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.databind.exc.ValueInstantiationException
-import io.github.projectmapk.jackson.module.kogera._integration.deser.value_class.NullableObject
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import io.github.projectmapk.jackson.module.kogera.readValue
+import io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass.NullableObject
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/default_argument/PrimitiveTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/defaultArgument/PrimitiveTest.kt
similarity index 85%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/default_argument/PrimitiveTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/defaultArgument/PrimitiveTest.kt
index 10e23b69..11b94235 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/default_argument/PrimitiveTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/defaultArgument/PrimitiveTest.kt
@@ -1,9 +1,9 @@
-package io.github.projectmapk.jackson.module.kogera._integration.deser.value_class.default_argument
+package io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass.defaultArgument
 
 import com.fasterxml.jackson.annotation.JsonCreator
-import io.github.projectmapk.jackson.module.kogera._integration.deser.value_class.Primitive
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import io.github.projectmapk.jackson.module.kogera.readValue
+import io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass.Primitive
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/deserializer/SpecifiedForObjectMapperTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/deserializer/SpecifiedForObjectMapperTest.kt
similarity index 89%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/deserializer/SpecifiedForObjectMapperTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/deserializer/SpecifiedForObjectMapperTest.kt
index abb79a6e..4d2899cb 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/deserializer/SpecifiedForObjectMapperTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/deserializer/SpecifiedForObjectMapperTest.kt
@@ -1,12 +1,12 @@
-package io.github.projectmapk.jackson.module.kogera._integration.deser.value_class.deserializer
+package io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass.deserializer
 
 import com.fasterxml.jackson.databind.exc.MismatchedInputException
 import com.fasterxml.jackson.databind.module.SimpleModule
-import io.github.projectmapk.jackson.module.kogera._integration.deser.value_class.NonNullObject
-import io.github.projectmapk.jackson.module.kogera._integration.deser.value_class.NullableObject
-import io.github.projectmapk.jackson.module.kogera._integration.deser.value_class.Primitive
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import io.github.projectmapk.jackson.module.kogera.readValue
+import io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass.NonNullObject
+import io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass.NullableObject
+import io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass.Primitive
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/deserializer/by_annotation/SpecifiedForClassTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/deserializer/byAnnotation/SpecifiedForClassTest.kt
similarity index 91%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/deserializer/by_annotation/SpecifiedForClassTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/deserializer/byAnnotation/SpecifiedForClassTest.kt
index caa418c7..6134f481 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/deserializer/by_annotation/SpecifiedForClassTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/deserializer/byAnnotation/SpecifiedForClassTest.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._integration.deser.value_class.deserializer.by_annotation
+package io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass.deserializer.byAnnotation
 
 import com.fasterxml.jackson.core.JsonParser
 import com.fasterxml.jackson.databind.DeserializationContext
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/deserializer/by_annotation/TempTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/deserializer/byAnnotation/TempTest.kt
similarity index 84%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/deserializer/by_annotation/TempTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/deserializer/byAnnotation/TempTest.kt
index 0ff80323..7385aaf5 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/deserializer/by_annotation/TempTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/deserializer/byAnnotation/TempTest.kt
@@ -1,11 +1,11 @@
-package io.github.projectmapk.jackson.module.kogera._integration.deser.value_class.deserializer.by_annotation
+package io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass.deserializer.byAnnotation
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import io.github.projectmapk.jackson.module.kogera.KotlinFeature
 import io.github.projectmapk.jackson.module.kogera.KotlinModule
-import io.github.projectmapk.jackson.module.kogera._integration.deser.value_class.Primitive
 import io.github.projectmapk.jackson.module.kogera.readValue
+import io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass.Primitive
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/json_creator/InCreatorArgumentTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/jsonCreator/InCreatorArgumentTest.kt
similarity index 84%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/json_creator/InCreatorArgumentTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/jsonCreator/InCreatorArgumentTest.kt
index 890539a7..8719620c 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/json_creator/InCreatorArgumentTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/jsonCreator/InCreatorArgumentTest.kt
@@ -1,11 +1,11 @@
-package io.github.projectmapk.jackson.module.kogera._integration.deser.value_class.json_creator
+package io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass.jsonCreator
 
 import com.fasterxml.jackson.annotation.JsonCreator
-import io.github.projectmapk.jackson.module.kogera._integration.deser.value_class.NonNullObject
-import io.github.projectmapk.jackson.module.kogera._integration.deser.value_class.NullableObject
-import io.github.projectmapk.jackson.module.kogera._integration.deser.value_class.Primitive
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import io.github.projectmapk.jackson.module.kogera.readValue
+import io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass.NonNullObject
+import io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass.NullableObject
+import io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass.Primitive
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/json_creator/ValueClassByJacksonCreatorTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/jsonCreator/ValueClassByJacksonCreatorTest.kt
similarity index 94%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/json_creator/ValueClassByJacksonCreatorTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/jsonCreator/ValueClassByJacksonCreatorTest.kt
index db852365..f1831b89 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/json_creator/ValueClassByJacksonCreatorTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/jsonCreator/ValueClassByJacksonCreatorTest.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._integration.deser.value_class.json_creator
+package io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass.jsonCreator
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/json_creator/ValueClassByOriginalCreatorTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/jsonCreator/ValueClassByOriginalCreatorTest.kt
similarity index 96%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/json_creator/ValueClassByOriginalCreatorTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/jsonCreator/ValueClassByOriginalCreatorTest.kt
index a0ef3f96..45f31ba5 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/deser/value_class/json_creator/ValueClassByOriginalCreatorTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/valueClass/jsonCreator/ValueClassByOriginalCreatorTest.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._integration.deser.value_class.json_creator
+package io.github.projectmapk.jackson.module.kogera.zIntegration.deser.valueClass.jsonCreator
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.databind.exc.InvalidDefinitionException
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/HasRequiredMarkerTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/HasRequiredMarkerTest.kt
similarity index 97%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/HasRequiredMarkerTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/HasRequiredMarkerTest.kt
index a734e9ee..564a03f1 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/HasRequiredMarkerTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/HasRequiredMarkerTest.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._integration.ser
+package io.github.projectmapk.jackson.module.kogera.zIntegration.ser
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.BeanDescription
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/InheritanceTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/InheritanceTest.kt
similarity index 92%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/InheritanceTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/InheritanceTest.kt
index de27aaa2..a80afcb5 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/InheritanceTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/InheritanceTest.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._integration.ser
+package io.github.projectmapk.jackson.module.kogera.zIntegration.ser
 
 import io.github.projectmapk.jackson.module.kogera.ReflectionCache
 import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/JvmFieldTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/JvmFieldTest.kt
similarity index 88%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/JvmFieldTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/JvmFieldTest.kt
index 4d0b6653..09144160 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/JvmFieldTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/JvmFieldTest.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._integration.ser
+package io.github.projectmapk.jackson.module.kogera.zIntegration.ser
 
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/PropertySerializeTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/PropertySerializeTest.kt
similarity index 93%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/PropertySerializeTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/PropertySerializeTest.kt
index db0a20b8..b8bf2f81 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/PropertySerializeTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/PropertySerializeTest.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._integration.ser
+package io.github.projectmapk.jackson.module.kogera.zIntegration.ser
 
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/JsonKeyTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/JsonKeyTest.kt
similarity index 94%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/JsonKeyTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/JsonKeyTest.kt
index 13b4a6a7..45463703 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/JsonKeyTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/JsonKeyTest.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._integration.ser.value_class
+package io.github.projectmapk.jackson.module.kogera.zIntegration.ser.valueClass
 
 import com.fasterxml.jackson.annotation.JsonKey
 import io.github.projectmapk.jackson.module.kogera.jacksonMapperBuilder
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/json_include/JsonIncludeCustomTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/jsonInclude/JsonIncludeCustomTest.kt
similarity index 89%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/json_include/JsonIncludeCustomTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/jsonInclude/JsonIncludeCustomTest.kt
index f6afaa21..b1c802b8 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/json_include/JsonIncludeCustomTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/jsonInclude/JsonIncludeCustomTest.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._integration.ser.value_class.json_include
+package io.github.projectmapk.jackson.module.kogera.zIntegration.ser.valueClass.jsonInclude
 
 import com.fasterxml.jackson.annotation.JsonInclude
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/json_include/JsonIncludeNonNullTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/jsonInclude/JsonIncludeNonNullTest.kt
similarity index 93%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/json_include/JsonIncludeNonNullTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/jsonInclude/JsonIncludeNonNullTest.kt
index a3dd74b7..f6207eb3 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/json_include/JsonIncludeNonNullTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/jsonInclude/JsonIncludeNonNullTest.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._integration.ser.value_class.json_include
+package io.github.projectmapk.jackson.module.kogera.zIntegration.ser.valueClass.jsonInclude
 
 import com.fasterxml.jackson.annotation.JsonInclude
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/json_include/ValueClasses.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/jsonInclude/ValueClasses.kt
similarity index 62%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/json_include/ValueClasses.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/jsonInclude/ValueClasses.kt
index 452ecc1c..e09eef4e 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/json_include/ValueClasses.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/jsonInclude/ValueClasses.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._integration.ser.value_class.json_include
+package io.github.projectmapk.jackson.module.kogera.zIntegration.ser.valueClass.jsonInclude
 
 @JvmInline
 value class Primitive(val v: Int)
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/json_unbox/ForClass.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/jsonKUnbox/ForClass.kt
similarity index 93%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/json_unbox/ForClass.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/jsonKUnbox/ForClass.kt
index 7f7e8fa8..b0d60219 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/json_unbox/ForClass.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/jsonKUnbox/ForClass.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._integration.ser.value_class.json_unbox
+package io.github.projectmapk.jackson.module.kogera.zIntegration.ser.valueClass.jsonKUnbox
 
 import io.github.projectmapk.jackson.module.kogera.annotation.JsonKUnbox
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/json_unbox/ForProperty.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/jsonKUnbox/ForProperty.kt
similarity index 94%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/json_unbox/ForProperty.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/jsonKUnbox/ForProperty.kt
index 886797ce..7bb85f71 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/json_unbox/ForProperty.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/jsonKUnbox/ForProperty.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._integration.ser.value_class.json_unbox
+package io.github.projectmapk.jackson.module.kogera.zIntegration.ser.valueClass.jsonKUnbox
 
 import io.github.projectmapk.jackson.module.kogera.annotation.JsonKUnbox
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/serializer/ValueClasses.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/serializer/ValueClasses.kt
similarity index 92%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/serializer/ValueClasses.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/serializer/ValueClasses.kt
index 9f204467..1ca1d171 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/serializer/ValueClasses.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/serializer/ValueClasses.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._integration.ser.value_class.serializer
+package io.github.projectmapk.jackson.module.kogera.zIntegration.ser.valueClass.serializer
 
 import com.fasterxml.jackson.core.JsonGenerator
 import com.fasterxml.jackson.databind.SerializerProvider
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/serializer/by_annotation/non_null_object/ByAnnotationTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/serializer/byAnnotation/nonNullObject/ByAnnotationTest.kt
similarity index 89%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/serializer/by_annotation/non_null_object/ByAnnotationTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/serializer/byAnnotation/nonNullObject/ByAnnotationTest.kt
index 73ae0218..b5b10dd8 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/serializer/by_annotation/non_null_object/ByAnnotationTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/serializer/byAnnotation/nonNullObject/ByAnnotationTest.kt
@@ -1,9 +1,9 @@
-package io.github.projectmapk.jackson.module.kogera._integration.ser.value_class.serializer.by_annotation.non_null_object
+package io.github.projectmapk.jackson.module.kogera.zIntegration.ser.valueClass.serializer.byAnnotation.nonNullObject
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize
-import io.github.projectmapk.jackson.module.kogera._integration.ser.value_class.serializer.NonNullObject
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import io.github.projectmapk.jackson.module.kogera.testPrettyWriter
+import io.github.projectmapk.jackson.module.kogera.zIntegration.ser.valueClass.serializer.NonNullObject
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/serializer/by_annotation/nullable_object/by_annotation/NonNullValueTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/serializer/byAnnotation/nullableObject/byAnnotation/NonNullValueTest.kt
similarity index 89%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/serializer/by_annotation/nullable_object/by_annotation/NonNullValueTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/serializer/byAnnotation/nullableObject/byAnnotation/NonNullValueTest.kt
index 21854f18..ae9b66f2 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/serializer/by_annotation/nullable_object/by_annotation/NonNullValueTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/serializer/byAnnotation/nullableObject/byAnnotation/NonNullValueTest.kt
@@ -1,9 +1,9 @@
-package io.github.projectmapk.jackson.module.kogera._integration.ser.value_class.serializer.by_annotation.nullable_object.by_annotation
+package io.github.projectmapk.jackson.module.kogera.zIntegration.ser.valueClass.serializer.byAnnotation.nullableObject.byAnnotation
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize
-import io.github.projectmapk.jackson.module.kogera._integration.ser.value_class.serializer.NullableObject
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import io.github.projectmapk.jackson.module.kogera.testPrettyWriter
+import io.github.projectmapk.jackson.module.kogera.zIntegration.ser.valueClass.serializer.NullableObject
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/serializer/by_annotation/nullable_object/by_annotation/NullValueTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/serializer/byAnnotation/nullableObject/byAnnotation/NullValueTest.kt
similarity index 88%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/serializer/by_annotation/nullable_object/by_annotation/NullValueTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/serializer/byAnnotation/nullableObject/byAnnotation/NullValueTest.kt
index bbeb3af7..eab70e05 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/serializer/by_annotation/nullable_object/by_annotation/NullValueTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/serializer/byAnnotation/nullableObject/byAnnotation/NullValueTest.kt
@@ -1,9 +1,9 @@
-package io.github.projectmapk.jackson.module.kogera._integration.ser.value_class.serializer.by_annotation.nullable_object.by_annotation
+package io.github.projectmapk.jackson.module.kogera.zIntegration.ser.valueClass.serializer.byAnnotation.nullableObject.byAnnotation
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize
-import io.github.projectmapk.jackson.module.kogera._integration.ser.value_class.serializer.NullableObject
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import io.github.projectmapk.jackson.module.kogera.testPrettyWriter
+import io.github.projectmapk.jackson.module.kogera.zIntegration.ser.valueClass.serializer.NullableObject
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/serializer/by_annotation/primitive/ByAnnotationTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/serializer/byAnnotation/primitive/ByAnnotationTest.kt
similarity index 91%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/serializer/by_annotation/primitive/ByAnnotationTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/serializer/byAnnotation/primitive/ByAnnotationTest.kt
index 03bbcccd..7450affe 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_integration/ser/value_class/serializer/by_annotation/primitive/ByAnnotationTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/valueClass/serializer/byAnnotation/primitive/ByAnnotationTest.kt
@@ -1,11 +1,11 @@
-package io.github.projectmapk.jackson.module.kogera._integration.ser.value_class.serializer.by_annotation.primitive
+package io.github.projectmapk.jackson.module.kogera.zIntegration.ser.valueClass.serializer.byAnnotation.primitive
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.annotation.JsonSerialize
 import io.github.projectmapk.jackson.module.kogera.KotlinFeature
 import io.github.projectmapk.jackson.module.kogera.KotlinModule
-import io.github.projectmapk.jackson.module.kogera._integration.ser.value_class.serializer.Primitive
 import io.github.projectmapk.jackson.module.kogera.testPrettyWriter
+import io.github.projectmapk.jackson.module.kogera.zIntegration.ser.valueClass.serializer.Primitive
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/DslTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/DslTest.kt
similarity index 91%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/DslTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/DslTest.kt
index fb5e030d..58dc44f8 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/DslTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/DslTest.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported
+package io.github.projectmapk.jackson.module.kogera.zPorted
 
 import com.fasterxml.jackson.core.json.JsonReadFeature
 import com.fasterxml.jackson.core.json.JsonWriteFeature
@@ -7,6 +7,7 @@ import io.github.projectmapk.jackson.module.kogera.KotlinFeature.NullToEmptyColl
 import io.github.projectmapk.jackson.module.kogera.KotlinFeature.NullToEmptyMap
 import io.github.projectmapk.jackson.module.kogera.KotlinFeature.SingletonSupport
 import io.github.projectmapk.jackson.module.kogera.KotlinFeature.StrictNullChecks
+import io.github.projectmapk.jackson.module.kogera.KotlinModule
 import io.github.projectmapk.jackson.module.kogera.jsonMapper
 import io.github.projectmapk.jackson.module.kogera.kotlinModule
 import org.junit.jupiter.api.Assertions.assertEquals
@@ -32,7 +33,7 @@ class DslTest {
     @Test
     fun createModuleWithBuilderOptions() {
         val module = kotlinModule {
-            withInitialCacheSize(123)
+            withCacheSize(KotlinModule.CacheSize(123))
             enable(NullToEmptyCollection)
             enable(NullToEmptyMap)
             enable(NullIsSameAsDefault)
@@ -41,7 +42,7 @@ class DslTest {
         }
 
         assertNotNull(module)
-        assertEquals(module.initialCacheSize, 123)
+        assertEquals(module.cacheSize, KotlinModule.CacheSize(123, 123))
         assertTrue(module.nullToEmptyCollection)
         assertTrue(module.nullToEmptyMap)
         assertTrue(module.nullIsSameAsDefault)
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/KotlinInstantiatorsTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/KotlinInstantiatorsTest.kt
similarity index 90%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/KotlinInstantiatorsTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/KotlinInstantiatorsTest.kt
index f794499c..1316444d 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/KotlinInstantiatorsTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/KotlinInstantiatorsTest.kt
@@ -1,9 +1,9 @@
-package io.github.projectmapk.jackson.module.kogera._ported
+package io.github.projectmapk.jackson.module.kogera.zPorted
 
 import com.fasterxml.jackson.databind.deser.std.StdValueInstantiator
 import io.github.projectmapk.jackson.module.kogera.ReflectionCache
-import io.github.projectmapk.jackson.module.kogera.deser.value_instantiator.KotlinInstantiators
-import io.github.projectmapk.jackson.module.kogera.deser.value_instantiator.KotlinValueInstantiator
+import io.github.projectmapk.jackson.module.kogera.deser.valueInstantiator.KotlinInstantiators
+import io.github.projectmapk.jackson.module.kogera.deser.valueInstantiator.KotlinValueInstantiator
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/KotlinModuleTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/KotlinModuleTest.kt
similarity index 90%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/KotlinModuleTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/KotlinModuleTest.kt
index 2da30058..66797863 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/KotlinModuleTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/KotlinModuleTest.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported
+package io.github.projectmapk.jackson.module.kogera.zPorted
 
 import io.github.projectmapk.jackson.module.kogera.KotlinFeature.NullIsSameAsDefault
 import io.github.projectmapk.jackson.module.kogera.KotlinFeature.NullToEmptyCollection
@@ -19,7 +19,7 @@ class KotlinModuleTest {
     fun builderDefaultsMatchFeatures() {
         val module = KotlinModule.Builder().build()
 
-        assertEquals(module.initialCacheSize, 512)
+        assertEquals(KotlinModule.CacheSize(512), module.cacheSize)
         assertFalse(module.nullToEmptyCollection)
         assertFalse(module.nullToEmptyMap)
         assertFalse(module.nullIsSameAsDefault)
@@ -31,7 +31,7 @@ class KotlinModuleTest {
     fun builder_Defaults() {
         val module = KotlinModule.Builder().build()
 
-        assertEquals(512, module.maxCacheSize)
+        assertEquals(KotlinModule.CacheSize(512), module.cacheSize)
         assertFalse(module.nullToEmptyCollection)
         assertFalse(module.nullToEmptyMap)
         assertFalse(module.nullIsSameAsDefault)
@@ -42,7 +42,7 @@ class KotlinModuleTest {
     @Test
     fun builder_SetAll() {
         val module = KotlinModule.Builder().apply {
-            withInitialCacheSize(123)
+            withCacheSize(KotlinModule.CacheSize(initialCacheSize = 123))
             enable(NullToEmptyCollection)
             enable(NullToEmptyMap)
             enable(NullIsSameAsDefault)
@@ -50,7 +50,7 @@ class KotlinModuleTest {
             enable(StrictNullChecks)
         }.build()
 
-        assertEquals(123, module.initialCacheSize)
+        assertEquals(123, module.cacheSize.initialCacheSize)
         assertTrue(module.nullToEmptyCollection)
         assertTrue(module.nullToEmptyMap)
         assertTrue(module.nullIsSameAsDefault)
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/ExtensionMethodsTests.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/ExtensionMethodsTests.kt
similarity index 98%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/ExtensionMethodsTests.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/ExtensionMethodsTests.kt
index 8ef01b17..35adb65f 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/ExtensionMethodsTests.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/ExtensionMethodsTests.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test
+package io.github.projectmapk.jackson.module.kogera.zPorted.test
 
 import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.databind.ObjectMapper
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/IteratorTests.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/IteratorTests.kt
similarity index 97%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/IteratorTests.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/IteratorTests.kt
index 7a29efd7..1c645e1e 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/IteratorTests.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/IteratorTests.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test
+package io.github.projectmapk.jackson.module.kogera.zPorted.test
 
 import com.fasterxml.jackson.core.type.TypeReference
 import com.fasterxml.jackson.databind.ObjectMapper
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/KotlinBuiltinsTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/KotlinBuiltinsTest.kt
similarity index 98%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/KotlinBuiltinsTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/KotlinBuiltinsTest.kt
index 6161d49a..68ffe44c 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/KotlinBuiltinsTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/KotlinBuiltinsTest.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test
+package io.github.projectmapk.jackson.module.kogera.zPorted.test
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.SerializationFeature
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/KotlinFeatures.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/KotlinFeatures.kt
similarity index 99%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/KotlinFeatures.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/KotlinFeatures.kt
index 9c06f2cd..325e0ea8 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/KotlinFeatures.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/KotlinFeatures.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test
+package io.github.projectmapk.jackson.module.kogera.zPorted.test
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonIgnore
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/NullToDefaultTests.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/NullToDefaultTests.kt
similarity index 97%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/NullToDefaultTests.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/NullToDefaultTests.kt
index 081e3451..503aba8e 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/NullToDefaultTests.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/NullToDefaultTests.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test
+package io.github.projectmapk.jackson.module.kogera.zPorted.test
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.exc.MismatchedInputException
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/NullToEmptyCollectionTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/NullToEmptyCollectionTest.kt
similarity index 94%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/NullToEmptyCollectionTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/NullToEmptyCollectionTest.kt
index 3e55f781..0aa44998 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/NullToEmptyCollectionTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/NullToEmptyCollectionTest.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test
+package io.github.projectmapk.jackson.module.kogera.zPorted.test
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import io.github.projectmapk.jackson.module.kogera.KotlinFeature.NullToEmptyCollection
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/NullToEmptyMapTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/NullToEmptyMapTest.kt
similarity index 94%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/NullToEmptyMapTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/NullToEmptyMapTest.kt
index ed9183b2..909c5c6c 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/NullToEmptyMapTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/NullToEmptyMapTest.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test
+package io.github.projectmapk.jackson.module.kogera.zPorted.test
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import io.github.projectmapk.jackson.module.kogera.KotlinFeature.NullToEmptyMap
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/ObjectSingletonTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/ObjectSingletonTest.kt
similarity index 96%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/ObjectSingletonTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/ObjectSingletonTest.kt
index a8fad872..793221d3 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/ObjectSingletonTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/ObjectSingletonTest.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test
+package io.github.projectmapk.jackson.module.kogera.zPorted.test
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import io.github.projectmapk.jackson.module.kogera.KotlinFeature.SingletonSupport
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/ParameterNameTests.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/ParameterNameTests.kt
similarity index 99%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/ParameterNameTests.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/ParameterNameTests.kt
index 92d80d3b..2ef0edf6 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/ParameterNameTests.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/ParameterNameTests.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test
+package io.github.projectmapk.jackson.module.kogera.zPorted.test
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonIgnore
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/SealedClassTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/SealedClassTest.kt
similarity index 95%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/SealedClassTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/SealedClassTest.kt
index fe5f2fbe..e41cef1c 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/SealedClassTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/SealedClassTest.kt
@@ -1,12 +1,12 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test
+package io.github.projectmapk.jackson.module.kogera.zPorted.test
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonTypeInfo
 import com.fasterxml.jackson.annotation.JsonValue
 import com.fasterxml.jackson.core.type.TypeReference
 import com.fasterxml.jackson.databind.exc.MismatchedInputException
-import io.github.projectmapk.jackson.module.kogera._ported.test.SealedClassTest.SuperClass.B
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
+import io.github.projectmapk.jackson.module.kogera.zPorted.test.SealedClassTest.SuperClass.B
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/SequenceSerdesTests.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/SequenceSerdesTests.kt
similarity index 97%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/SequenceSerdesTests.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/SequenceSerdesTests.kt
index 4833433c..a5bdba17 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/SequenceSerdesTests.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/SequenceSerdesTests.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test
+package io.github.projectmapk.jackson.module.kogera.zPorted.test
 
 import com.fasterxml.jackson.core.JsonGenerator
 import com.fasterxml.jackson.databind.SerializerProvider
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/StrictNullChecksTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/StrictNullChecksTest.kt
similarity index 98%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/StrictNullChecksTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/StrictNullChecksTest.kt
index cf77d8c1..6fd2dfdc 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/StrictNullChecksTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/StrictNullChecksTest.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test
+package io.github.projectmapk.jackson.module.kogera.zPorted.test
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.exc.MismatchedInputException
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/TestHelpers.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/TestHelpers.kt
similarity index 94%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/TestHelpers.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/TestHelpers.kt
index 74f9d978..57ef2f92 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/TestHelpers.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/TestHelpers.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test
+package io.github.projectmapk.jackson.module.kogera.zPorted.test
 
 import org.junit.jupiter.api.Assertions.fail
 
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/TestHelpersTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/TestHelpersTest.kt
similarity index 94%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/TestHelpersTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/TestHelpersTest.kt
index 6a0cd05d..6adc627d 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/TestHelpersTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/TestHelpersTest.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test
+package io.github.projectmapk.jackson.module.kogera.zPorted.test
 
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/UnsignedNumbersOnKeyTest.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/UnsignedNumbersOnKeyTest.kt
similarity index 98%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/UnsignedNumbersOnKeyTest.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/UnsignedNumbersOnKeyTest.kt
index 2fc5b6cf..1d6ca3fb 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/UnsignedNumbersOnKeyTest.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/UnsignedNumbersOnKeyTest.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test
+package io.github.projectmapk.jackson.module.kogera.zPorted.test
 
 import com.fasterxml.jackson.core.exc.InputCoercionException
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/UnsignedNumbersTests.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/UnsignedNumbersTests.kt
similarity index 97%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/UnsignedNumbersTests.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/UnsignedNumbersTests.kt
index a1aabbd0..f19032a7 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/UnsignedNumbersTests.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/UnsignedNumbersTests.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test
+package io.github.projectmapk.jackson.module.kogera.zPorted.test
 
 import com.fasterxml.jackson.core.exc.InputCoercionException
 import com.fasterxml.jackson.databind.ObjectMapper
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/GitHub524.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/GitHub524.kt
similarity index 97%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/GitHub524.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/GitHub524.kt
index f7cec225..00e1f255 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/GitHub524.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/GitHub524.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.core.JsonGenerator
 import com.fasterxml.jackson.databind.SerializerProvider
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/GitHub530.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/GitHub530.kt
similarity index 99%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/GitHub530.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/GitHub530.kt
index 1c76429a..5ff7e38e 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/GitHub530.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/GitHub530.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonValue
 import io.github.projectmapk.jackson.module.kogera.jacksonMapperBuilder
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github101.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github101.kt
similarity index 93%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github101.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github101.kt
index 28b2a687..857aa28a 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github101.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github101.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JacksonInject
 import com.fasterxml.jackson.databind.InjectableValues
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github104.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github104.kt
similarity index 90%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github104.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github104.kt
index 3fde00a1..6ed25067 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github104.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github104.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import io.github.projectmapk.jackson.module.kogera.readValue
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github114.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github114.kt
similarity index 97%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github114.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github114.kt
index 42e428af..d199c2c8 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github114.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github114.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonProperty
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github120.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github120.kt
similarity index 92%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github120.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github120.kt
index b00cd5a9..27df18a1 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github120.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github120.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonValue
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github124.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github124.kt
similarity index 96%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github124.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github124.kt
index 58fb90a5..d6cbf787 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github124.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github124.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonIgnore
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github131.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github131.kt
similarity index 89%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github131.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github131.kt
index 1d41a145..7aacdb77 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github131.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github131.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import io.github.projectmapk.jackson.module.kogera.readValue
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github145.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github145.kt
similarity index 98%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github145.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github145.kt
index 6d444fb9..55f620b7 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github145.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github145.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonProperty
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github148.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github148.kt
similarity index 94%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github148.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github148.kt
index 5dbf0c93..396b6532 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github148.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github148.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github149.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github149.kt
similarity index 97%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github149.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github149.kt
index 2c1490a7..1508ba4c 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github149.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github149.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect
 import com.fasterxml.jackson.annotation.JsonBackReference
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github15.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github15.kt
similarity index 95%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github15.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github15.kt
index 5c41c3c2..375a5916 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github15.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github15.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import io.github.projectmapk.jackson.module.kogera.readValue
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github153.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github153.kt
similarity index 95%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github153.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github153.kt
index e84d2466..a33d5360 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github153.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github153.kt
@@ -1,12 +1,12 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.databind.exc.InvalidDefinitionException
 import com.fasterxml.jackson.dataformat.xml.XmlMapper
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement
-import io.github.projectmapk.jackson.module.kogera._ported.test.expectFailure
 import io.github.projectmapk.jackson.module.kogera.kotlinModule
+import io.github.projectmapk.jackson.module.kogera.zPorted.test.expectFailure
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github155.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github155.kt
similarity index 92%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github155.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github155.kt
index 80d3c3ff..38191e0b 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github155.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github155.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github158.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github158.kt
similarity index 93%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github158.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github158.kt
index 86c41f58..ba935d75 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github158.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github158.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github161.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github161.kt
similarity index 92%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github161.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github161.kt
index aeee023d..5ea06ede 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github161.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github161.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.exc.MismatchedInputException
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github165.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github165.kt
similarity index 85%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github165.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github165.kt
index 518e0905..292d76c9 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github165.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github165.kt
@@ -1,10 +1,8 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonProperty
-import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import io.github.projectmapk.jackson.module.kogera.readValue
-import io.github.projectmapk.jackson.module.kogera.test.github._ported.Github165JavaTest
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertFalse
 import org.junit.jupiter.api.Assertions.assertTrue
@@ -44,7 +42,7 @@ class TestGithub165 {
     @Test
     fun testJsonSetterCalledJava() {
         val obj = io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper()
-            .readValue<io.github.projectmapk.jackson.module.kogera.test.github._ported.Github165JavaTest>("""{"name":"Fred","year":"1942"}""")
+            .readValue<io.github.projectmapk.jackson.module.kogera.test.github.zPported.Github165JavaTest>("""{"name":"Fred","year":"1942"}""")
         assertEquals("1942", obj.showYear)
         assertEquals("Fred", obj.showName)
         assertTrue(obj.yearSetterCalled)
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github167.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github167.kt
similarity index 92%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github167.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github167.kt
index 6081bbd9..1ed5847c 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github167.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github167.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github168.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github168.kt
similarity index 94%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github168.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github168.kt
index d8a85a36..4c162a76 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github168.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github168.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.exc.MismatchedInputException
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github179.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github179.kt
similarity index 96%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github179.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github179.kt
index 37775463..249261a0 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github179.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github179.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonProperty
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github180.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github180.kt
similarity index 93%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github180.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github180.kt
index 61776fd4..f1112d40 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github180.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github180.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonProperty
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github181.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github181.kt
similarity index 94%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github181.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github181.kt
index 7abbc4c7..68365a2d 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github181.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github181.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github194.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github194.kt
similarity index 96%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github194.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github194.kt
index 095968f7..852ef1e1 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github194.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github194.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonIdentityInfo
 import com.fasterxml.jackson.annotation.ObjectIdGenerators
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github196.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github196.kt
similarity index 87%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github196.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github196.kt
index f43895d8..69d9b4cd 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github196.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github196.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import io.github.projectmapk.jackson.module.kogera.readValue
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github207.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github207.kt
similarity index 96%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github207.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github207.kt
index 4200d27a..b508846d 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github207.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github207.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonValue
 import com.fasterxml.jackson.databind.ObjectMapper
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github210.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github210.kt
similarity index 95%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github210.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github210.kt
index 2d0e2eb4..76123530 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github210.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github210.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import io.github.projectmapk.jackson.module.kogera.readValue
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github22.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github22.kt
similarity index 95%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github22.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github22.kt
index a4771f81..753a666b 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github22.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github22.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonValue
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github239.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github239.kt
similarity index 96%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github239.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github239.kt
index 2bf6836c..ba8590f3 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github239.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github239.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonSubTypes
 import com.fasterxml.jackson.annotation.JsonTypeInfo
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github25.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github25.kt
similarity index 97%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github25.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github25.kt
index 9e6686b9..bd5fcf12 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github25.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github25.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonPropertyOrder
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github26.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github26.kt
similarity index 93%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github26.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github26.kt
index 1a452426..a8147519 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github26.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github26.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import io.github.projectmapk.jackson.module.kogera.readValue
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github269.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github269.kt
similarity index 97%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github269.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github269.kt
index 9043197b..d2ec0a19 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github269.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github269.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.databind.annotation.JsonSerialize
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github27.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github27.kt
similarity index 95%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github27.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github27.kt
index 718d6ebc..acb69fc8 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github27.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github27.kt
@@ -1,11 +1,11 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.SerializationFeature
-import io.github.projectmapk.jackson.module.kogera._ported.test.expectFailure
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import io.github.projectmapk.jackson.module.kogera.readValue
+import io.github.projectmapk.jackson.module.kogera.zPorted.test.expectFailure
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github270.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github270.kt
similarity index 89%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github270.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github270.kt
index 2a7ae6ba..408e76c9 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github270.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github270.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github29.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github29.kt
similarity index 92%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github29.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github29.kt
index 616055c9..27909cc4 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github29.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github29.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import io.github.projectmapk.jackson.module.kogera.readValue
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github308.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github308.kt
similarity index 94%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github308.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github308.kt
index 6b81b06d..44238e7c 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github308.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github308.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github32.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github32.kt
similarity index 98%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github32.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github32.kt
index f882e659..df049aaf 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github32.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github32.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.databind.JsonMappingException
 import com.fasterxml.jackson.databind.exc.MismatchedInputException
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github335.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github335.kt
similarity index 94%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github335.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github335.kt
index 36842cd2..63532891 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github335.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github335.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonSubTypes
 import com.fasterxml.jackson.annotation.JsonSubTypes.Type
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github356.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github356.kt
similarity index 55%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github356.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github356.kt
index c64b123b..8d3a49c9 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github356.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github356.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
@@ -9,22 +9,6 @@ import org.junit.jupiter.api.Test
 class TestGithub356 {
     private val mapper = jacksonObjectMapper()
 
-    @Test
-    fun deserializeInlineClass() {
-        assertEquals(
-            ClassWithInlineMember(InlineClass("bar")),
-            mapper.readValue<ClassWithInlineMember>("""{"inlineClassProperty":"bar"}""")
-        )
-    }
-
-    @Test
-    fun serializeInlineClass() {
-        assertEquals(
-            """{"inlineClassProperty":"bar"}""",
-            mapper.writeValueAsString(ClassWithInlineMember(InlineClass("bar")))
-        )
-    }
-
     @Test
     fun deserializeValueClass() {
         assertEquals(
@@ -42,16 +26,6 @@ class TestGithub356 {
     }
 }
 
-// Deprecated usage kept at 1.5.0 upgrade; delete in the future
-inline class InlineClass(val value: String)
-
-@JsonDeserialize(builder = ClassWithInlineMember.JacksonBuilder::class)
-data class ClassWithInlineMember(val inlineClassProperty: InlineClass) {
-    data class JacksonBuilder constructor(val inlineClassProperty: String) {
-        fun build() = ClassWithInlineMember(InlineClass(inlineClassProperty))
-    }
-}
-
 @JvmInline
 value class ValueClass(val value: String)
 
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github42.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github42.kt
similarity index 96%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github42.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github42.kt
index 725ea15b..2b170834 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github42.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github42.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.JsonMappingException
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github46.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github46.kt
similarity index 97%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github46.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github46.kt
index f0b74671..4e44cc11 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github46.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github46.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import io.github.projectmapk.jackson.module.kogera.readValue
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github464.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github464.kt
similarity index 99%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github464.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github464.kt
index d3ec4a5a..89fa4474 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github464.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github464.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.core.JsonGenerator
 import com.fasterxml.jackson.databind.JsonSerializer
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github47.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github47.kt
similarity index 93%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github47.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github47.kt
index 8025402e..975e22fe 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github47.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github47.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.databind.MapperFeature
 import io.github.projectmapk.jackson.module.kogera.jacksonMapperBuilder
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github490.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github490.kt
similarity index 97%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github490.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github490.kt
index 2ec642c4..43e6c911 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github490.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github490.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.node.NullNode
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github52.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github52.kt
similarity index 96%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github52.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github52.kt
index 8da1717c..d399de7e 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github52.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github52.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonProperty
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github526.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github526.kt
similarity index 89%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github526.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github526.kt
index e96583fd..137654b5 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github526.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github526.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonSetter
 import com.fasterxml.jackson.annotation.Nulls
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github56.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github56.kt
similarity index 97%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github56.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github56.kt
index 91034bbb..588ea3de 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github56.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github56.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.annotation.JsonUnwrapped
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github57.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github57.kt
similarity index 96%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github57.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github57.kt
index 53ffca1b..86c94bfe 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github57.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github57.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.databind.DeserializationContext
 import com.fasterxml.jackson.databind.KeyDeserializer
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github62.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github62.kt
similarity index 87%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github62.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github62.kt
index f8fe2b43..288b221e 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github62.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github62.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github710.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github710.kt
similarity index 88%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github710.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github710.kt
index 923f192a..da8dfb61 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github710.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github710.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github80.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github80.kt
similarity index 94%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github80.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github80.kt
index 4532b161..30fe6641 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github80.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github80.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github88.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github88.kt
similarity index 82%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github88.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github88.kt
index 545fabdb..c9632e28 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github88.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github88.kt
@@ -1,7 +1,7 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
-import io.github.projectmapk.jackson.module.kogera.test.github._ported.CloneableJavaObj
+import io.github.projectmapk.jackson.module.kogera.test.github.zPported.CloneableJavaObj
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github91.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github91.kt
similarity index 94%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github91.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github91.kt
index 48c37f94..705fe17c 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/Github91.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/Github91.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonValue
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/GithubDatabind1005Test.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/GithubDatabind1005Test.kt
similarity index 93%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/GithubDatabind1005Test.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/GithubDatabind1005Test.kt
index 88c6cc2f..b48af197 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/GithubDatabind1005Test.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/GithubDatabind1005Test.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonProperty
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/GithubDatabind1328.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/GithubDatabind1328.kt
similarity index 96%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/GithubDatabind1328.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/GithubDatabind1328.kt
index 72431211..ddb919bb 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/GithubDatabind1328.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/GithubDatabind1328.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonSubTypes
 import com.fasterxml.jackson.annotation.JsonTypeInfo
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/TestCasesFromSlack.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/TestCasesFromSlack.kt
similarity index 97%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/TestCasesFromSlack.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/TestCasesFromSlack.kt
index 0b46c6b3..7fe4c495 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/TestCasesFromSlack.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/TestCasesFromSlack.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonProperty
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/GitHub337.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/GitHub337.kt
similarity index 97%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/GitHub337.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/GitHub337.kt
index da00c3ff..17ec19a9 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/GitHub337.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/GitHub337.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github.failing
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github.failing
 
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.annotation.JsonProperty
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/GitHub451.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/GitHub451.kt
similarity index 93%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/GitHub451.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/GitHub451.kt
index 6fb2b5f3..9879d5b3 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/GitHub451.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/GitHub451.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github.failing
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github.failing
 
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/GitHub478.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/GitHub478.kt
similarity index 89%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/GitHub478.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/GitHub478.kt
index 6d4b2c6b..73c903b0 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/GitHub478.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/GitHub478.kt
@@ -1,10 +1,10 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github.failing
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github.failing
 
 import com.fasterxml.jackson.annotation.JsonInclude.Include.NON_DEFAULT
-import io.github.projectmapk.jackson.module.kogera._ported.test.expectFailure
 import io.github.projectmapk.jackson.module.kogera.jsonMapper
 import io.github.projectmapk.jackson.module.kogera.kotlinModule
 import io.github.projectmapk.jackson.module.kogera.readValue
+import io.github.projectmapk.jackson.module.kogera.zPorted.test.expectFailure
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github138.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github138.kt
similarity index 90%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github138.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github138.kt
index 36b9f216..8c622711 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github138.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github138.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github.failing
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github.failing
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.databind.exc.InvalidDefinitionException
@@ -6,9 +6,9 @@ import com.fasterxml.jackson.dataformat.xml.XmlMapper
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText
-import io.github.projectmapk.jackson.module.kogera._ported.test.expectFailure
 import io.github.projectmapk.jackson.module.kogera.readValue
 import io.github.projectmapk.jackson.module.kogera.registerKotlinModule
+import io.github.projectmapk.jackson.module.kogera.zPorted.test.expectFailure
 import org.junit.jupiter.api.Test
 
 class TestGithub138 {
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github160DisableAnnotations.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github160DisableAnnotations.kt
similarity index 84%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github160DisableAnnotations.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github160DisableAnnotations.kt
index f0863261..550c890b 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github160DisableAnnotations.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github160DisableAnnotations.kt
@@ -1,10 +1,10 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github.failing
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github.failing
 
 import com.fasterxml.jackson.databind.MapperFeature
 import com.fasterxml.jackson.databind.exc.MismatchedInputException
-import io.github.projectmapk.jackson.module.kogera._ported.test.expectFailure
 import io.github.projectmapk.jackson.module.kogera.jacksonMapperBuilder
 import io.github.projectmapk.jackson.module.kogera.readValue
+import io.github.projectmapk.jackson.module.kogera.zPorted.test.expectFailure
 import org.junit.jupiter.api.Test
 
 class TestGithub160 {
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github271AlphaSortProperties.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github271AlphaSortProperties.kt
similarity index 84%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github271AlphaSortProperties.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github271AlphaSortProperties.kt
index a1c53fde..930e0849 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github271AlphaSortProperties.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github271AlphaSortProperties.kt
@@ -1,8 +1,8 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github.failing
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github.failing
 
 import com.fasterxml.jackson.annotation.JsonPropertyOrder
-import io.github.projectmapk.jackson.module.kogera._ported.test.expectFailure
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
+import io.github.projectmapk.jackson.module.kogera.zPorted.test.expectFailure
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github340.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github340.kt
similarity index 92%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github340.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github340.kt
index 6119d681..b60c0dd7 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github340.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github340.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github.failing
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github.failing
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import io.github.projectmapk.jackson.module.kogera.kotlinModule
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github396.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github396.kt
similarity index 92%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github396.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github396.kt
index d0ca1cea..c2c85d69 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github396.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github396.kt
@@ -1,4 +1,4 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github.failing
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github.failing
 
 import com.fasterxml.jackson.dataformat.xml.XmlMapper
 import io.github.projectmapk.jackson.module.kogera.registerKotlinModule
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github474.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github474.kt
similarity index 85%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github474.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github474.kt
index 4adbecdf..a462147c 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github474.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github474.kt
@@ -1,8 +1,8 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github.failing
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github.failing
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import io.github.projectmapk.jackson.module.kogera._ported.test.expectFailure
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
+import io.github.projectmapk.jackson.module.kogera.zPorted.test.expectFailure
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github50.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github50.kt
similarity index 88%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github50.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github50.kt
index 6c56255c..32f491b9 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github50.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github50.kt
@@ -1,10 +1,10 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github.failing
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github.failing
 
 import com.fasterxml.jackson.annotation.JsonUnwrapped
 import com.fasterxml.jackson.databind.exc.InvalidDefinitionException
-import io.github.projectmapk.jackson.module.kogera._ported.test.expectFailure
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import io.github.projectmapk.jackson.module.kogera.readValue
+import io.github.projectmapk.jackson.module.kogera.zPorted.test.expectFailure
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github518.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github518.kt
similarity index 93%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github518.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github518.kt
index c477df0e..d1a80edd 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github518.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github518.kt
@@ -1,11 +1,11 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github.failing
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github.failing
 
 import io.github.projectmapk.jackson.module.kogera.KotlinFeature.SingletonSupport
-import io.github.projectmapk.jackson.module.kogera._ported.test.expectFailure
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import io.github.projectmapk.jackson.module.kogera.jsonMapper
 import io.github.projectmapk.jackson.module.kogera.kotlinModule
 import io.github.projectmapk.jackson.module.kogera.readValue
+import io.github.projectmapk.jackson.module.kogera.zPorted.test.expectFailure
 import org.junit.jupiter.api.Assertions.assertSame
 import org.junit.jupiter.api.Test
 
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github54.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github54.kt
similarity index 90%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github54.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github54.kt
index 45105769..a53ca055 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github54.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github54.kt
@@ -1,11 +1,11 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github.failing
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github.failing
 
 import com.fasterxml.jackson.annotation.JsonIdentityInfo
 import com.fasterxml.jackson.annotation.ObjectIdGenerators
 import com.fasterxml.jackson.databind.deser.UnresolvedForwardReference
-import io.github.projectmapk.jackson.module.kogera._ported.test.expectFailure
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import io.github.projectmapk.jackson.module.kogera.readValue
+import io.github.projectmapk.jackson.module.kogera.zPorted.test.expectFailure
 import org.junit.jupiter.api.Test
 
 class TestGithub54 {
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github71.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github71.kt
similarity index 86%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github71.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github71.kt
index 939ecfc6..ab6b3f39 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/Github71.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/Github71.kt
@@ -1,8 +1,8 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github.failing
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github.failing
 
-import io.github.projectmapk.jackson.module.kogera._ported.test.expectFailure
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import io.github.projectmapk.jackson.module.kogera.readValue
+import io.github.projectmapk.jackson.module.kogera.zPorted.test.expectFailure
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/GithubDatabind1329.kt b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/GithubDatabind1329.kt
similarity index 94%
rename from src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/GithubDatabind1329.kt
rename to src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/GithubDatabind1329.kt
index 802a4312..f4486346 100644
--- a/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/_ported/test/github/failing/GithubDatabind1329.kt
+++ b/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/github/failing/GithubDatabind1329.kt
@@ -1,11 +1,11 @@
-package io.github.projectmapk.jackson.module.kogera._ported.test.github.failing
+package io.github.projectmapk.jackson.module.kogera.zPorted.test.github.failing
 
 import com.fasterxml.jackson.annotation.JsonSubTypes
 import com.fasterxml.jackson.annotation.JsonTypeInfo
 import com.fasterxml.jackson.annotation.JsonTypeName
-import io.github.projectmapk.jackson.module.kogera._ported.test.expectFailure
 import io.github.projectmapk.jackson.module.kogera.jacksonObjectMapper
 import io.github.projectmapk.jackson.module.kogera.readValue
+import io.github.projectmapk.jackson.module.kogera.zPorted.test.expectFailure
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertNull
 import org.junit.jupiter.api.Test