diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeFactory.kt
index ddc4a1b7d51..772b5cfee7d 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeFactory.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeFactory.kt
@@ -5,12 +5,9 @@
 
 package org.jetbrains.kotlin.descriptors.commonizer.cir.factory
 
-import gnu.trove.TIntObjectHashMap
 import kotlinx.metadata.*
 import org.jetbrains.kotlin.descriptors.commonizer.cir.*
 import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.CirProvided
-import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.CirProvidedClassifiers
-import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.TypeParameterResolver
 import org.jetbrains.kotlin.descriptors.commonizer.metadata.CirTypeAliasExpander
 import org.jetbrains.kotlin.descriptors.commonizer.metadata.CirTypeAliasExpansion
 import org.jetbrains.kotlin.descriptors.commonizer.utils.*
@@ -87,68 +84,3 @@ object CirTypeFactory {
         }
     }
 }
-
-typealias TypeParameterId = Int
-typealias TypeParameterIndex = Int
-
-abstract class CirTypeResolver : TypeParameterResolver {
-    abstract val providedClassifiers: CirProvidedClassifiers
-    protected abstract val typeParameterIndexOffset: Int
-
-    inline fun <reified T : CirProvided.Classifier> resolveClassifier(classifierId: CirEntityId): T {
-        val classifier = providedClassifiers.classifier(classifierId)
-            ?: error("Unresolved classifier: $classifierId")
-
-        check(classifier is T) {
-            "Resolved classifier $classifierId of type ${classifier::class.java.simpleName}. Expected: ${T::class.java.simpleName}."
-        }
-
-        return classifier
-    }
-
-    abstract fun resolveTypeParameterIndex(id: TypeParameterId): TypeParameterIndex
-    abstract override fun resolveTypeParameter(id: TypeParameterId): KmTypeParameter
-
-    private class TopLevel(override val providedClassifiers: CirProvidedClassifiers) : CirTypeResolver() {
-        override val typeParameterIndexOffset get() = 0
-
-        override fun resolveTypeParameterIndex(id: TypeParameterId) = error("Unresolved type parameter: id=$id")
-        override fun resolveTypeParameter(id: TypeParameterId) = error("Unresolved type parameter: id=$id")
-    }
-
-    private class Nested(
-        private val parent: CirTypeResolver,
-        private val typeParameterMapping: TIntObjectHashMap<TypeParameterInfo>
-    ) : CirTypeResolver() {
-        override val providedClassifiers get() = parent.providedClassifiers
-        override val typeParameterIndexOffset = typeParameterMapping.size() + parent.typeParameterIndexOffset
-
-        override fun resolveTypeParameterIndex(id: TypeParameterId) =
-            typeParameterMapping[id]?.index ?: parent.resolveTypeParameterIndex(id)
-
-        override fun resolveTypeParameter(id: TypeParameterId) =
-            typeParameterMapping[id]?.typeParameter ?: parent.resolveTypeParameter(id)
-    }
-
-    private class TypeParameterInfo(val index: TypeParameterIndex, val typeParameter: KmTypeParameter)
-
-    fun create(typeParameters: List<KmTypeParameter>): CirTypeResolver =
-        if (typeParameters.isEmpty())
-            this
-        else {
-            val mapping = TIntObjectHashMap<TypeParameterInfo>(typeParameters.size * 2)
-            typeParameters.forEachIndexed { localIndex, typeParameter ->
-                val typeParameterInfo = TypeParameterInfo(
-                    index = localIndex + typeParameterIndexOffset,
-                    typeParameter = typeParameter
-                )
-                mapping.put(typeParameter.id, typeParameterInfo)
-            }
-
-            Nested(this, mapping)
-        }
-
-    companion object {
-        fun create(providedClassifiers: CirProvidedClassifiers): CirTypeResolver = TopLevel(providedClassifiers)
-    }
-}
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeResolver.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeResolver.kt
new file mode 100644
index 00000000000..6efd7b5d78b
--- /dev/null
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeResolver.kt
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.descriptors.commonizer.cir.factory
+
+import gnu.trove.TIntObjectHashMap
+import kotlinx.metadata.KmTypeParameter
+import org.jetbrains.kotlin.descriptors.commonizer.cir.CirEntityId
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.CirProvided
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.CirProvidedClassifiers
+import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.TypeParameterResolver
+
+typealias TypeParameterId = Int
+typealias TypeParameterIndex = Int
+
+abstract class CirTypeResolver : TypeParameterResolver {
+    abstract val providedClassifiers: CirProvidedClassifiers
+    protected abstract val typeParameterIndexOffset: Int
+
+    inline fun <reified T : CirProvided.Classifier> resolveClassifier(classifierId: CirEntityId): T {
+        val classifier = providedClassifiers.classifier(classifierId)
+            ?: error("Unresolved classifier: $classifierId")
+
+        check(classifier is T) {
+            "Resolved classifier $classifierId of type ${classifier::class.java.simpleName}. Expected: ${T::class.java.simpleName}."
+        }
+
+        return classifier
+    }
+
+    abstract fun resolveTypeParameterIndex(id: TypeParameterId): TypeParameterIndex
+    abstract override fun resolveTypeParameter(id: TypeParameterId): KmTypeParameter
+
+    private class TopLevel(override val providedClassifiers: CirProvidedClassifiers) : CirTypeResolver() {
+        override val typeParameterIndexOffset get() = 0
+
+        override fun resolveTypeParameterIndex(id: TypeParameterId) = error("Unresolved type parameter: id=$id")
+        override fun resolveTypeParameter(id: TypeParameterId) = error("Unresolved type parameter: id=$id")
+    }
+
+    private class Nested(
+        private val parent: CirTypeResolver,
+        private val typeParameterMapping: TIntObjectHashMap<TypeParameterInfo>
+    ) : CirTypeResolver() {
+        override val providedClassifiers get() = parent.providedClassifiers
+        override val typeParameterIndexOffset = typeParameterMapping.size() + parent.typeParameterIndexOffset
+
+        override fun resolveTypeParameterIndex(id: TypeParameterId) =
+            typeParameterMapping[id]?.index ?: parent.resolveTypeParameterIndex(id)
+
+        override fun resolveTypeParameter(id: TypeParameterId) =
+            typeParameterMapping[id]?.typeParameter ?: parent.resolveTypeParameter(id)
+    }
+
+    private class TypeParameterInfo(val index: TypeParameterIndex, val typeParameter: KmTypeParameter)
+
+    fun create(typeParameters: List<KmTypeParameter>): CirTypeResolver =
+        if (typeParameters.isEmpty())
+            this
+        else {
+            val mapping = TIntObjectHashMap<TypeParameterInfo>(typeParameters.size * 2)
+            typeParameters.forEachIndexed { localIndex, typeParameter ->
+                val typeParameterInfo = TypeParameterInfo(
+                    index = localIndex + typeParameterIndexOffset,
+                    typeParameter = typeParameter
+                )
+                mapping.put(typeParameter.id, typeParameterInfo)
+            }
+
+            Nested(this, mapping)
+        }
+
+    companion object {
+        fun create(providedClassifiers: CirProvidedClassifiers): CirTypeResolver = TopLevel(providedClassifiers)
+    }
+}