diff --git a/core/metadata.jvm/build.gradle.kts b/core/metadata.jvm/build.gradle.kts
index 20c824b80f0..8519cf231c4 100644
--- a/core/metadata.jvm/build.gradle.kts
+++ b/core/metadata.jvm/build.gradle.kts
@@ -8,6 +8,7 @@ javaHome = rootProject.extra["JDK_16"] as String
 
 dependencies {
     compile(project(":core:metadata"))
+    api(project(":core:compiler.common.jvm"))
 }
 
 sourceSets {
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinarySourceElement.kt b/core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinarySourceElement.kt
similarity index 100%
rename from core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinarySourceElement.kt
rename to core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinarySourceElement.kt
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/SerializerExtensionProtocol.kt b/core/metadata/src/org/jetbrains/kotlin/serialization/SerializerExtensionProtocol.kt
similarity index 100%
rename from core/deserialization/src/org/jetbrains/kotlin/serialization/SerializerExtensionProtocol.kt
rename to core/metadata/src/org/jetbrains/kotlin/serialization/SerializerExtensionProtocol.kt
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassData.kt b/core/metadata/src/org/jetbrains/kotlin/serialization/deserialization/ClassData.kt
similarity index 90%
rename from core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassData.kt
rename to core/metadata/src/org/jetbrains/kotlin/serialization/deserialization/ClassData.kt
index c277136aedd..127295346eb 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassData.kt
+++ b/core/metadata/src/org/jetbrains/kotlin/serialization/deserialization/ClassData.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * 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.
  */
 
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDataFinder.java b/core/metadata/src/org/jetbrains/kotlin/serialization/deserialization/ClassDataFinder.java
similarity index 100%
rename from core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDataFinder.java
rename to core/metadata/src/org/jetbrains/kotlin/serialization/deserialization/ClassDataFinder.java
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverUtil.kt b/core/metadata/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverUtil.kt
similarity index 100%
rename from core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverUtil.kt
rename to core/metadata/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverUtil.kt
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoBasedClassDataFinder.kt b/core/metadata/src/org/jetbrains/kotlin/serialization/deserialization/ProtoBasedClassDataFinder.kt
similarity index 100%
rename from core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoBasedClassDataFinder.kt
rename to core/metadata/src/org/jetbrains/kotlin/serialization/deserialization/ProtoBasedClassDataFinder.kt
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/builtins/BuiltInSerializerProtocol.kt b/core/metadata/src/org/jetbrains/kotlin/serialization/deserialization/builtins/BuiltInSerializerProtocol.kt
similarity index 96%
rename from core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/builtins/BuiltInSerializerProtocol.kt
rename to core/metadata/src/org/jetbrains/kotlin/serialization/deserialization/builtins/BuiltInSerializerProtocol.kt
index 05396d5bc77..258d03a69cd 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/builtins/BuiltInSerializerProtocol.kt
+++ b/core/metadata/src/org/jetbrains/kotlin/serialization/deserialization/builtins/BuiltInSerializerProtocol.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * 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.
  */