diff --git a/build.gradle.kts b/build.gradle.kts
index 7c4c168d604..fda5d8f6e8e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -887,9 +887,9 @@ tasks {
     register("frontendApiTests") {
         dependsOn("dist")
         dependsOn(
-            ":idea:idea-frontend-api:test",
-            ":idea:idea-frontend-fir:test",
-            ":idea:idea-frontend-fir:idea-fir-low-level-api:test"
+            ":idea-frontend-api:test",
+            ":idea-frontend-fir:test",
+            ":idea-frontend-fir:idea-fir-low-level-api:test"
         )
     }
     
diff --git a/generators/frontend-api-generator/build.gradle.kts b/generators/frontend-api-generator/build.gradle.kts
index 2222f240027..f8c85db8ca7 100644
--- a/generators/frontend-api-generator/build.gradle.kts
+++ b/generators/frontend-api-generator/build.gradle.kts
@@ -16,8 +16,8 @@ dependencies {
     testCompile(projectTests(":kotlinx-serialization-ide-plugin"))
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(projectTests(":compiler:tests-spec"))
-    testCompile(projectTests(":idea:idea-frontend-fir:idea-fir-low-level-api"))
-    testCompile(projectTests(":idea:idea-frontend-fir"))
+    testCompile(projectTests(":idea-frontend-fir:idea-fir-low-level-api"))
+    testCompile(projectTests(":idea-frontend-fir"))
     testCompile(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
     testApiJUnit5()
 }
diff --git a/generators/idea-generator/build.gradle.kts b/generators/idea-generator/build.gradle.kts
index 7be502583f5..30f251f29ff 100644
--- a/generators/idea-generator/build.gradle.kts
+++ b/generators/idea-generator/build.gradle.kts
@@ -13,8 +13,8 @@ dependencies {
     testCompile(projectTests(":idea:idea-maven"))
     testCompile(projectTests(":idea:idea-fir"))
     testCompile(projectTests(":idea:idea-fir-performance-tests"))
-    testCompile(projectTests(":idea:idea-frontend-fir"))
-    testCompile(projectTests(":idea:idea-frontend-fir:idea-fir-low-level-api"))
+    testCompile(projectTests(":idea-frontend-fir"))
+    testCompile(projectTests(":idea-frontend-fir:idea-fir-low-level-api"))
     testCompile(projectTests(":idea:idea-frontend-fir:fir-low-level-api-ide-impl"))
     testCompile(projectTests(":idea:idea-fir-fe10-binding"))
     testCompile(projectTests(":j2k"))
diff --git a/idea/idea-fir-fe10-binding/build.gradle.kts b/idea/idea-fir-fe10-binding/build.gradle.kts
index 268738becbc..2e9357cad68 100644
--- a/idea/idea-fir-fe10-binding/build.gradle.kts
+++ b/idea/idea-fir-fe10-binding/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":idea:idea-frontend-fir"))
+    implementation(project(":idea-frontend-fir"))
     implementation(project(":idea"))
 
     testRuntime(project(":idea:idea-fir"))
diff --git a/idea/idea-fir-performance-tests/build.gradle.kts b/idea/idea-fir-performance-tests/build.gradle.kts
index fa2b79188db..f6f18c17648 100644
--- a/idea/idea-fir-performance-tests/build.gradle.kts
+++ b/idea/idea-fir-performance-tests/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    compile(project(":idea:idea-frontend-fir"))
+    compile(project(":idea-frontend-fir"))
     compile(project(":idea:formatter"))
     compile(intellijDep())
     compile(intellijCoreDep())
@@ -22,7 +22,7 @@ dependencies {
     compile(project(":idea:idea-fir"))
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(projectTests(":idea:idea-test-framework"))
-    testCompile(projectTests(":idea:idea-frontend-fir"))
+    testCompile(projectTests(":idea-frontend-fir"))
     testCompile(project(":kotlin-test:kotlin-test-junit"))
     testCompile(commonDep("junit:junit"))
 
diff --git a/idea/idea-fir/build.gradle.kts b/idea/idea-fir/build.gradle.kts
index d04e0b943ee..9b4d1694cc3 100644
--- a/idea/idea-fir/build.gradle.kts
+++ b/idea/idea-fir/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 
 dependencies {
     compile(project(":plugins:uast-kotlin-fir"))
-    compile(project(":idea:idea-frontend-fir"))
+    compile(project(":idea-frontend-fir"))
     compile(project(":idea:idea-frontend-fir:fir-low-level-api-ide-impl"))
 
     compile(project(":idea:formatter"))
@@ -25,7 +25,7 @@ dependencies {
     testCompile(projectTests(":idea"))
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(projectTests(":idea:idea-test-framework"))
-    testCompile(projectTests(":idea:idea-frontend-fir"))
+    testCompile(projectTests(":idea-frontend-fir"))
     testCompile(project(":kotlin-test:kotlin-test-junit"))
     testCompile(commonDep("junit:junit"))
     testCompile(projectTests(":idea:idea-frontend-independent"))
diff --git a/idea/idea-frontend-api/build.gradle.kts b/idea/idea-frontend-api/build.gradle.kts
index 42d2746d2b9..5e9c02fd29c 100644
--- a/idea/idea-frontend-api/build.gradle.kts
+++ b/idea/idea-frontend-api/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
     compileOnly(project(":compiler:frontend"))
     compileOnly(project(":core:compiler.common"))
     compileOnly(project(":core:compiler.common.jvm"))
-    compileOnly(project(":idea:idea-frontend-fir:idea-fir-low-level-api"))
+    compileOnly(project(":idea-frontend-fir:idea-fir-low-level-api"))
 
     compile(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
 }
diff --git a/idea/idea-frontend-fir/build.gradle.kts b/idea/idea-frontend-fir/build.gradle.kts
index 56d48237a84..65512a2aa18 100644
--- a/idea/idea-frontend-fir/build.gradle.kts
+++ b/idea/idea-frontend-fir/build.gradle.kts
@@ -13,12 +13,12 @@ dependencies {
     compile(project(":compiler:fir:checkers:checkers.jvm"))
     compile(project(":compiler:fir:java"))
     compile(project(":compiler:fir:jvm"))
-    compile(project(":idea:idea-frontend-fir:idea-fir-low-level-api"))
-    compile(project(":idea:idea-frontend-api"))
+    compile(project(":idea-frontend-fir:idea-fir-low-level-api"))
+    compile(project(":idea-frontend-api"))
     compile(project(":compiler:light-classes"))
     compile(intellijCoreDep())
 
-    testCompile(projectTests(":idea:idea-frontend-fir:idea-fir-low-level-api"))
+    testCompile(projectTests(":idea-frontend-fir:idea-fir-low-level-api"))
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(projectTests(":compiler:test-infrastructure-utils"))
     testCompile(projectTests(":compiler:test-infrastructure"))
@@ -66,7 +66,7 @@ testsJar()
 val generatorClasspath by configurations.creating
 
 dependencies {
-    generatorClasspath(project("idea-frontend-fir-generator"))
+    generatorClasspath(project(":idea-frontend-fir:idea-frontend-fir-generator"))
 }
 
 val generateCode by tasks.registering(NoDebugJavaExec::class) {
diff --git a/idea/idea-frontend-fir/fir-low-level-api-ide-impl/build.gradle.kts b/idea/idea-frontend-fir/fir-low-level-api-ide-impl/build.gradle.kts
index 4136ae19f11..b8ea6030acf 100644
--- a/idea/idea-frontend-fir/fir-low-level-api-ide-impl/build.gradle.kts
+++ b/idea/idea-frontend-fir/fir-low-level-api-ide-impl/build.gradle.kts
@@ -5,9 +5,9 @@ plugins {
 
 dependencies {
     compile(project(":compiler:psi"))
-    compile(project(            ":idea:idea-frontend-fir:idea-fir-low-level-api"))
+    compile(project(            ":idea-frontend-fir:idea-fir-low-level-api"))
     compile(project(":idea:idea-frontend-independent"))
-    compile(project(":idea:idea-frontend-api"))
+    compile(project(":idea-frontend-api"))
     compile(project(":idea:idea-core"))
     compile(project(":compiler:fir:fir2ir"))
     compile(project(":compiler:fir:fir2ir:jvm-backend"))
@@ -27,7 +27,7 @@ dependencies {
 // </temp>
 
 // <neededFor>`AbstractFirLazyResolveTest` uses fir implementation of references which are not in classpath otherwise
-    testRuntimeOnly(project(":idea:idea-frontend-fir"))
+    testRuntimeOnly(project(":idea-frontend-fir"))
 // </neededFor>
     testCompile(projectTests(":compiler:test-infrastructure-utils"))
     testCompile(projectTests(":compiler:test-infrastructure"))
diff --git a/idea/idea-frontend-fir/idea-frontend-fir-generator/build.gradle.kts b/idea/idea-frontend-fir/idea-frontend-fir-generator/build.gradle.kts
index db932ee5d1c..a2106197946 100644
--- a/idea/idea-frontend-fir/idea-frontend-fir-generator/build.gradle.kts
+++ b/idea/idea-frontend-fir/idea-frontend-fir-generator/build.gradle.kts
@@ -8,7 +8,7 @@ dependencies {
     implementation(project(":compiler:fir:tree"))
     implementation(project(":compiler:fir:tree:tree-generator"))
     implementation(project(":compiler:fir:checkers:checkers-component-generator"))
-    implementation(project(":idea:idea-frontend-api"))
+    implementation(project(":idea-frontend-api"))
 
     implementation(project(":kotlin-reflect"))
     implementation(project(":kotlin-reflect-api"))
diff --git a/plugins/uast-kotlin-fir/build.gradle.kts b/plugins/uast-kotlin-fir/build.gradle.kts
index 5f5275b892c..84429625d6a 100644
--- a/plugins/uast-kotlin-fir/build.gradle.kts
+++ b/plugins/uast-kotlin-fir/build.gradle.kts
@@ -22,8 +22,8 @@ dependencies {
     compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
 
     implementation(project(":idea:idea-frontend-independent"))
-    implementation(project(":idea:idea-frontend-api"))
-    implementation(project(":idea:idea-frontend-fir"))
+    implementation(project(":idea-frontend-api"))
+    implementation(project(":idea-frontend-fir"))
 
     testRuntime(project(":idea:idea-fir"))
     testImplementation(commonDep("junit:junit"))
diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts
index 37a67154ffd..61f968d503f 100644
--- a/prepare/idea-plugin/build.gradle.kts
+++ b/prepare/idea-plugin/build.gradle.kts
@@ -106,9 +106,9 @@ val projectsToShadow by extra(listOf(
         ":idea:idea-git",
         ":idea:idea-jps-common",
         ":idea:idea-frontend-independent",
-        ":idea:idea-frontend-fir",
-        ":idea:idea-frontend-api",
-        ":idea:idea-frontend-fir:idea-fir-low-level-api",
+        ":idea-frontend-fir",
+        ":idea-frontend-api",
+        ":idea-frontend-fir:idea-fir-low-level-api",
         ":idea:idea-frontend-fir:fir-low-level-api-ide-impl",
         ":idea:idea-fir-performance-tests",
         ":idea:idea-fir",
diff --git a/settings.gradle b/settings.gradle
index 2f4926e2088..a73c7647e7c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -496,10 +496,10 @@ if (!buildProperties.getBoolean("disableKotlinPluginModules", false) && attached
 }
 
 include ":generators:frontend-api-generator",
-        ":idea:idea-frontend-fir:idea-fir-low-level-api",
-        ":idea:idea-frontend-fir:idea-frontend-fir-generator",
-        ":idea:idea-frontend-fir",
-        ":idea:idea-frontend-api"
+        ":idea-frontend-fir:idea-fir-low-level-api",
+        ":idea-frontend-fir:idea-frontend-fir-generator",
+        ":idea-frontend-fir",
+        ":idea-frontend-api"
 
 if (buildProperties.inJpsBuildIdeaSync) {
     include ":kotlin-stdlib:jps-build"
@@ -675,6 +675,12 @@ project(':kotlinx-serialization-compiler-plugin').projectDir = file("$rootDir/pl
 project(':kotlin-serialization').projectDir = file("$rootDir/libraries/tools/kotlin-serialization")
 project(':kotlin-serialization-unshaded').projectDir = file("$rootDir/libraries/tools/kotlin-serialization-unshaded")
 
+project(":idea-frontend-fir:idea-fir-low-level-api").projectDir = "$rootDir/idea/idea-frontend-fir/idea-fir-low-level-api" as File
+project(":idea-frontend-fir:idea-frontend-fir-generator").projectDir = "$rootDir/idea/idea-frontend-fir/idea-frontend-fir-generator" as File
+project(":idea-frontend-fir").projectDir = "$rootDir/idea/idea-frontend-fir" as File
+project(":idea-frontend-api").projectDir = "$rootDir/idea/idea-frontend-api" as File
+
+
 // Uncomment to use locally built protobuf-relocated
 // includeBuild("dependencies/protobuf")
 if (buildProperties.isKotlinNativeEnabled) {