diff --git a/idea/idea-native/src/org/jetbrains/konan/analyser/index/KonanMetadataDeserializerForDecompiler.kt b/idea/idea-native/src/org/jetbrains/konan/analyser/index/KonanMetadataDeserializerForDecompiler.kt
index 53d37729286..130e89bc7dd 100644
--- a/idea/idea-native/src/org/jetbrains/konan/analyser/index/KonanMetadataDeserializerForDecompiler.kt
+++ b/idea/idea-native/src/org/jetbrains/konan/analyser/index/KonanMetadataDeserializerForDecompiler.kt
@@ -7,11 +7,11 @@
 package org.jetbrains.konan.analyser.index
 
 import com.intellij.openapi.diagnostic.Logger
-import org.jetbrains.konan.createLoggingErrorReporter
 import org.jetbrains.kotlin.builtins.DefaultBuiltIns
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.descriptors.NotFoundClasses
+import org.jetbrains.kotlin.ide.konan.createLoggingErrorReporter
 import org.jetbrains.kotlin.idea.decompiler.textBuilder.DeserializerForDecompilerBase
 import org.jetbrains.kotlin.idea.decompiler.textBuilder.ResolveEverythingToKotlinAnyLocalClassifierResolver
 import org.jetbrains.kotlin.incremental.components.LookupTracker
diff --git a/idea/idea-native/src/org/jetbrains/konan/analyser/index/KonanMetadataStubBuilder.kt b/idea/idea-native/src/org/jetbrains/konan/analyser/index/KonanMetadataStubBuilder.kt
index 89fcbc67335..948cfd3df9e 100644
--- a/idea/idea-native/src/org/jetbrains/konan/analyser/index/KonanMetadataStubBuilder.kt
+++ b/idea/idea-native/src/org/jetbrains/konan/analyser/index/KonanMetadataStubBuilder.kt
@@ -11,7 +11,7 @@ import com.intellij.psi.compiled.ClsStubBuilder
 import com.intellij.psi.impl.compiled.ClassFileStubBuilder
 import com.intellij.psi.stubs.PsiFileStub
 import com.intellij.util.indexing.FileContent
-import org.jetbrains.konan.createFileStub
+import org.jetbrains.kotlin.ide.konan.createFileStub
 import org.jetbrains.kotlin.idea.decompiler.stubBuilder.createIncompatibleAbiVersionFileStub
 import org.jetbrains.kotlin.idea.decompiler.textBuilder.defaultDecompilerRendererOptions
 import org.jetbrains.kotlin.renderer.DescriptorRenderer
diff --git a/idea/idea-native/src/org/jetbrains/konan/KonanPluginUtil.kt b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativePluginUtil.kt
similarity index 80%
rename from idea/idea-native/src/org/jetbrains/konan/KonanPluginUtil.kt
rename to idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativePluginUtil.kt
index 0feec7e30a1..ee6220da611 100644
--- a/idea/idea-native/src/org/jetbrains/konan/KonanPluginUtil.kt
+++ b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativePluginUtil.kt
@@ -3,30 +3,27 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.konan
+package org.jetbrains.kotlin.ide.konan
 
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiFileFactory
 import com.intellij.psi.SingleRootFileViewProvider
 import com.intellij.psi.impl.PsiFileFactoryImpl
-import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.stubs.PsiFileStub
 import com.intellij.testFramework.LightVirtualFile
+import org.jetbrains.konan.KonanPluginSearchPathResolver
 import org.jetbrains.kotlin.analyzer.ModuleInfo
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.config.LanguageVersionSettings
-import org.jetbrains.kotlin.context.ModuleContext
 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.libraryResolver
-import org.jetbrains.kotlin.konan.utils.KonanFactories.DefaultResolvedDescriptorsFactory
-import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.konan.util.KonanFactories.DefaultResolvedDescriptorsFactory
 import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes
 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
 
@@ -44,20 +41,6 @@ fun createFileStub(project: Project, text: String): PsiFileStub<*> {
 
 fun createLoggingErrorReporter(log: Logger) = LoggingErrorReporter(log)
 
-fun <M : ModuleInfo> createDeclarationProviderFactory(
-    project: Project,
-    moduleContext: ModuleContext,
-    syntheticFiles: Collection<KtFile>,
-    moduleInfo: M,
-    globalSearchScope: GlobalSearchScope?
-) = DeclarationProviderFactoryService.createDeclarationProviderFactory(
-    project,
-    moduleContext.storageManager,
-    syntheticFiles,
-    globalSearchScope!!,
-    moduleInfo
-)
-
 fun ModuleInfo.createResolvedModuleDescriptors(
     project: Project,
     storageManager: StorageManager,
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 39282d1a87f..2512db04b29 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
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.ide.konan
 
 import com.intellij.openapi.roots.libraries.PersistentLibraryKind
 import com.intellij.openapi.vfs.VirtualFile
-import org.jetbrains.konan.KONAN_CURRENT_ABI_VERSION
+import org.jetbrains.konan.analyser.index.KonanMetaFileType
 import org.jetbrains.kotlin.builtins.DefaultBuiltIns
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.caches.resolve.IdePlatformKindResolution
@@ -28,7 +28,8 @@ class NativePlatformKindResolution : IdePlatformKindResolution {
 
     override fun isLibraryFileForPlatform(virtualFile: VirtualFile): Boolean {
         return if (virtualFile.isDirectory) {
-            virtualFile.findChild("linkdata")?.takeIf { it.isDirectory }?.children?.any { it.extension == "knm" } == true
+            virtualFile.findChild("linkdata")?.takeIf { it.isDirectory }
+                ?.children?.any { it.extension == KonanMetaFileType.defaultExtension } == true
         } else {
             virtualFile.extension == KLIB_FILE_EXTENSION
         }
diff --git a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/analyzer/NativeAnalyzerFacade.kt b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/analyzer/NativeAnalyzerFacade.kt
index 51c7cc6fac2..5950356c6ea 100644
--- a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/analyzer/NativeAnalyzerFacade.kt
+++ b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/analyzer/NativeAnalyzerFacade.kt
@@ -5,8 +5,6 @@
 
 package org.jetbrains.kotlin.ide.konan.analyzer
 
-import org.jetbrains.konan.createDeclarationProviderFactory
-import org.jetbrains.konan.createResolvedModuleDescriptors
 import org.jetbrains.kotlin.analyzer.*
 import org.jetbrains.kotlin.config.LanguageVersionSettings
 import org.jetbrains.kotlin.config.TargetPlatformVersion
@@ -15,12 +13,13 @@ import org.jetbrains.kotlin.context.ModuleContext
 import org.jetbrains.kotlin.descriptors.impl.CompositePackageFragmentProvider
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
 import org.jetbrains.kotlin.frontend.di.createContainerForLazyResolve
-import org.jetbrains.kotlin.idea.caches.project.ModuleProductionSourceInfo
+import org.jetbrains.kotlin.ide.konan.createResolvedModuleDescriptors
 import org.jetbrains.kotlin.resolve.BindingTraceContext
 import org.jetbrains.kotlin.resolve.TargetEnvironment
 import org.jetbrains.kotlin.resolve.TargetPlatform
 import org.jetbrains.kotlin.resolve.konan.platform.KonanPlatform
 import org.jetbrains.kotlin.resolve.lazy.ResolveSession
+import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactoryService.Companion.createDeclarationProviderFactory
 
 /**
  * @author Alefas
@@ -42,10 +41,10 @@ object NativeAnalyzerFacade : ResolverForModuleFactory() {
 
         val declarationProviderFactory = createDeclarationProviderFactory(
             moduleContext.project,
-            moduleContext,
+            moduleContext.storageManager,
             moduleContent.syntheticFiles,
-            moduleContent.moduleInfo,
-            moduleContent.moduleContentScope
+            moduleContent.moduleContentScope!!,
+            moduleContent.moduleInfo
         )
 
         val container = createContainerForLazyResolve(