diff --git a/core/compiler.common.jvm/build.gradle.kts b/core/compiler.common.jvm/build.gradle.kts
index 991f5b18028..e059558821a 100644
--- a/core/compiler.common.jvm/build.gradle.kts
+++ b/core/compiler.common.jvm/build.gradle.kts
@@ -8,7 +8,6 @@ javaHome = rootProject.extra["JDK_16"] as String
 
 dependencies {
     api(project(":core:compiler.common"))
-    api(project(":core:metadata.jvm"))
 }
 
 sourceSets {
diff --git a/core/metadata.jvm/build.gradle.kts b/core/metadata.jvm/build.gradle.kts
index 8519cf231c4..5c420c20f77 100644
--- a/core/metadata.jvm/build.gradle.kts
+++ b/core/metadata.jvm/build.gradle.kts
@@ -7,7 +7,7 @@ jvmTarget = "1.6"
 javaHome = rootProject.extra["JDK_16"] as String
 
 dependencies {
-    compile(project(":core:metadata"))
+    api(project(":core:metadata"))
     api(project(":core:compiler.common.jvm"))
 }
 
diff --git a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinClassFinder.kt b/core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinClassFinder.kt
similarity index 100%
rename from core/compiler.common.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinClassFinder.kt
rename to core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinClassFinder.kt
diff --git a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryClass.kt b/core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryClass.kt
similarity index 100%
rename from core/compiler.common.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryClass.kt
rename to core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryClass.kt
diff --git a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt b/core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt
similarity index 100%
rename from core/compiler.common.jvm/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt
rename to core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt
diff --git a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/kotlin/PackagePartProvider.kt b/core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/PackagePartProvider.kt
similarity index 100%
rename from core/compiler.common.jvm/src/org/jetbrains/kotlin/load/kotlin/PackagePartProvider.kt
rename to core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/PackagePartProvider.kt
diff --git a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt b/core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt
similarity index 100%
rename from core/compiler.common.jvm/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt
rename to core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt