diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
index f12a2e5caa9..54efdaf9a3e 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
@@ -216,5 +216,3 @@ interface ResolverForModuleComputationTracker {
 @Suppress("UNCHECKED_CAST")
 fun <T> ModuleInfo.getCapability(capability: ModuleCapability<T>) = capabilities[capability] as? T
 
-val ModuleDescriptor.moduleInfo: ModuleInfo?
-    get() = getCapability(ModuleInfo.Capability)
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/ModuleInfoUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/ModuleInfoUtils.kt
new file mode 100644
index 00000000000..955af9039b2
--- /dev/null
+++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/ModuleInfoUtils.kt
@@ -0,0 +1,11 @@
+/*
+ * Copyright 2010-2020 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.analyzer
+
+import org.jetbrains.kotlin.descriptors.ModuleDescriptor
+
+val ModuleDescriptor.moduleInfo: ModuleInfo?
+    get() = getCapability(ModuleInfo.Capability)
diff --git a/core/descriptors/src/org/jetbrains/kotlin/incremental/components/ExpectActualTracker.kt b/core/descriptors.common/src/org/jetbrains/kotlin/incremental/components/ExpectActualTracker.kt
similarity index 100%
rename from core/descriptors/src/org/jetbrains/kotlin/incremental/components/ExpectActualTracker.kt
rename to core/descriptors.common/src/org/jetbrains/kotlin/incremental/components/ExpectActualTracker.kt
diff --git a/core/descriptors/src/org/jetbrains/kotlin/incremental/components/LookupLocation.kt b/core/descriptors.common/src/org/jetbrains/kotlin/incremental/components/LookupLocation.kt
similarity index 100%
rename from core/descriptors/src/org/jetbrains/kotlin/incremental/components/LookupLocation.kt
rename to core/descriptors.common/src/org/jetbrains/kotlin/incremental/components/LookupLocation.kt
diff --git a/core/descriptors/src/org/jetbrains/kotlin/incremental/components/LookupTracker.kt b/core/descriptors.common/src/org/jetbrains/kotlin/incremental/components/LookupTracker.kt
similarity index 80%
rename from core/descriptors/src/org/jetbrains/kotlin/incremental/components/LookupTracker.kt
rename to core/descriptors.common/src/org/jetbrains/kotlin/incremental/components/LookupTracker.kt
index 8e137623951..24a3819d0a9 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/incremental/components/LookupTracker.kt
+++ b/core/descriptors.common/src/org/jetbrains/kotlin/incremental/components/LookupTracker.kt
@@ -25,11 +25,11 @@ interface LookupTracker {
     val requiresPosition: Boolean
 
     fun record(
-            filePath: String,
-            position: Position,
-            scopeFqName: String,
-            scopeKind: ScopeKind,
-            name: String
+        filePath: String,
+        position: Position,
+        scopeFqName: String,
+        scopeKind: ScopeKind,
+        name: String
     )
 
     object DO_NOTHING : LookupTracker {
@@ -47,9 +47,9 @@ enum class ScopeKind {
 }
 
 data class LookupInfo(
-        val filePath: String,
-        val position: Position,
-        val scopeFqName: String,
-        val scopeKind: ScopeKind,
-        val name: String
+    val filePath: String,
+    val position: Position,
+    val scopeFqName: String,
+    val scopeKind: ScopeKind,
+    val name: String
 ) : Serializable