diff --git a/build.gradle.kts b/build.gradle.kts
index 7eb13c65627..a762fffd6c8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -119,35 +119,39 @@ extra["versions.android"] = "2.3.1"
 extra["ideaCoreSdkJars"] = arrayOf("annotations", "asm-all", "guava", "intellij-core", "jdom", "jna", "log4j", "picocontainer",
                                    "snappy-in-java", "streamex", "trove4j", "xpp3-1.1.4-min", "xstream")
 
-extra["compilerModules"] = arrayOf(":compiler:util",
-                                   ":compiler:container",
-                                   ":compiler:conditional-preprocessor",
-                                   ":compiler:resolution",
-                                   ":compiler:serialization",
-                                   ":compiler:frontend",
-                                   ":compiler:frontend.java",
-                                   ":compiler:frontend.script",
-                                   ":compiler:cli-common",
-                                   ":compiler:daemon-common",
-                                   ":compiler:daemon",
-                                   ":compiler:ir.tree",
-                                   ":compiler:ir.psi2ir",
-                                   ":compiler:backend-common",
-                                   ":compiler:backend",
-                                   ":compiler:plugin-api",
-                                   ":compiler:light-classes",
-                                   ":compiler:cli",
-                                   ":compiler:incremental-compilation-impl",
-                                   ":js:js.ast",
-                                   ":js:js.serializer",
-                                   ":js:js.parser",
-                                   ":js:js.frontend",
-                                   ":js:js.translator",
-                                   ":js:js.dce",
-                                   ":compiler",
-                                   ":kotlin-build-common",
-                                   ":core:util.runtime",
-                                   ":core")
+extra["compilerModules"] = arrayOf(
+        ":compiler:util",
+        ":compiler:container",
+        ":compiler:conditional-preprocessor",
+        ":compiler:resolution",
+        ":compiler:serialization",
+        ":compiler:frontend",
+        ":compiler:frontend.java",
+        ":compiler:frontend.script",
+        ":compiler:cli-common",
+        ":compiler:daemon-common",
+        ":compiler:daemon",
+        ":compiler:ir.tree",
+        ":compiler:ir.psi2ir",
+        ":compiler:backend-common",
+        ":compiler:backend",
+        ":compiler:plugin-api",
+        ":compiler:light-classes",
+        ":compiler:cli",
+        ":compiler:incremental-compilation-impl",
+        ":js:js.ast",
+        ":js:js.serializer",
+        ":js:js.parser",
+        ":js:js.frontend",
+        ":js:js.translator",
+        ":js:js.dce",
+        ":compiler",
+        ":kotlin-build-common",
+        ":core:descriptors",
+        ":core:descriptors.jvm",
+        ":core:deserialization",
+        ":core:util.runtime"
+)
 
 val coreLibProjects = listOf(
         ":kotlin-stdlib",
diff --git a/compiler/android-tests/build.gradle.kts b/compiler/android-tests/build.gradle.kts
index 00a26530672..dcc872df07f 100644
--- a/compiler/android-tests/build.gradle.kts
+++ b/compiler/android-tests/build.gradle.kts
@@ -13,7 +13,8 @@ dependencies {
     compile(ideaSdkDeps("openapi"))
 
     testCompile(project(":compiler:incremental-compilation-impl"))
-    testCompile(project(":core"))
+    testCompile(project(":core:descriptors"))
+    testCompile(project(":core:descriptors.jvm"))
     testCompile(project(":compiler:frontend.java"))
     testCompile(projectTests(":jps-plugin"))
     testCompile(ideaSdkDeps("jps-model.jar", subdir = "jps"))
diff --git a/compiler/backend-common/build.gradle.kts b/compiler/backend-common/build.gradle.kts
index e51b2dddf4b..ffe7f070ea8 100644
--- a/compiler/backend-common/build.gradle.kts
+++ b/compiler/backend-common/build.gradle.kts
@@ -4,7 +4,8 @@ apply { plugin("kotlin") }
 jvmTarget = "1.6"
 
 dependencies {
-    compile(project(":core"))
+    compile(project(":core:descriptors"))
+    compile(project(":core:descriptors.jvm"))
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))
     compile(project(":compiler:ir.tree"))
diff --git a/compiler/daemon/daemon-common/build.gradle.kts b/compiler/daemon/daemon-common/build.gradle.kts
index 6b102ef2040..b4fe0562d1b 100644
--- a/compiler/daemon/daemon-common/build.gradle.kts
+++ b/compiler/daemon/daemon-common/build.gradle.kts
@@ -4,7 +4,8 @@ apply { plugin("kotlin") }
 jvmTarget = "1.6"
 
 dependencies {
-    compile(project(":core"))
+    compile(project(":core:descriptors"))
+    compile(project(":core:descriptors.jvm"))
     compile(project(":compiler:util"))
     compile(project(":compiler:cli-common"))
     compile(ideaSdkCoreDeps(*(rootProject.extra["ideaCoreSdkJars"] as Array<String>)))
diff --git a/compiler/frontend.java/build.gradle.kts b/compiler/frontend.java/build.gradle.kts
index f4b160ad842..dc31a8b6b2d 100644
--- a/compiler/frontend.java/build.gradle.kts
+++ b/compiler/frontend.java/build.gradle.kts
@@ -4,7 +4,8 @@ apply { plugin("kotlin") }
 jvmTarget = "1.6"
 
 dependencies {
-    compile(project(":core"))
+    compile(project(":core:descriptors"))
+    compile(project(":core:descriptors.jvm"))
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))
 }
diff --git a/compiler/frontend/build.gradle.kts b/compiler/frontend/build.gradle.kts
index 8c1b56580d6..533b3d805ea 100644
--- a/compiler/frontend/build.gradle.kts
+++ b/compiler/frontend/build.gradle.kts
@@ -4,7 +4,8 @@ apply { plugin("kotlin") }
 jvmTarget = "1.6"
 
 dependencies {
-    compile(project(":core"))
+    compile(project(":core:descriptors"))
+    compile(project(":core:deserialization"))
     compile(project(":compiler:util"))
     compile(project(":compiler:container"))
     compile(project(":compiler:resolution"))
@@ -16,4 +17,3 @@ sourceSets {
     "main" { projectDefault() }
     "test" {}
 }
-
diff --git a/compiler/incremental-compilation-impl/build.gradle.kts b/compiler/incremental-compilation-impl/build.gradle.kts
index 7032e20c4f3..f77773ff278 100644
--- a/compiler/incremental-compilation-impl/build.gradle.kts
+++ b/compiler/incremental-compilation-impl/build.gradle.kts
@@ -4,7 +4,9 @@ apply { plugin("kotlin") }
 jvmTarget = "1.6"
 
 dependencies {
-    compile(project(":core"))
+    compile(project(":core:descriptors"))
+    compile(project(":core:descriptors.jvm"))
+    compile(project(":core:deserialization"))
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))
     compile(project(":compiler:frontend.java"))
diff --git a/compiler/resolution/build.gradle.kts b/compiler/resolution/build.gradle.kts
index 5b5190e30d6..454a37c091a 100644
--- a/compiler/resolution/build.gradle.kts
+++ b/compiler/resolution/build.gradle.kts
@@ -5,11 +5,10 @@ jvmTarget = "1.6"
 
 dependencies {
     compile(project(":compiler:util"))
-    compile(project(":core"))
+    compile(project(":core:descriptors"))
 }
 
 sourceSets {
     "main" { projectDefault() }
     "test" {}
 }
-
diff --git a/compiler/serialization/build.gradle.kts b/compiler/serialization/build.gradle.kts
index c52faa22903..04e7be31ac4 100644
--- a/compiler/serialization/build.gradle.kts
+++ b/compiler/serialization/build.gradle.kts
@@ -6,11 +6,11 @@ jvmTarget = "1.6"
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))
-    compile(project(":core"))
+    compile(project(":core:descriptors"))
+    compile(project(":core:deserialization"))
 }
 
 sourceSets {
     "main" { projectDefault() }
     "test" {}
 }
-
diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts
index e12a465c4bf..03e52d01823 100644
--- a/compiler/tests-common/build.gradle.kts
+++ b/compiler/tests-common/build.gradle.kts
@@ -2,8 +2,10 @@
 apply { plugin("kotlin") }
 
 dependencies {
-    testCompile(project(":core"))
-    testCompile(project(":core::util.runtime"))
+    testCompile(project(":core:descriptors"))
+    testCompile(project(":core:descriptors.jvm"))
+    testCompile(project(":core:deserialization"))
+    testCompile(project(":core:descriptors.runtime"))
     testCompile(project(":compiler:util"))
     testCompile(project(":compiler:backend"))
     testCompile(project(":compiler:frontend"))
diff --git a/compiler/util/build.gradle.kts b/compiler/util/build.gradle.kts
index ab80675dff5..455dda172e1 100644
--- a/compiler/util/build.gradle.kts
+++ b/compiler/util/build.gradle.kts
@@ -4,7 +4,8 @@ apply { plugin("kotlin") }
 jvmTarget = "1.6"
 
 dependencies {
-    compile(project(":core"))
+    compile(projectDist(":kotlin-stdlib"))
+    compile(project(":core:deserialization"))
     compile(ideaSdkCoreDeps(*(rootProject.extra["ideaCoreSdkJars"] as Array<String>)))
     compile(ideaSdkDeps("jps-model.jar", subdir = "jps"))
 }
diff --git a/core/descriptors.jvm/build.gradle.kts b/core/descriptors.jvm/build.gradle.kts
new file mode 100644
index 00000000000..a35b8577ff7
--- /dev/null
+++ b/core/descriptors.jvm/build.gradle.kts
@@ -0,0 +1,21 @@
+apply { plugin("kotlin") }
+
+jvmTarget = "1.6"
+javaHome = rootProject.extra["JDK_16"] as String
+
+dependencies {
+    compile(project(":core:descriptors"))
+    compile(project(":core:deserialization"))
+    compile(project(":core:util.runtime"))
+    compile(commonDep("javax.inject"))
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}
+
+tasks.withType<JavaCompile> {
+    sourceCompatibility = "1.6"
+    targetCompatibility = "1.6"
+}
diff --git a/core/descriptors.runtime/build.gradle.kts b/core/descriptors.runtime/build.gradle.kts
new file mode 100644
index 00000000000..cec39c8b83d
--- /dev/null
+++ b/core/descriptors.runtime/build.gradle.kts
@@ -0,0 +1,20 @@
+apply { plugin("kotlin") }
+
+jvmTarget = "1.6"
+javaHome = rootProject.extra["JDK_16"] as String
+
+dependencies {
+    compile(project(":core:util.runtime"))
+    compile(project(":core:descriptors"))
+    compile(project(":core:descriptors.jvm"))
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}
+
+tasks.withType<JavaCompile> {
+    sourceCompatibility = "1.6"
+    targetCompatibility = "1.6"
+}
diff --git a/core/descriptors/build.gradle.kts b/core/descriptors/build.gradle.kts
new file mode 100644
index 00000000000..d5e4967ec49
--- /dev/null
+++ b/core/descriptors/build.gradle.kts
@@ -0,0 +1,19 @@
+apply { plugin("kotlin") }
+
+jvmTarget = "1.6"
+javaHome = rootProject.extra["JDK_16"] as String
+
+dependencies {
+    compile(project(":core:util.runtime"))
+    compile(projectDist(":kotlin-stdlib"))
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}
+
+tasks.withType<JavaCompile> {
+    sourceCompatibility = "1.6"
+    targetCompatibility = "1.6"
+}
diff --git a/core/build.gradle.kts b/core/deserialization/build.gradle.kts
similarity index 51%
rename from core/build.gradle.kts
rename to core/deserialization/build.gradle.kts
index e37f53db0d9..b47589433b5 100644
--- a/core/build.gradle.kts
+++ b/core/deserialization/build.gradle.kts
@@ -1,5 +1,3 @@
-
-import org.gradle.api.tasks.compile.JavaCompile
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 apply { plugin("kotlin") }
@@ -8,20 +6,14 @@ jvmTarget = "1.6"
 javaHome = rootProject.extra["JDK_16"] as String
 
 dependencies {
-    compile(projectDist(":kotlin-stdlib"))
-    compile(project("util.runtime"))
+    compile(project(":core:util.runtime"))
+    compile(project(":core:descriptors"))
     compile(protobufLite())
     compile(commonDep("javax.inject"))
 }
 
 sourceSets {
-    "main" {
-        java.srcDirs("descriptors/src",
-                     "descriptors.jvm/src",
-                     "descriptors.runtime/src",
-                     "deserialization/src")
-        resources.srcDirs("descriptors.jvm/src", "deserialization/src").apply { include("META-INF/**") }
-    }
+    "main" { projectDefault() }
     "test" {}
 }
 
@@ -34,5 +26,3 @@ tasks.withType<JavaCompile> {
 tasks.withType<KotlinCompile> {
     dependsOn(protobufLiteTask)
 }
-
-
diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts
index b00f111d633..91f7f3f1aae 100644
--- a/generators/build.gradle.kts
+++ b/generators/build.gradle.kts
@@ -3,7 +3,6 @@ apply { plugin("kotlin") }
 
 dependencies {
     compile(protobufFull())
-    compile(project(":core"))
     compile(project(":idea"))
     compile(project(":j2k"))
     compile(project(":compiler:util"))
diff --git a/gradle/project-schema.json b/gradle/project-schema.json
index a6e98dab028..4f261e64155 100644
--- a/gradle/project-schema.json
+++ b/gradle/project-schema.json
@@ -89,6 +89,7 @@
             "testCompileClasspath",
             "testCompileOnly",
             "testImplementation",
+            "testJvm6ServerRuntime",
             "testRuntime",
             "testRuntimeClasspath",
             "testRuntimeOnly",
@@ -104,37 +105,13 @@
     },
     ":core": {
         "conventions": {
-            "base": "org.gradle.api.plugins.BasePluginConvention",
-            "java": "org.gradle.api.plugins.JavaPluginConvention"
+            
         },
         "configurations": [
-            "apiElements",
-            "archives",
-            "compile",
-            "compileClasspath",
-            "compileOnly",
-            "default",
-            "implementation",
-            "kapt",
-            "kaptTest",
-            "runtime",
-            "runtimeClasspath",
-            "runtimeElements",
-            "runtimeOnly",
-            "testCompile",
-            "testCompileClasspath",
-            "testCompileOnly",
-            "testImplementation",
-            "testRuntime",
-            "testRuntimeClasspath",
-            "testRuntimeOnly"
+            
         ],
         "extensions": {
-            "ext": "org.gradle.api.plugins.ExtraPropertiesExtension",
-            "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension",
-            "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension",
-            "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet",
-            "reporting": "org.gradle.api.reporting.ReportingExtension"
+            "ext": "org.gradle.api.plugins.ExtraPropertiesExtension"
         }
     },
     ":custom-dependencies": {
@@ -1995,6 +1972,41 @@
             "reporting": "org.gradle.api.reporting.ReportingExtension"
         }
     },
+    ":test-instrumenter": {
+        "conventions": {
+            "base": "org.gradle.api.plugins.BasePluginConvention",
+            "java": "org.gradle.api.plugins.JavaPluginConvention"
+        },
+        "configurations": [
+            "apiElements",
+            "archives",
+            "compile",
+            "compileClasspath",
+            "compileOnly",
+            "default",
+            "implementation",
+            "kapt",
+            "kaptTest",
+            "runtime",
+            "runtimeClasspath",
+            "runtimeElements",
+            "runtimeOnly",
+            "testCompile",
+            "testCompileClasspath",
+            "testCompileOnly",
+            "testImplementation",
+            "testRuntime",
+            "testRuntimeClasspath",
+            "testRuntimeOnly"
+        ],
+        "extensions": {
+            "ext": "org.gradle.api.plugins.ExtraPropertiesExtension",
+            "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet",
+            "reporting": "org.gradle.api.reporting.ReportingExtension",
+            "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension",
+            "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension"
+        }
+    },
     ":tools": {
         "conventions": {
             
@@ -2933,6 +2945,146 @@
             "ext": "org.gradle.api.plugins.ExtraPropertiesExtension"
         }
     },
+    ":core:descriptors": {
+        "conventions": {
+            "base": "org.gradle.api.plugins.BasePluginConvention",
+            "java": "org.gradle.api.plugins.JavaPluginConvention"
+        },
+        "configurations": [
+            "apiElements",
+            "archives",
+            "compile",
+            "compileClasspath",
+            "compileOnly",
+            "default",
+            "implementation",
+            "kapt",
+            "kaptTest",
+            "runtime",
+            "runtimeClasspath",
+            "runtimeElements",
+            "runtimeOnly",
+            "testCompile",
+            "testCompileClasspath",
+            "testCompileOnly",
+            "testImplementation",
+            "testRuntime",
+            "testRuntimeClasspath",
+            "testRuntimeOnly"
+        ],
+        "extensions": {
+            "ext": "org.gradle.api.plugins.ExtraPropertiesExtension",
+            "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension",
+            "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension",
+            "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet",
+            "reporting": "org.gradle.api.reporting.ReportingExtension"
+        }
+    },
+    ":core:descriptors.jvm": {
+        "conventions": {
+            "base": "org.gradle.api.plugins.BasePluginConvention",
+            "java": "org.gradle.api.plugins.JavaPluginConvention"
+        },
+        "configurations": [
+            "apiElements",
+            "archives",
+            "compile",
+            "compileClasspath",
+            "compileOnly",
+            "default",
+            "implementation",
+            "kapt",
+            "kaptTest",
+            "runtime",
+            "runtimeClasspath",
+            "runtimeElements",
+            "runtimeOnly",
+            "testCompile",
+            "testCompileClasspath",
+            "testCompileOnly",
+            "testImplementation",
+            "testRuntime",
+            "testRuntimeClasspath",
+            "testRuntimeOnly"
+        ],
+        "extensions": {
+            "ext": "org.gradle.api.plugins.ExtraPropertiesExtension",
+            "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension",
+            "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension",
+            "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet",
+            "reporting": "org.gradle.api.reporting.ReportingExtension"
+        }
+    },
+    ":core:descriptors.runtime": {
+        "conventions": {
+            "base": "org.gradle.api.plugins.BasePluginConvention",
+            "java": "org.gradle.api.plugins.JavaPluginConvention"
+        },
+        "configurations": [
+            "apiElements",
+            "archives",
+            "compile",
+            "compileClasspath",
+            "compileOnly",
+            "default",
+            "implementation",
+            "kapt",
+            "kaptTest",
+            "runtime",
+            "runtimeClasspath",
+            "runtimeElements",
+            "runtimeOnly",
+            "testCompile",
+            "testCompileClasspath",
+            "testCompileOnly",
+            "testImplementation",
+            "testRuntime",
+            "testRuntimeClasspath",
+            "testRuntimeOnly"
+        ],
+        "extensions": {
+            "ext": "org.gradle.api.plugins.ExtraPropertiesExtension",
+            "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension",
+            "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension",
+            "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet",
+            "reporting": "org.gradle.api.reporting.ReportingExtension"
+        }
+    },
+    ":core:deserialization": {
+        "conventions": {
+            "base": "org.gradle.api.plugins.BasePluginConvention",
+            "java": "org.gradle.api.plugins.JavaPluginConvention"
+        },
+        "configurations": [
+            "apiElements",
+            "archives",
+            "compile",
+            "compileClasspath",
+            "compileOnly",
+            "default",
+            "implementation",
+            "kapt",
+            "kaptTest",
+            "runtime",
+            "runtimeClasspath",
+            "runtimeElements",
+            "runtimeOnly",
+            "testCompile",
+            "testCompileClasspath",
+            "testCompileOnly",
+            "testImplementation",
+            "testRuntime",
+            "testRuntimeClasspath",
+            "testRuntimeOnly"
+        ],
+        "extensions": {
+            "ext": "org.gradle.api.plugins.ExtraPropertiesExtension",
+            "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension",
+            "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension",
+            "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet",
+            "reporting": "org.gradle.api.reporting.ReportingExtension"
+        }
+    },
     ":core:util.runtime": {
         "conventions": {
             "base": "org.gradle.api.plugins.BasePluginConvention",
@@ -3114,7 +3266,8 @@
             "testImplementation",
             "testRuntime",
             "testRuntimeClasspath",
-            "testRuntimeOnly"
+            "testRuntimeOnly",
+            "tests-jar"
         ],
         "extensions": {
             "ext": "org.gradle.api.plugins.ExtraPropertiesExtension",
diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts
index 8a29db4a482..85952ef0327 100644
--- a/idea/build.gradle.kts
+++ b/idea/build.gradle.kts
@@ -5,7 +5,8 @@ apply { plugin("kotlin") }
 
 dependencies {
     compile(project(":kotlin-stdlib"))
-    compile(project(":core"))
+    compile(project(":core:descriptors"))
+    compile(project(":core:descriptors.jvm"))
     compile(project(":compiler:backend"))
     compile(project(":compiler:cli-common"))
     compile(project(":compiler:frontend"))
diff --git a/idea/idea-core/build.gradle.kts b/idea/idea-core/build.gradle.kts
index 00ac488f569..55baf283e9c 100644
--- a/idea/idea-core/build.gradle.kts
+++ b/idea/idea-core/build.gradle.kts
@@ -2,7 +2,8 @@ apply { plugin("kotlin") }
 
 dependencies {
     compile(projectDist(":kotlin-stdlib"))
-    compile(project(":core"))
+    compile(project(":core:descriptors"))
+    compile(project(":core:descriptors.jvm"))
     compile(project(":compiler:frontend"))
     compile(project(":compiler:frontend.java"))
     compile(project(":compiler:frontend.script"))
diff --git a/jps-plugin/build.gradle.kts b/jps-plugin/build.gradle.kts
index 583b4978097..39c5940de3e 100644
--- a/jps-plugin/build.gradle.kts
+++ b/jps-plugin/build.gradle.kts
@@ -4,7 +4,8 @@ val compilerModules: Array<String> by rootProject.extra
 
 dependencies {
     compile(project(":kotlin-build-common"))
-    compile(project(":core"))
+    compile(project(":core:descriptors"))
+    compile(project(":core:descriptors.jvm"))
     compile(project(":kotlin-compiler-runner"))
     compile(project(":compiler:daemon-common"))
     compile(projectRuntimeJar(":kotlin-daemon-client"))
diff --git a/js/js.translator/build.gradle.kts b/js/js.translator/build.gradle.kts
index 855b9800337..3dccdf508fd 100644
--- a/js/js.translator/build.gradle.kts
+++ b/js/js.translator/build.gradle.kts
@@ -4,7 +4,7 @@ apply { plugin("kotlin") }
 jvmTarget = "1.6"
 
 dependencies {
-    compile(project(":core"))
+    compile(project(":core:descriptors"))
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))
     compile(project(":compiler:backend-common"))
diff --git a/libraries/tools/kotlin-reflect/build.gradle b/libraries/tools/kotlin-reflect/build.gradle
index 1400eb182f3..d6b75dc372d 100644
--- a/libraries/tools/kotlin-reflect/build.gradle
+++ b/libraries/tools/kotlin-reflect/build.gradle
@@ -41,8 +41,11 @@ configurations {
 
 dependencies {
     proguardDeps project(':kotlin-stdlib')
+    shadows project(':core:descriptors')
+    shadows project(':core:descriptors.jvm')
+    shadows project(':core:deserialization')
+    shadows project(':core:descriptors.runtime')
     shadows project(':core:util.runtime')
-    shadows project(':core')
     shadows 'javax.inject:javax.inject:1'
     shadows project(path: ':custom-dependencies:protobuf-lite', configuration: 'default')
 
diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts
index 60c924fa85d..ded44f8b3f3 100644
--- a/prepare/idea-plugin/build.gradle.kts
+++ b/prepare/idea-plugin/build.gradle.kts
@@ -42,7 +42,9 @@ val projectsToShadow = listOf(
         ":compiler:cli-common",
         ":compiler:container",
         ":compiler:daemon-common",
-        ":core",
+        ":core:descriptors",
+        ":core:descriptors.jvm",
+        ":core:deserialization",
         ":eval4j",
         ":idea:formatter",
         ":compiler:frontend",
diff --git a/prepare/jps-plugin/build.gradle.kts b/prepare/jps-plugin/build.gradle.kts
index 222dbb2bfc3..e4232263337 100644
--- a/prepare/jps-plugin/build.gradle.kts
+++ b/prepare/jps-plugin/build.gradle.kts
@@ -23,7 +23,8 @@ val projectsToShadow = listOf(
         ":kotlin-compiler-runner",
         ":kotlin-daemon-client",
         ":compiler:daemon-common",
-        ":core",
+        ":core:descriptors",
+        ":core:descriptors.jvm",
         ":idea:idea-jps-common",
         ":jps-plugin",
         ":kotlin-preloader",
diff --git a/settings.gradle b/settings.gradle
index 5577cea3af7..98ff6431510 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -49,7 +49,10 @@ include ":kotlin-build-common",
         ":js:js.tests",
         ":jps-plugin",
         ":kotlin-jps-plugin",
-        ":core",
+        ":core:descriptors",
+        ":core:descriptors.jvm",
+        ":core:deserialization",
+        ":core:descriptors.runtime",
         ":core:builtins",
         ":core:util.runtime",
         ":custom-dependencies:protobuf-lite",
diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts
index 139c80c8fe4..74e6fc48c91 100644
--- a/ultimate/build.gradle.kts
+++ b/ultimate/build.gradle.kts
@@ -23,7 +23,8 @@ evaluationDependsOn(":prepare:idea-plugin")
 dependencies {
     compile(projectDist(":kotlin-reflect"))
     compile(projectDist(":kotlin-stdlib"))
-    compile(project(":core")) { isTransitive = false }
+    compile(project(":core:descriptors")) { isTransitive = false }
+    compile(project(":core:descriptors.jvm")) { isTransitive = false }
     compile(project(":core:util.runtime")) { isTransitive = false }
     compile(project(":compiler:light-classes")) { isTransitive = false }
     compile(project(":compiler:frontend")) { isTransitive = false }