diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts
index 027feed7c67..55db8e81678 100644
--- a/idea/build.gradle.kts
+++ b/idea/build.gradle.kts
@@ -79,6 +79,7 @@ dependencies {
     compile(project(":idea:line-indent-provider"))
     compile(project(":plugins:uast-kotlin"))
     compile(project(":plugins:uast-kotlin-idea"))
+    compile(project(":plugins:uast-kotlin-idea-base"))
     compile(project(":kotlin-script-util")) { isTransitive = false }
     compile(project(":kotlin-scripting-intellij"))
     compile(project(":compiler:backend.jvm")) // Do not delete, for Pill
diff --git a/idea/idea-fir/build.gradle.kts b/idea/idea-fir/build.gradle.kts
index e3b8ba2c1da..dfb3d8465d6 100644
--- a/idea/idea-fir/build.gradle.kts
+++ b/idea/idea-fir/build.gradle.kts
@@ -11,6 +11,9 @@ dependencies {
     compile(intellijCoreDep())
     implementation(project(":idea:idea-fir-fe10-binding"))
 
+    compile(project(":plugins:uast-kotlin-idea-fir"))
+    compile(project(":plugins:uast-kotlin-idea-base"))
+
 // <temp>
     compile(project(":idea:idea-core"))
     compile(project(":idea"))
diff --git a/plugins/uast-kotlin-idea-base/build.gradle.kts b/plugins/uast-kotlin-idea-base/build.gradle.kts
new file mode 100644
index 00000000000..4356413f9a0
--- /dev/null
+++ b/plugins/uast-kotlin-idea-base/build.gradle.kts
@@ -0,0 +1,20 @@
+
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    compile(kotlinStdlib())
+    compile(project(":core:util.runtime"))
+    compile(project(":idea:ide-common"))
+    compile(project(":idea:idea-core"))
+    compileOnly(intellijDep())
+    compileOnly(intellijPluginDep("java"))
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}
+
diff --git a/plugins/uast-kotlin-idea/src/org/jetbrains/uast/kotlin/internal/kotlinUastServiceUtils.kt b/plugins/uast-kotlin-idea-base/src/org/jetbrains/uast/kotlin/internal/kotlinUastServiceUtils.kt
similarity index 97%
rename from plugins/uast-kotlin-idea/src/org/jetbrains/uast/kotlin/internal/kotlinUastServiceUtils.kt
rename to plugins/uast-kotlin-idea-base/src/org/jetbrains/uast/kotlin/internal/kotlinUastServiceUtils.kt
index 2a357467618..d7f15b08d8d 100644
--- a/plugins/uast-kotlin-idea/src/org/jetbrains/uast/kotlin/internal/kotlinUastServiceUtils.kt
+++ b/plugins/uast-kotlin-idea-base/src/org/jetbrains/uast/kotlin/internal/kotlinUastServiceUtils.kt
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.idea.util.module
 import org.jetbrains.kotlin.platform.jvm.isJvm
 import org.jetbrains.kotlin.psi.KtFile
 
-internal val PsiElement.isJvmElement: Boolean
+val PsiElement.isJvmElement: Boolean
     get() {
         if (allModulesSupportJvm(project)) return true
 
diff --git a/plugins/uast-kotlin-idea-fir/build.gradle.kts b/plugins/uast-kotlin-idea-fir/build.gradle.kts
new file mode 100644
index 00000000000..e04d0745bd5
--- /dev/null
+++ b/plugins/uast-kotlin-idea-fir/build.gradle.kts
@@ -0,0 +1,24 @@
+
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    compile(kotlinStdlib())
+    compile(project(":core:util.runtime"))
+    compile(project(":compiler:backend"))
+    compile(project(":compiler:frontend.java"))
+    compile(project(":idea:ide-common"))
+    compile(project(":idea:idea-core"))
+    compile(project(":plugins:uast-kotlin-idea-base"))
+    compile(project(":plugins:uast-kotlin-fir"))
+    compileOnly(intellijDep())
+    compileOnly(intellijPluginDep("java"))
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}
+
diff --git a/plugins/uast-kotlin-idea/src/org/jetbrains/uast/kotlin/internal/FirIdeaKotlinUastResolveProviderService.kt b/plugins/uast-kotlin-idea-fir/src/org/jetbrains/uast/kotlin/internal/FirIdeaKotlinUastResolveProviderService.kt
similarity index 100%
rename from plugins/uast-kotlin-idea/src/org/jetbrains/uast/kotlin/internal/FirIdeaKotlinUastResolveProviderService.kt
rename to plugins/uast-kotlin-idea-fir/src/org/jetbrains/uast/kotlin/internal/FirIdeaKotlinUastResolveProviderService.kt
diff --git a/plugins/uast-kotlin-idea/build.gradle.kts b/plugins/uast-kotlin-idea/build.gradle.kts
index 58a5bf823f6..25e9b490f18 100644
--- a/plugins/uast-kotlin-idea/build.gradle.kts
+++ b/plugins/uast-kotlin-idea/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
     compile(project(":idea:ide-common"))
     compile(project(":idea:idea-core"))
     compile(project(":plugins:uast-kotlin"))
-    compile(project(":plugins:uast-kotlin-fir"))
+    compile(project(":plugins:uast-kotlin-idea-base"))
     compileOnly(intellijDep())
     compileOnly(intellijPluginDep("java"))
 }
diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts
index 76d09302f1a..cdaa1df8700 100644
--- a/prepare/idea-plugin/build.gradle.kts
+++ b/prepare/idea-plugin/build.gradle.kts
@@ -91,6 +91,8 @@ val projectsToShadow by extra(listOf(
         ":plugins:lint",
         ":plugins:uast-kotlin",
         ":plugins:uast-kotlin-idea",
+        ":plugins:uast-kotlin-idea-fir",
+        ":plugins:uast-kotlin-idea-base",
         ":j2k",
         ":nj2k",
         ":nj2k:nj2k-services",
diff --git a/settings.gradle b/settings.gradle
index 81dfbaa2ecc..c7f302ab11c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -213,7 +213,6 @@ include ":benchmarks",
         ":plugins:uast-kotlin",
         ":plugins:uast-kotlin-base",
         ":plugins:uast-kotlin-fir",
-        ":plugins:uast-kotlin-idea",
         ":plugins:annotation-based-compiler-plugins-ide-support",
         ":plugins:base-compiler-plugins-ide-support",
         ":kotlin-script-runtime",
@@ -355,6 +354,10 @@ include ":plugins:lombok:lombok-compiler-plugin",
         ":plugins:lombok:lombok-ide-plugin",
         ":kotlin-lombok"
 
+include ":plugins:uast-kotlin-idea",
+        ":plugins:uast-kotlin-idea-base",
+        ":plugins:uast-kotlin-idea-fir"
+
 include ":prepare:ide-plugin-dependencies:android-extensions-compiler-plugin-for-ide",
         ":prepare:ide-plugin-dependencies:allopen-compiler-plugin-for-ide",
         ":prepare:ide-plugin-dependencies:allopen-compiler-plugin-tests-for-ide",