diff --git a/idea/idea-native/src/org/jetbrains/konan/KonanPluginUtil.kt b/idea/idea-native/src/org/jetbrains/konan/KonanPluginUtil.kt
index 29b19016556..0feec7e30a1 100644
--- a/idea/idea-native/src/org/jetbrains/konan/KonanPluginUtil.kt
+++ b/idea/idea-native/src/org/jetbrains/konan/KonanPluginUtil.kt
@@ -21,7 +21,6 @@ import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.idea.KotlinLanguage
 import org.jetbrains.kotlin.idea.caches.project.LibraryInfo
 import org.jetbrains.kotlin.idea.decompiler.textBuilder.LoggingErrorReporter
-import org.jetbrains.kotlin.konan.library.KonanLibrary
 import org.jetbrains.kotlin.konan.library.libraryResolver
 import org.jetbrains.kotlin.konan.utils.KonanFactories.DefaultResolvedDescriptorsFactory
 import org.jetbrains.kotlin.psi.KtFile
@@ -30,7 +29,6 @@ import org.jetbrains.kotlin.resolve.konan.platform.KonanPlatform
 import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactoryService
 import org.jetbrains.kotlin.serialization.konan.KonanResolvedModuleDescriptors
 import org.jetbrains.kotlin.storage.StorageManager
-import java.io.File.separatorChar
 
 const val KONAN_CURRENT_ABI_VERSION = 1
 
@@ -92,6 +90,3 @@ fun ModuleInfo.createResolvedModuleDescriptors(
         // This is to preserve "capabilities" from the original IntelliJ LibraryInfo:
     ) { konanLibrary -> libraryMap[konanLibrary.libraryFile.path]?.capabilities ?: emptyMap() }
 }
-
-private val KonanLibrary.pureName
-    get() = libraryName.substringAfterLast(separatorChar)
diff --git a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt
index 2ce443186b2..3dc8e88d158 100644
--- a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt
+++ b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.PlatformAnalysisSettings
 import org.jetbrains.kotlin.konan.file.File
 import org.jetbrains.kotlin.konan.library.KONAN_STDLIB_NAME
 import org.jetbrains.kotlin.konan.library.createKonanLibrary
-import org.jetbrains.kotlin.konan.utils.KonanFactories.DefaultDeserializedDescriptorFactory
+import org.jetbrains.kotlin.konan.util.KonanFactories.DefaultDeserializedDescriptorFactory
 import org.jetbrains.kotlin.resolve.konan.platform.KonanPlatform
 
 class NativePlatformKindResolution : IdePlatformKindResolution {
diff --git a/konan/serializer/build.gradle.kts b/konan/serializer/build.gradle.kts
index c39c6f20fd0..5ecfc715050 100644
--- a/konan/serializer/build.gradle.kts
+++ b/konan/serializer/build.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
 
 sourceSets {
     "main" { projectDefault() }
-    "test" {}
+    "test" { none() }
 }
 
 standardPublicJars()
diff --git a/konan/utils/src/org/jetbrains/kotlin/konan/file/File.kt b/konan/serializer/src/org/jetbrains/kotlin/konan/file/File.kt
similarity index 98%
rename from konan/utils/src/org/jetbrains/kotlin/konan/file/File.kt
rename to konan/serializer/src/org/jetbrains/kotlin/konan/file/File.kt
index 87d4580b7f7..a887cb97a62 100644
--- a/konan/utils/src/org/jetbrains/kotlin/konan/file/File.kt
+++ b/konan/serializer/src/org/jetbrains/kotlin/konan/file/File.kt
@@ -97,7 +97,7 @@ data class File constructor(internal val javaPath: Path) {
     }
 
     fun deleteOnExit(): File {
-        // Works only on the default file system, 
+        // Works only on the default file system,
         // but that's okay for now.
         javaPath.toFile().deleteOnExit()
         return this // Allow streaming.
@@ -169,7 +169,7 @@ fun Path.recursiveCopyTo(destPath: Path) {
 
         val relative = sourcePath.relativize(oldPath)
         val destFs = destPath.getFileSystem()
-        // We are copying files between file systems, 
+        // We are copying files between file systems,
         // so pass the relative path through the String.
         val newPath = destFs.getPath(destPath.toString(), relative.toString())
 
diff --git a/konan/utils/src/org/jetbrains/kotlin/konan/file/ZipUtil.kt b/konan/serializer/src/org/jetbrains/kotlin/konan/file/ZipUtil.kt
similarity index 100%
rename from konan/utils/src/org/jetbrains/kotlin/konan/file/ZipUtil.kt
rename to konan/serializer/src/org/jetbrains/kotlin/konan/file/ZipUtil.kt
diff --git a/konan/utils/src/org/jetbrains/kotlin/konan/library/KonanLibraryConstants.kt b/konan/serializer/src/org/jetbrains/kotlin/konan/library/KonanLibraryConstants.kt
similarity index 100%
rename from konan/utils/src/org/jetbrains/kotlin/konan/library/KonanLibraryConstants.kt
rename to konan/serializer/src/org/jetbrains/kotlin/konan/library/KonanLibraryConstants.kt
diff --git a/konan/utils/src/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt b/konan/serializer/src/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt
similarity index 100%
rename from konan/utils/src/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt
rename to konan/serializer/src/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt
diff --git a/konan/utils/src/org/jetbrains/kotlin/konan/properties/Properties.kt b/konan/serializer/src/org/jetbrains/kotlin/konan/properties/Properties.kt
similarity index 100%
rename from konan/utils/src/org/jetbrains/kotlin/konan/properties/Properties.kt
rename to konan/serializer/src/org/jetbrains/kotlin/konan/properties/Properties.kt
diff --git a/konan/utils/src/org/jetbrains/kotlin/konan/util/DependencyDownloader.kt b/konan/serializer/src/org/jetbrains/kotlin/konan/util/DependencyDownloader.kt
similarity index 100%
rename from konan/utils/src/org/jetbrains/kotlin/konan/util/DependencyDownloader.kt
rename to konan/serializer/src/org/jetbrains/kotlin/konan/util/DependencyDownloader.kt
diff --git a/konan/utils/src/org/jetbrains/kotlin/konan/util/DependencyExtractor.kt b/konan/serializer/src/org/jetbrains/kotlin/konan/util/DependencyExtractor.kt
similarity index 100%
rename from konan/utils/src/org/jetbrains/kotlin/konan/util/DependencyExtractor.kt
rename to konan/serializer/src/org/jetbrains/kotlin/konan/util/DependencyExtractor.kt
diff --git a/konan/utils/src/org/jetbrains/kotlin/konan/util/DependencyProcessor.kt b/konan/serializer/src/org/jetbrains/kotlin/konan/util/DependencyProcessor.kt
similarity index 100%
rename from konan/utils/src/org/jetbrains/kotlin/konan/util/DependencyProcessor.kt
rename to konan/serializer/src/org/jetbrains/kotlin/konan/util/DependencyProcessor.kt
diff --git a/konan/serializer/src/org/jetbrains/kotlin/konan/utils/KonanFactories.kt b/konan/serializer/src/org/jetbrains/kotlin/konan/util/KonanFactories.kt
similarity index 98%
rename from konan/serializer/src/org/jetbrains/kotlin/konan/utils/KonanFactories.kt
rename to konan/serializer/src/org/jetbrains/kotlin/konan/util/KonanFactories.kt
index 600940c421b..337ee2edc66 100644
--- a/konan/serializer/src/org/jetbrains/kotlin/konan/utils/KonanFactories.kt
+++ b/konan/serializer/src/org/jetbrains/kotlin/konan/util/KonanFactories.kt
@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.konan.utils
+package org.jetbrains.kotlin.konan.util
 
 import org.jetbrains.kotlin.descriptors.konan.KonanModuleDescriptorFactory
 import org.jetbrains.kotlin.descriptors.konan.impl.KonanModuleDescriptorFactoryImpl
diff --git a/konan/utils/src/org/jetbrains/kotlin/konan/util/ProfilingUtils.kt b/konan/serializer/src/org/jetbrains/kotlin/konan/util/ProfilingUtils.kt
similarity index 100%
rename from konan/utils/src/org/jetbrains/kotlin/konan/util/ProfilingUtils.kt
rename to konan/serializer/src/org/jetbrains/kotlin/konan/util/ProfilingUtils.kt
diff --git a/konan/utils/src/org/jetbrains/kotlin/konan/util/Substitution.kt b/konan/serializer/src/org/jetbrains/kotlin/konan/util/Substitution.kt
similarity index 100%
rename from konan/utils/src/org/jetbrains/kotlin/konan/util/Substitution.kt
rename to konan/serializer/src/org/jetbrains/kotlin/konan/util/Substitution.kt
diff --git a/konan/utils/build.gradle.kts b/konan/utils/build.gradle.kts
index 3fb912187fa..213e652782c 100644
--- a/konan/utils/build.gradle.kts
+++ b/konan/utils/build.gradle.kts
@@ -13,7 +13,7 @@ dependencies {
 
 sourceSets {
     "main" { projectDefault() }
-    "test" {}
+    "test" { none() }
 }
 
 standardPublicJars()
diff --git a/konan/utils/src/org/jetbrains/kotlin/konan/KonanVersion.kt b/konan/utils/src/org/jetbrains/kotlin/konan/KonanVersion.kt
index 396adedc56b..15ff531d781 100644
--- a/konan/utils/src/org/jetbrains/kotlin/konan/KonanVersion.kt
+++ b/konan/utils/src/org/jetbrains/kotlin/konan/KonanVersion.kt
@@ -20,11 +20,11 @@ interface KonanVersion : Serializable {
 }
 
 data class KonanVersionImpl(
-        override val meta: MetaVersion = MetaVersion.DEV,
-        override val major: Int,
-        override val minor: Int,
-        override val maintenance: Int,
-        override val build: Int = -1
+    override val meta: MetaVersion = MetaVersion.DEV,
+    override val major: Int,
+    override val minor: Int,
+    override val maintenance: Int,
+    override val build: Int = -1
 ) : KonanVersion {
 
     override fun toString(showMeta: Boolean, showBuild: Boolean) = buildString {