diff --git a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/BodyResolveMode.kt b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/BodyResolveMode.kt
deleted file mode 100644
index 365e4749911..00000000000
--- a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/BodyResolveMode.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2010-2019 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.resolve.lazy
-
-import org.jetbrains.kotlin.resolve.BindingTraceFilter
-
-enum class BodyResolveMode(val bindingTraceFilter: BindingTraceFilter, val doControlFlowAnalysis: Boolean, val resolveAdditionals: Boolean = true) {
-    // All body statements are analyzed, diagnostics included
-    FULL(BindingTraceFilter.ACCEPT_ALL, doControlFlowAnalysis = true),
-
-    // Analyzes only dependent statements, including all declaration statements (difference from PARTIAL_WITH_CFA)
-    PARTIAL_FOR_COMPLETION(BindingTraceFilter.NO_DIAGNOSTICS, doControlFlowAnalysis = true),
-
-    // Analyzes only dependent statements, diagnostics included
-    PARTIAL_WITH_DIAGNOSTICS(BindingTraceFilter.ACCEPT_ALL, doControlFlowAnalysis = true),
-
-    // Analyzes only dependent statements, performs control flow analysis (mostly needed for isUsedAsExpression / AsStatement)
-    PARTIAL_WITH_CFA(BindingTraceFilter.NO_DIAGNOSTICS, doControlFlowAnalysis = true),
-
-    // Analyzes only dependent statements, including only used declaration statements, does not perform control flow analysis
-    PARTIAL(BindingTraceFilter.NO_DIAGNOSTICS, doControlFlowAnalysis = false),
-
-    // Resolve mode to resolve only the element itself without the additional elements (annotation resolve would not lead to function resolve or default parameters)
-    PARTIAL_NO_ADDITIONAL(BindingTraceFilter.NO_DIAGNOSTICS, doControlFlowAnalysis = false, resolveAdditionals = false)
-    ;
-
-    fun doesNotLessThan(other: BodyResolveMode): Boolean {
-        return this <= other && this.bindingTraceFilter.includesEverythingIn(other.bindingTraceFilter)
-    }
-}
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/codeInsight/ReferenceVariantsHelper.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/codeInsight/ReferenceVariantsHelper.kt
similarity index 100%
rename from idea/ide-common/src/org/jetbrains/kotlin/idea/codeInsight/ReferenceVariantsHelper.kt
rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/codeInsight/ReferenceVariantsHelper.kt
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/resolve/ResolutionFacade.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/resolve/ResolutionFacade.kt
similarity index 100%
rename from idea/ide-common/src/org/jetbrains/kotlin/idea/resolve/ResolutionFacade.kt
rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/resolve/ResolutionFacade.kt
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/resolve/frontendServiceHelpers.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/resolve/frontendServiceHelpers.kt
similarity index 100%
rename from idea/ide-common/src/org/jetbrains/kotlin/idea/resolve/frontendServiceHelpers.kt
rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/resolve/frontendServiceHelpers.kt
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/CallType.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/CallType.kt
similarity index 100%
rename from idea/ide-common/src/org/jetbrains/kotlin/idea/util/CallType.kt
rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/CallType.kt
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/FuzzyType.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/FuzzyType.kt
similarity index 100%
rename from idea/ide-common/src/org/jetbrains/kotlin/idea/util/FuzzyType.kt
rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/FuzzyType.kt
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/ImportsUtils.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/ImportsUtils.kt
similarity index 100%
rename from idea/ide-common/src/org/jetbrains/kotlin/idea/util/ImportsUtils.kt
rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/ImportsUtils.kt
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/NotPropertyList.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/NotPropertyList.kt
similarity index 100%
rename from idea/ide-common/src/org/jetbrains/kotlin/idea/util/NotPropertyList.kt
rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/NotPropertyList.kt
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/ShadowedDeclarationsFilter.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/ShadowedDeclarationsFilter.kt
similarity index 100%
rename from idea/ide-common/src/org/jetbrains/kotlin/idea/util/ShadowedDeclarationsFilter.kt
rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/ShadowedDeclarationsFilter.kt
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/TypeUtils.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/TypeUtils.kt
similarity index 100%
rename from idea/ide-common/src/org/jetbrains/kotlin/idea/util/TypeUtils.kt
rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/TypeUtils.kt
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/Utils.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/Utils.kt
similarity index 100%
rename from idea/ide-common/src/org/jetbrains/kotlin/idea/util/Utils.kt
rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/Utils.kt
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/extensionsUtils.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/extensionsUtils.kt
similarity index 100%
rename from idea/ide-common/src/org/jetbrains/kotlin/idea/util/extensionsUtils.kt
rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/extensionsUtils.kt
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/implicitReceiversUtils.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/implicitReceiversUtils.kt
similarity index 100%
rename from idea/ide-common/src/org/jetbrains/kotlin/idea/util/implicitReceiversUtils.kt
rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/implicitReceiversUtils.kt
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/scopeUtils.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/scopeUtils.kt
similarity index 100%
rename from idea/ide-common/src/org/jetbrains/kotlin/idea/util/scopeUtils.kt
rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/idea/util/scopeUtils.kt
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/resolve/scopes/ExplicitImportsScope.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/resolve/scopes/ExplicitImportsScope.kt
similarity index 100%
rename from idea/ide-common/src/org/jetbrains/kotlin/resolve/scopes/ExplicitImportsScope.kt
rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/resolve/scopes/ExplicitImportsScope.kt
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/util/descriptorUtils.kt b/plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/util/descriptorUtils.kt
similarity index 100%
rename from idea/ide-common/src/org/jetbrains/kotlin/util/descriptorUtils.kt
rename to plugins/scripting/scripting-ide-common/src/org/jetbrains/kotlin/util/descriptorUtils.kt