diff --git a/.idea/artifacts/kotlin_plugin_jar.xml b/.idea/artifacts/kotlin_plugin_jar.xml
index 6a0b827e0e0..8ec87dd2a46 100644
--- a/.idea/artifacts/kotlin_plugin_jar.xml
+++ b/.idea/artifacts/kotlin_plugin_jar.xml
@@ -17,7 +17,7 @@
       <element id="module-output" name="kotlin.core.descriptors.jvm.main" />
       <element id="module-output" name="kotlin.core.descriptors.main" />
       <element id="module-output" name="kotlin.core.deserialization.main" />
-      <element id="module-output" name="kotlin.eval4j.main" />
+      <element id="module-output" name="kotlin.idea.eval4j.main" />
       <element id="module-output" name="kotlin.idea.fir-view.main" />
       <element id="module-output" name="kotlin.compiler.frontend.java.main" />
       <element id="module-output" name="kotlin.compiler.frontend.script.main" />
diff --git a/build.gradle.kts b/build.gradle.kts
index 43743c7a317..2c9922e05d4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -540,7 +540,7 @@ tasks {
                   ":idea:idea-gradle-native:test",
                   ":idea:idea-maven:test",
                   ":j2k:test",
-                  ":eval4j:test")
+                  ":idea:eval4j:test")
     }
 
     create("idea-plugin-tests") {
diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts
index 9431257db83..2bbb4eed38c 100644
--- a/idea/build.gradle.kts
+++ b/idea/build.gradle.kts
@@ -33,7 +33,7 @@ dependencies {
     compile(projectRuntimeJar(":kotlin-daemon-client"))
     compile(project(":kotlin-compiler-runner")) { isTransitive = false }
     compile(project(":compiler:plugin-api"))
-    compile(project(":eval4j"))
+    compile(project(":idea:eval4j"))
     compile(project(":j2k"))
     compile(project(":idea:formatter"))
     compile(project(":idea:fir-view"))
diff --git a/eval4j/ReadMe.md b/idea/eval4j/ReadMe.md
similarity index 100%
rename from eval4j/ReadMe.md
rename to idea/eval4j/ReadMe.md
diff --git a/eval4j/build.gradle.kts b/idea/eval4j/build.gradle.kts
similarity index 99%
rename from eval4j/build.gradle.kts
rename to idea/eval4j/build.gradle.kts
index 16f0760a848..aa96f8652f7 100644
--- a/eval4j/build.gradle.kts
+++ b/idea/eval4j/build.gradle.kts
@@ -1,4 +1,3 @@
-
 plugins {
     kotlin("jvm")
     id("jps-compatible")
diff --git a/eval4j/src/org/jetbrains/eval4j/interpreter.kt b/idea/eval4j/src/org/jetbrains/eval4j/interpreter.kt
similarity index 100%
rename from eval4j/src/org/jetbrains/eval4j/interpreter.kt
rename to idea/eval4j/src/org/jetbrains/eval4j/interpreter.kt
diff --git a/eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt b/idea/eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt
similarity index 100%
rename from eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt
rename to idea/eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt
diff --git a/eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt b/idea/eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt
similarity index 100%
rename from eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt
rename to idea/eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt
diff --git a/eval4j/src/org/jetbrains/eval4j/jdi/jdiValues.kt b/idea/eval4j/src/org/jetbrains/eval4j/jdi/jdiValues.kt
similarity index 100%
rename from eval4j/src/org/jetbrains/eval4j/jdi/jdiValues.kt
rename to idea/eval4j/src/org/jetbrains/eval4j/jdi/jdiValues.kt
diff --git a/eval4j/src/org/jetbrains/eval4j/members.kt b/idea/eval4j/src/org/jetbrains/eval4j/members.kt
similarity index 100%
rename from eval4j/src/org/jetbrains/eval4j/members.kt
rename to idea/eval4j/src/org/jetbrains/eval4j/members.kt
diff --git a/eval4j/src/org/jetbrains/eval4j/values.kt b/idea/eval4j/src/org/jetbrains/eval4j/values.kt
similarity index 100%
rename from eval4j/src/org/jetbrains/eval4j/values.kt
rename to idea/eval4j/src/org/jetbrains/eval4j/values.kt
diff --git a/eval4j/test/org/jetbrains/eval4j/jdi/test/Debugee.java b/idea/eval4j/test/org/jetbrains/eval4j/jdi/test/Debugee.java
similarity index 100%
rename from eval4j/test/org/jetbrains/eval4j/jdi/test/Debugee.java
rename to idea/eval4j/test/org/jetbrains/eval4j/jdi/test/Debugee.java
diff --git a/eval4j/test/org/jetbrains/eval4j/jdi/test/jdiTest.kt b/idea/eval4j/test/org/jetbrains/eval4j/jdi/test/jdiTest.kt
similarity index 100%
rename from eval4j/test/org/jetbrains/eval4j/jdi/test/jdiTest.kt
rename to idea/eval4j/test/org/jetbrains/eval4j/jdi/test/jdiTest.kt
diff --git a/eval4j/test/org/jetbrains/eval4j/test/ArrayHelper.java b/idea/eval4j/test/org/jetbrains/eval4j/test/ArrayHelper.java
similarity index 100%
rename from eval4j/test/org/jetbrains/eval4j/test/ArrayHelper.java
rename to idea/eval4j/test/org/jetbrains/eval4j/test/ArrayHelper.java
diff --git a/eval4j/test/org/jetbrains/eval4j/test/BaseTestData.java b/idea/eval4j/test/org/jetbrains/eval4j/test/BaseTestData.java
similarity index 100%
rename from eval4j/test/org/jetbrains/eval4j/test/BaseTestData.java
rename to idea/eval4j/test/org/jetbrains/eval4j/test/BaseTestData.java
diff --git a/eval4j/test/org/jetbrains/eval4j/test/Eval4jTest.java b/idea/eval4j/test/org/jetbrains/eval4j/test/Eval4jTest.java
similarity index 100%
rename from eval4j/test/org/jetbrains/eval4j/test/Eval4jTest.java
rename to idea/eval4j/test/org/jetbrains/eval4j/test/Eval4jTest.java
diff --git a/eval4j/test/org/jetbrains/eval4j/test/IgnoreInReflectionTests.java b/idea/eval4j/test/org/jetbrains/eval4j/test/IgnoreInReflectionTests.java
similarity index 100%
rename from eval4j/test/org/jetbrains/eval4j/test/IgnoreInReflectionTests.java
rename to idea/eval4j/test/org/jetbrains/eval4j/test/IgnoreInReflectionTests.java
diff --git a/eval4j/test/org/jetbrains/eval4j/test/TestData.java b/idea/eval4j/test/org/jetbrains/eval4j/test/TestData.java
similarity index 100%
rename from eval4j/test/org/jetbrains/eval4j/test/TestData.java
rename to idea/eval4j/test/org/jetbrains/eval4j/test/TestData.java
diff --git a/eval4j/test/org/jetbrains/eval4j/test/main.kt b/idea/eval4j/test/org/jetbrains/eval4j/test/main.kt
similarity index 100%
rename from eval4j/test/org/jetbrains/eval4j/test/main.kt
rename to idea/eval4j/test/org/jetbrains/eval4j/test/main.kt
diff --git a/eval4j/test/org/jetbrains/eval4j/test/suiteBuilder.kt b/idea/eval4j/test/org/jetbrains/eval4j/test/suiteBuilder.kt
similarity index 100%
rename from eval4j/test/org/jetbrains/eval4j/test/suiteBuilder.kt
rename to idea/eval4j/test/org/jetbrains/eval4j/test/suiteBuilder.kt
diff --git a/eval4j/test/org/jetbrains/eval4j/test/util.kt b/idea/eval4j/test/org/jetbrains/eval4j/test/util.kt
similarity index 100%
rename from eval4j/test/org/jetbrains/eval4j/test/util.kt
rename to idea/eval4j/test/org/jetbrains/eval4j/test/util.kt
diff --git a/idea/testData/gradle/highlighting/complexBuildGradleKts/build.gradle.kts b/idea/testData/gradle/highlighting/complexBuildGradleKts/build.gradle.kts
index 2fe4e568c24..0dea94e75a8 100644
--- a/idea/testData/gradle/highlighting/complexBuildGradleKts/build.gradle.kts
+++ b/idea/testData/gradle/highlighting/complexBuildGradleKts/build.gradle.kts
@@ -381,7 +381,7 @@ tasks {
         dependsOn(":idea:idea-gradle:test",
                   ":idea:idea-maven:test",
                   ":j2k:test",
-                  ":eval4j:test")
+                  ":idea:eval4j:test")
     }
 
     create("idea-plugin-tests") {
diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts
index 0fcd7cf7a9d..3618fee91ec 100644
--- a/prepare/idea-plugin/build.gradle.kts
+++ b/prepare/idea-plugin/build.gradle.kts
@@ -28,7 +28,7 @@ val projectsToShadow by extra(listOf(
         ":core:descriptors",
         ":core:descriptors.jvm",
         ":core:deserialization",
-        ":eval4j",
+        ":idea:eval4j",
         ":idea:formatter",
         ":compiler:psi",
         *if (project.findProperty("fir.enabled") == "true") {
diff --git a/settings.gradle b/settings.gradle
index 73e0ceaefc1..46648fc6144 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -93,7 +93,7 @@ include ":kotlin-build-common",
         ":idea:idea-gradle-native",
         ":idea",
         ":idea-runner",
-        ":eval4j",
+        ":idea:eval4j",
         ":j2k",
         ":plugins:lint",
         ":plugins:kapt3-idea",