diff --git a/compiler/cli/src/META-INF/services/javax.script.ScriptEngineFactory b/compiler/cli/src/META-INF/services/javax.script.ScriptEngineFactory
deleted file mode 100644
index 3b8ec69135a..00000000000
--- a/compiler/cli/src/META-INF/services/javax.script.ScriptEngineFactory
+++ /dev/null
@@ -1 +0,0 @@
-org.jetbrains.kotlin.cli.jvm.repl.KotlinJsr232StandardScriptEngineFactory
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/KotlinJsr232ScriptEngine.kt b/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr232ScriptEngine.kt
similarity index 97%
rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/KotlinJsr232ScriptEngine.kt
rename to libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr232ScriptEngine.kt
index ed9192161b6..cf801d89307 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/KotlinJsr232ScriptEngine.kt
+++ b/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr232ScriptEngine.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.cli.jvm.repl
+package org.jetbrains.kotlin.script.jsr223
 
 import com.intellij.openapi.Disposable
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation
@@ -23,6 +23,7 @@ import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.cli.common.messages.MessageRenderer
 import org.jetbrains.kotlin.cli.common.repl.ReplCodeLine
 import org.jetbrains.kotlin.cli.common.repl.ReplEvalResult
+import org.jetbrains.kotlin.cli.jvm.repl.GenericRepl
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.script.KotlinScriptDefinition
 import java.io.Reader
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/KotlinJsr232StandardScriptEngineFactory.kt b/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr232StandardScriptEngineFactory.kt
similarity index 98%
rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/KotlinJsr232StandardScriptEngineFactory.kt
rename to libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr232StandardScriptEngineFactory.kt
index 9e2cd3e0f70..a2a79e777d8 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/KotlinJsr232StandardScriptEngineFactory.kt
+++ b/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr232StandardScriptEngineFactory.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.cli.jvm.repl
+package org.jetbrains.kotlin.script.jsr223
 
 import com.intellij.openapi.util.Disposer
 import org.jetbrains.kotlin.cli.common.KotlinVersion
diff --git a/compiler/tests/org/jetbrains/kotlin/cli/jvm/repl/KotlinJsr223ScriptEngineTest.kt b/libraries/tools/kotlin-script-util/src/test/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223ScriptEngineTest.kt
similarity index 98%
rename from compiler/tests/org/jetbrains/kotlin/cli/jvm/repl/KotlinJsr223ScriptEngineTest.kt
rename to libraries/tools/kotlin-script-util/src/test/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223ScriptEngineTest.kt
index a1e21569e00..1a3e542a71a 100644
--- a/compiler/tests/org/jetbrains/kotlin/cli/jvm/repl/KotlinJsr223ScriptEngineTest.kt
+++ b/libraries/tools/kotlin-script-util/src/test/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223ScriptEngineTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.cli.jvm.repl
+package org.jetbrains.kotlin.script.jsr223
 
 import junit.framework.TestCase
 import org.jetbrains.kotlin.cli.common.KotlinVersion