diff --git a/native/commonizer-api/src/org/jetbrains/kotlin/descriptors/commonizer/CliCommonizer.kt b/native/commonizer-api/src/org/jetbrains/kotlin/commonizer/CliCommonizer.kt
similarity index 100%
rename from native/commonizer-api/src/org/jetbrains/kotlin/descriptors/commonizer/CliCommonizer.kt
rename to native/commonizer-api/src/org/jetbrains/kotlin/commonizer/CliCommonizer.kt
diff --git a/native/commonizer-api/src/org/jetbrains/kotlin/descriptors/commonizer/Commonizer.kt b/native/commonizer-api/src/org/jetbrains/kotlin/commonizer/Commonizer.kt
similarity index 100%
rename from native/commonizer-api/src/org/jetbrains/kotlin/descriptors/commonizer/Commonizer.kt
rename to native/commonizer-api/src/org/jetbrains/kotlin/commonizer/Commonizer.kt
diff --git a/native/commonizer-api/src/org/jetbrains/kotlin/descriptors/commonizer/CommonizerTarget.kt b/native/commonizer-api/src/org/jetbrains/kotlin/commonizer/CommonizerTarget.kt
similarity index 100%
rename from native/commonizer-api/src/org/jetbrains/kotlin/descriptors/commonizer/CommonizerTarget.kt
rename to native/commonizer-api/src/org/jetbrains/kotlin/commonizer/CommonizerTarget.kt
diff --git a/native/commonizer-api/src/org/jetbrains/kotlin/descriptors/commonizer/TargetLibrariesLayout.kt b/native/commonizer-api/src/org/jetbrains/kotlin/commonizer/TargetLibrariesLayout.kt
similarity index 100%
rename from native/commonizer-api/src/org/jetbrains/kotlin/descriptors/commonizer/TargetLibrariesLayout.kt
rename to native/commonizer-api/src/org/jetbrains/kotlin/commonizer/TargetLibrariesLayout.kt
diff --git a/native/commonizer-api/src/org/jetbrains/kotlin/descriptors/commonizer/parseCommonizerTarget.kt b/native/commonizer-api/src/org/jetbrains/kotlin/commonizer/parseCommonizerTarget.kt
similarity index 100%
rename from native/commonizer-api/src/org/jetbrains/kotlin/descriptors/commonizer/parseCommonizerTarget.kt
rename to native/commonizer-api/src/org/jetbrains/kotlin/commonizer/parseCommonizerTarget.kt
diff --git a/native/commonizer-api/test/org/jetbrains/kotlin/descriptors/commonizer/CliCommonizerTest.kt b/native/commonizer-api/test/org/jetbrains/kotlin/commonizer/CliCommonizerTest.kt
similarity index 100%
rename from native/commonizer-api/test/org/jetbrains/kotlin/descriptors/commonizer/CliCommonizerTest.kt
rename to native/commonizer-api/test/org/jetbrains/kotlin/commonizer/CliCommonizerTest.kt
diff --git a/native/commonizer-api/test/org/jetbrains/kotlin/descriptors/commonizer/CommonizeLibcurlTest.kt b/native/commonizer-api/test/org/jetbrains/kotlin/commonizer/CommonizeLibcurlTest.kt
similarity index 100%
rename from native/commonizer-api/test/org/jetbrains/kotlin/descriptors/commonizer/CommonizeLibcurlTest.kt
rename to native/commonizer-api/test/org/jetbrains/kotlin/commonizer/CommonizeLibcurlTest.kt
diff --git a/native/commonizer-api/test/org/jetbrains/kotlin/descriptors/commonizer/CommonizerTargetIdentityStringTest.kt b/native/commonizer-api/test/org/jetbrains/kotlin/commonizer/CommonizerTargetIdentityStringTest.kt
similarity index 100%
rename from native/commonizer-api/test/org/jetbrains/kotlin/descriptors/commonizer/CommonizerTargetIdentityStringTest.kt
rename to native/commonizer-api/test/org/jetbrains/kotlin/commonizer/CommonizerTargetIdentityStringTest.kt
diff --git a/native/commonizer-api/test/org/jetbrains/kotlin/descriptors/commonizer/CommonizerTargetPrettyNameTest.kt b/native/commonizer-api/test/org/jetbrains/kotlin/commonizer/CommonizerTargetPrettyNameTest.kt
similarity index 100%
rename from native/commonizer-api/test/org/jetbrains/kotlin/descriptors/commonizer/CommonizerTargetPrettyNameTest.kt
rename to native/commonizer-api/test/org/jetbrains/kotlin/commonizer/CommonizerTargetPrettyNameTest.kt
diff --git a/native/commonizer-api/test/org/jetbrains/kotlin/descriptors/commonizer/utils/konanHome.kt b/native/commonizer-api/test/org/jetbrains/kotlin/commonizer/utils/konanHome.kt
similarity index 100%
rename from native/commonizer-api/test/org/jetbrains/kotlin/descriptors/commonizer/utils/konanHome.kt
rename to native/commonizer-api/test/org/jetbrains/kotlin/commonizer/utils/konanHome.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/CommonizerParameters.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/CommonizerParameters.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/CommonizerParameters.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/CommonizerParameters.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/KonanDistribution.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/KonanDistribution.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/KonanDistribution.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/KonanDistribution.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/NativeLibraryLoader.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/NativeLibraryLoader.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/NativeLibraryLoader.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/NativeLibraryLoader.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ResultsConsumer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/ResultsConsumer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/ResultsConsumer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/ResultsConsumer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/TargetProvider.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/TargetProvider.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/TargetProvider.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/TargetProvider.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirAnnotation.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirAnnotation.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirAnnotation.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirAnnotation.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirClass.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirClass.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirClass.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirClass.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirClassConstructor.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirClassConstructor.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirClassConstructor.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirClassConstructor.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirClassifier.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirClassifier.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirClassifier.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirClassifier.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirConstantValue.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirConstantValue.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirConstantValue.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirConstantValue.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirDeclaration.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirDeclaration.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirDeclaration.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirDeclaration.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirExtensionReceiver.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirExtensionReceiver.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirExtensionReceiver.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirExtensionReceiver.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirFunction.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirFunction.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirFunction.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirFunction.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirFunctionModifiers.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirFunctionModifiers.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirFunctionModifiers.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirFunctionModifiers.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirFunctionOrProperty.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirFunctionOrProperty.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirFunctionOrProperty.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirFunctionOrProperty.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirModule.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirModule.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirModule.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirModule.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirName.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirName.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirName.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirName.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirPackage.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirPackage.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirPackage.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirPackage.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirProperty.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirProperty.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirProperty.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirProperty.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirPropertyAccessor.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirPropertyAccessor.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirPropertyAccessor.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirPropertyAccessor.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirPropertyGetter.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirPropertyGetter.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirPropertyGetter.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirPropertyGetter.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirPropertySetter.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirPropertySetter.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirPropertySetter.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirPropertySetter.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirRoot.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirRoot.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirRoot.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirRoot.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirStandardTypes.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirStandardTypes.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirStandardTypes.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirStandardTypes.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirType.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirType.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirType.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirType.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirTypeAlias.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirTypeAlias.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirTypeAlias.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirTypeAlias.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirTypeParameter.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirTypeParameter.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirTypeParameter.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirTypeParameter.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirValueParameter.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirValueParameter.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirValueParameter.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirValueParameter.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/RecursionMarkers.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/RecursionMarkers.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/RecursionMarkers.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/RecursionMarkers.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/utils.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/utils.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/utils.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/utils.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/BooleanOptionType.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/BooleanOptionType.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/BooleanOptionType.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/BooleanOptionType.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/CliLoggerAdapter.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/CliLoggerAdapter.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/CliLoggerAdapter.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/CliLoggerAdapter.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/DependencyLibrariesOptionType.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/DependencyLibrariesOptionType.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/DependencyLibrariesOptionType.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/DependencyLibrariesOptionType.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/InputLibrariesOptionType.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/InputLibrariesOptionType.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/InputLibrariesOptionType.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/InputLibrariesOptionType.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/LibrariesSetOptionType.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/LibrariesSetOptionType.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/LibrariesSetOptionType.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/LibrariesSetOptionType.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/NativeDistributionOptionType.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/NativeDistributionOptionType.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/NativeDistributionOptionType.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/NativeDistributionOptionType.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/NativeTargetsOptionType.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/NativeTargetsOptionType.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/NativeTargetsOptionType.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/NativeTargetsOptionType.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/Option.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/Option.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/Option.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/Option.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/OptionType.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/OptionType.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/OptionType.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/OptionType.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/OutputCommonizerTargetOptionType.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/OutputCommonizerTargetOptionType.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/OutputCommonizerTargetOptionType.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/OutputCommonizerTargetOptionType.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/OutputOptionType.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/OutputOptionType.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/OutputOptionType.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/OutputOptionType.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/StatsTypeOptionType.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/StatsTypeOptionType.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/StatsTypeOptionType.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/StatsTypeOptionType.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/Task.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/Task.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/Task.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/Task.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/TaskType.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/TaskType.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/TaskType.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/TaskType.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/cli.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/cli.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/cli.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/cli.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/nativeTasks.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/nativeTasks.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/nativeTasks.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/cli/nativeTasks.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractFunctionOrPropertyCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/AbstractFunctionOrPropertyCommonizer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractFunctionOrPropertyCommonizer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/AbstractFunctionOrPropertyCommonizer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractListCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/AbstractListCommonizer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractListCommonizer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/AbstractListCommonizer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractNullableCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/AbstractNullableCommonizer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractNullableCommonizer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/AbstractNullableCommonizer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AnnotationsCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/AnnotationsCommonizer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AnnotationsCommonizer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/AnnotationsCommonizer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/CallableValueParametersCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/CallableValueParametersCommonizer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/CallableValueParametersCommonizer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/CallableValueParametersCommonizer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ClassCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/ClassCommonizer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ClassCommonizer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/ClassCommonizer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ClassConstructorCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/ClassConstructorCommonizer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ClassConstructorCommonizer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/ClassConstructorCommonizer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/CommonizationVisitor.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/CommonizationVisitor.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/CommonizationVisitor.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/CommonizationVisitor.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/Commonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/Commonizer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/Commonizer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/Commonizer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ExtensionReceiverCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/ExtensionReceiverCommonizer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ExtensionReceiverCommonizer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/ExtensionReceiverCommonizer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/FunctionCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/FunctionCommonizer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/FunctionCommonizer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/FunctionCommonizer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/FunctionModifiersCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/FunctionModifiersCommonizer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/FunctionModifiersCommonizer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/FunctionModifiersCommonizer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ModalityCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/ModalityCommonizer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ModalityCommonizer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/ModalityCommonizer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ModuleCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/ModuleCommonizer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ModuleCommonizer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/ModuleCommonizer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PackageCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/PackageCommonizer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PackageCommonizer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/PackageCommonizer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertyCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/PropertyCommonizer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertyCommonizer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/PropertyCommonizer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertySetterCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/PropertySetterCommonizer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertySetterCommonizer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/PropertySetterCommonizer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/RootCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/RootCommonizer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/RootCommonizer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/RootCommonizer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeAliasCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/TypeAliasCommonizer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeAliasCommonizer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/TypeAliasCommonizer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeArgumentCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/TypeArgumentCommonizer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeArgumentCommonizer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/TypeArgumentCommonizer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeArgumentListCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/TypeArgumentListCommonizer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeArgumentListCommonizer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/TypeArgumentListCommonizer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/TypeCommonizer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/TypeCommonizer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeParameterCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/TypeParameterCommonizer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeParameterCommonizer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/TypeParameterCommonizer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeParameterListCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/TypeParameterListCommonizer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeParameterListCommonizer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/TypeParameterListCommonizer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/ValueParameterCommonizer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterCommonizer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/ValueParameterCommonizer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterListCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/ValueParameterListCommonizer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterListCommonizer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/ValueParameterListCommonizer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/VisibilityCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/VisibilityCommonizer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/VisibilityCommonizer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/VisibilityCommonizer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/typeAliasUtils.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/typeAliasUtils.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/typeAliasUtils.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/core/typeAliasUtils.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/facade.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/facade.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/facade.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/facade.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/CopyLibrariesFromKonanDistributionResultsConsumer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/konan/CopyLibrariesFromKonanDistributionResultsConsumer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/CopyLibrariesFromKonanDistributionResultsConsumer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/konan/CopyLibrariesFromKonanDistributionResultsConsumer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/CopyUnconsumedModulesAsIsConsumer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/konan/CopyUnconsumedModulesAsIsConsumer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/CopyUnconsumedModulesAsIsConsumer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/konan/CopyUnconsumedModulesAsIsConsumer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/DefaultModulesProvider.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/konan/DefaultModulesProvider.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/DefaultModulesProvider.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/konan/DefaultModulesProvider.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/LibraryCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/konan/LibraryCommonizer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/LibraryCommonizer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/konan/LibraryCommonizer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/LoggingResultsConsumer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/konan/LoggingResultsConsumer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/LoggingResultsConsumer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/konan/LoggingResultsConsumer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/ModuleSerializer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/konan/ModuleSerializer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/ModuleSerializer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/konan/ModuleSerializer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeLibrary.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/konan/NativeLibrary.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeLibrary.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/konan/NativeLibrary.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeSensitiveManifestData.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/konan/NativeSensitiveManifestData.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeSensitiveManifestData.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/konan/NativeSensitiveManifestData.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirClassConstructorNode.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirClassConstructorNode.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirClassConstructorNode.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirClassConstructorNode.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirClassNode.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirClassNode.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirClassNode.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirClassNode.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirFictitiousFunctionClassifiers.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirFictitiousFunctionClassifiers.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirFictitiousFunctionClassifiers.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirFictitiousFunctionClassifiers.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirFunctionNode.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirFunctionNode.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirFunctionNode.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirFunctionNode.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirKnownClassifiers.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirKnownClassifiers.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirKnownClassifiers.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirKnownClassifiers.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirModuleNode.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirModuleNode.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirModuleNode.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirModuleNode.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirNode.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirNode.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirNode.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirNode.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirNodeVisitor.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirNodeVisitor.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirNodeVisitor.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirNodeVisitor.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirPackageNode.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirPackageNode.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirPackageNode.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirPackageNode.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirPropertyNode.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirPropertyNode.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirPropertyNode.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirPropertyNode.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirProvidedClassifiers.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirProvidedClassifiers.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirProvidedClassifiers.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirProvidedClassifiers.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirProvidedClassifiersByModules.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirProvidedClassifiersByModules.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirProvidedClassifiersByModules.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirProvidedClassifiersByModules.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirRootNode.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirRootNode.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirRootNode.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirRootNode.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirTreeMerger.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirTreeMerger.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTypeAliasNode.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirTypeAliasNode.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTypeAliasNode.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirTypeAliasNode.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/approximationKeys.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/approximationKeys.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/approximationKeys.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/approximationKeys.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/nodeBuilders.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/nodeBuilders.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/nodeBuilders.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/nodeBuilders.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/metadata/CirDeserializers.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirDeserializers.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/metadata/CirDeserializers.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirDeserializers.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/metadata/CirSerializers.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirSerializers.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/metadata/CirSerializers.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirSerializers.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/metadata/CirTreeSerializer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirTreeSerializer.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/metadata/CirTreeSerializer.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirTreeSerializer.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/metadata/CirTypeAliasExpander.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirTypeAliasExpander.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/metadata/CirTypeAliasExpander.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirTypeAliasExpander.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/metadata/CirTypeParameterResolver.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirTypeParameterResolver.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/metadata/CirTypeParameterResolver.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirTypeParameterResolver.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/metadata/CirTypeResolver.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirTypeResolver.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/metadata/CirTypeResolver.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirTypeResolver.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/metadata/flags.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/flags.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/metadata/flags.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/flags.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/metadata/utils/KotlinMetadataLibraryProvider.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/utils/KotlinMetadataLibraryProvider.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/metadata/utils/KotlinMetadataLibraryProvider.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/utils/KotlinMetadataLibraryProvider.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/metadata/utils/MetadataDeclarationsComparator.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/utils/MetadataDeclarationsComparator.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/metadata/utils/MetadataDeclarationsComparator.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/utils/MetadataDeclarationsComparator.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/metadata/utils/SerializedMetadataLibraryProvider.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/utils/SerializedMetadataLibraryProvider.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/metadata/utils/SerializedMetadataLibraryProvider.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/utils/SerializedMetadataLibraryProvider.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/repository/FilesRepository.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/repository/FilesRepository.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/repository/FilesRepository.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/repository/FilesRepository.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/repository/KonanDistributionRepository.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/repository/KonanDistributionRepository.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/repository/KonanDistributionRepository.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/repository/KonanDistributionRepository.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/repository/Repository.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/repository/Repository.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/repository/Repository.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/repository/Repository.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/stats/AggregatedStatsCollector.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/stats/AggregatedStatsCollector.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/stats/AggregatedStatsCollector.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/stats/AggregatedStatsCollector.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/stats/DeclarationType.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/stats/DeclarationType.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/stats/DeclarationType.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/stats/DeclarationType.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/stats/RawStatsCollector.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/stats/RawStatsCollector.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/stats/RawStatsCollector.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/stats/RawStatsCollector.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/stats/StatsCollector.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/stats/StatsCollector.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/stats/StatsCollector.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/stats/StatsCollector.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/stats/StatsOutput.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/stats/StatsOutput.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/stats/StatsOutput.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/stats/StatsOutput.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/CommonizerMemoryTracker.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/utils/CommonizerMemoryTracker.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/CommonizerMemoryTracker.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/utils/CommonizerMemoryTracker.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/Interner.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/utils/Interner.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/Interner.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/utils/Interner.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/ProgressLogger.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/utils/ProgressLogger.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/ProgressLogger.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/utils/ProgressLogger.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/ResettableClockMark.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/utils/ResettableClockMark.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/ResettableClockMark.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/utils/ResettableClockMark.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/commonizedGroup.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/utils/commonizedGroup.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/commonizedGroup.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/utils/commonizedGroup.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/excludes.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/utils/excludes.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/excludes.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/utils/excludes.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/misc.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/utils/misc.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/misc.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/utils/misc.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/names.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/utils/names.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/names.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/utils/names.kt
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/type.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/utils/type.kt
similarity index 100%
rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/type.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/utils/type.kt
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/AbstractCommonizationFromSourcesTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/AbstractCommonizationFromSourcesTest.kt
similarity index 100%
rename from native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/AbstractCommonizationFromSourcesTest.kt
rename to native/commonizer/tests/org/jetbrains/kotlin/commonizer/AbstractCommonizationFromSourcesTest.kt
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/CallableMemberCommonizationFromSourcesTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/CallableMemberCommonizationFromSourcesTest.kt
similarity index 100%
rename from native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/CallableMemberCommonizationFromSourcesTest.kt
rename to native/commonizer/tests/org/jetbrains/kotlin/commonizer/CallableMemberCommonizationFromSourcesTest.kt
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/ClassifierCommonizationFromSourcesTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/ClassifierCommonizationFromSourcesTest.kt
similarity index 100%
rename from native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/ClassifierCommonizationFromSourcesTest.kt
rename to native/commonizer/tests/org/jetbrains/kotlin/commonizer/ClassifierCommonizationFromSourcesTest.kt
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/CommonizerFacadeTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/CommonizerFacadeTest.kt
similarity index 100%
rename from native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/CommonizerFacadeTest.kt
rename to native/commonizer/tests/org/jetbrains/kotlin/commonizer/CommonizerFacadeTest.kt
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/FunctionCommonizationFromSourcesTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/FunctionCommonizationFromSourcesTest.kt
similarity index 100%
rename from native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/FunctionCommonizationFromSourcesTest.kt
rename to native/commonizer/tests/org/jetbrains/kotlin/commonizer/FunctionCommonizationFromSourcesTest.kt
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/GeneralCommonizationFromSourcesTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/GeneralCommonizationFromSourcesTest.kt
similarity index 100%
rename from native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/GeneralCommonizationFromSourcesTest.kt
rename to native/commonizer/tests/org/jetbrains/kotlin/commonizer/GeneralCommonizationFromSourcesTest.kt
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/PropertyCommonizationFromSourcesTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/PropertyCommonizationFromSourcesTest.kt
similarity index 100%
rename from native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/PropertyCommonizationFromSourcesTest.kt
rename to native/commonizer/tests/org/jetbrains/kotlin/commonizer/PropertyCommonizationFromSourcesTest.kt
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/AbstractCommonizerTest.kt
similarity index 100%
rename from native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractCommonizerTest.kt
rename to native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/AbstractCommonizerTest.kt
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/AnnotationsCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/AnnotationsCommonizerTest.kt
similarity index 100%
rename from native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/AnnotationsCommonizerTest.kt
rename to native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/AnnotationsCommonizerTest.kt
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/CirEntityIdTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/CirEntityIdTest.kt
similarity index 100%
rename from native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/CirEntityIdTest.kt
rename to native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/CirEntityIdTest.kt
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/CirNameTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/CirNameTest.kt
similarity index 100%
rename from native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/CirNameTest.kt
rename to native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/CirNameTest.kt
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/CirPackageNameTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/CirPackageNameTest.kt
similarity index 100%
rename from native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/CirPackageNameTest.kt
rename to native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/CirPackageNameTest.kt
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/EqualizingVisibilityCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/EqualizingVisibilityCommonizerTest.kt
similarity index 100%
rename from native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/EqualizingVisibilityCommonizerTest.kt
rename to native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/EqualizingVisibilityCommonizerTest.kt
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/ExtensionReceiverCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/ExtensionReceiverCommonizerTest.kt
similarity index 100%
rename from native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/ExtensionReceiverCommonizerTest.kt
rename to native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/ExtensionReceiverCommonizerTest.kt
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/FunctionModifiersCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/FunctionModifiersCommonizerTest.kt
similarity index 100%
rename from native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/FunctionModifiersCommonizerTest.kt
rename to native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/FunctionModifiersCommonizerTest.kt
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/LoweringVisibilityCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/LoweringVisibilityCommonizerTest.kt
similarity index 100%
rename from native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/LoweringVisibilityCommonizerTest.kt
rename to native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/LoweringVisibilityCommonizerTest.kt
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/ModalityCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/ModalityCommonizerTest.kt
similarity index 100%
rename from native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/ModalityCommonizerTest.kt
rename to native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/ModalityCommonizerTest.kt
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/PropertySetterCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/PropertySetterCommonizerTest.kt
similarity index 100%
rename from native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/PropertySetterCommonizerTest.kt
rename to native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/PropertySetterCommonizerTest.kt
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/RootCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/RootCommonizerTest.kt
similarity index 100%
rename from native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/RootCommonizerTest.kt
rename to native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/RootCommonizerTest.kt
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/TypeCommonizerTest.kt
similarity index 100%
rename from native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizerTest.kt
rename to native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/TypeCommonizerTest.kt
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/TypeParameterCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/TypeParameterCommonizerTest.kt
similarity index 100%
rename from native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/TypeParameterCommonizerTest.kt
rename to native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/TypeParameterCommonizerTest.kt
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/TypeParameterListCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/TypeParameterListCommonizerTest.kt
similarity index 100%
rename from native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/TypeParameterListCommonizerTest.kt
rename to native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/TypeParameterListCommonizerTest.kt
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/ValueParameterCommonizerTest.kt
similarity index 100%
rename from native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterCommonizerTest.kt
rename to native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/ValueParameterCommonizerTest.kt
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterListCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/ValueParameterListCommonizerTest.kt
similarity index 100%
rename from native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterListCommonizerTest.kt
rename to native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/ValueParameterListCommonizerTest.kt
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/assertions.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/utils/assertions.kt
similarity index 100%
rename from native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/assertions.kt
rename to native/commonizer/tests/org/jetbrains/kotlin/commonizer/utils/assertions.kt
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/mocks.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/utils/mocks.kt
similarity index 100%
rename from native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/mocks.kt
rename to native/commonizer/tests/org/jetbrains/kotlin/commonizer/utils/mocks.kt