diff --git a/.gitignore b/.gitignore
index e61b324f617f..a8f363b4edb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@
 tags
 
 # sbt specific
-dist/*
+dist/target
 target/
 lib_managed/
 src_managed/
diff --git a/build.sbt b/build.sbt
index 878f61787dea..c9169ea8dd75 100644
--- a/build.sbt
+++ b/build.sbt
@@ -6,6 +6,7 @@ val `scala3-compiler-bootstrapped` = Build.`scala3-compiler-bootstrapped`
 val `scala3-library` = Build.`scala3-library`
 val `scala3-library-bootstrapped` = Build.`scala3-library-bootstrapped`
 val `scala3-library-bootstrappedJS` = Build.`scala3-library-bootstrappedJS`
+val `scala3-repl` = Build.`scala3-repl`
 val `scala3-sbt-bridge` = Build.`scala3-sbt-bridge`
 val `scala3-sbt-bridge-tests` = Build.`scala3-sbt-bridge-tests`
 val `scala3-staging` = Build.`scala3-staging`
diff --git a/compiler/src/dotty/tools/dotc/quoted/Interpreter.scala b/compiler/src/dotty/tools/dotc/quoted/Interpreter.scala
index dbf4fe91a970..f1102d026cce 100644
--- a/compiler/src/dotty/tools/dotc/quoted/Interpreter.scala
+++ b/compiler/src/dotty/tools/dotc/quoted/Interpreter.scala
@@ -27,8 +27,8 @@ import dotty.tools.dotc.quoted._
 import dotty.tools.dotc.typer.ImportInfo.withRootImports
 import dotty.tools.dotc.util.SrcPos
 import dotty.tools.dotc.reporting.Message
-import dotty.tools.repl.AbstractFileClassLoader
 import dotty.tools.dotc.core.CyclicReference
+import dotty.tools.io.AbstractFileClassLoader
 
 /** Tree interpreter for metaprogramming constructs */
 class Interpreter(pos: SrcPos, classLoader0: ClassLoader)(using Context):
diff --git a/compiler/src/dotty/tools/dotc/transform/Splicer.scala b/compiler/src/dotty/tools/dotc/transform/Splicer.scala
index 46a8571b4f30..3f0cc91e114f 100644
--- a/compiler/src/dotty/tools/dotc/transform/Splicer.scala
+++ b/compiler/src/dotty/tools/dotc/transform/Splicer.scala
@@ -23,7 +23,6 @@ import dotty.tools.dotc.quoted.Interpreter
 
 import scala.util.control.NonFatal
 import dotty.tools.dotc.util.SrcPos
-import dotty.tools.repl.AbstractFileClassLoader
 
 import scala.reflect.ClassTag
 
diff --git a/compiler/src/dotty/tools/dotc/util/ClasspathFromClassloader.scala b/compiler/src/dotty/tools/dotc/util/ClasspathFromClassloader.scala
index 25def103083d..198499f2593e 100644
--- a/compiler/src/dotty/tools/dotc/util/ClasspathFromClassloader.scala
+++ b/compiler/src/dotty/tools/dotc/util/ClasspathFromClassloader.scala
@@ -5,7 +5,7 @@ import scala.language.unsafeNulls
 import java.net.URLClassLoader
 import java.nio.file.Paths
 
-import dotty.tools.repl.AbstractFileClassLoader
+import dotty.tools.io.AbstractFileClassLoader
 
 object ClasspathFromClassloader {
 
diff --git a/compiler/src/dotty/tools/repl/AbstractFileClassLoader.scala b/compiler/src/dotty/tools/io/AbstractFileClassLoader.scala
similarity index 99%
rename from compiler/src/dotty/tools/repl/AbstractFileClassLoader.scala
rename to compiler/src/dotty/tools/io/AbstractFileClassLoader.scala
index 7a457a1d7546..3b5af99c75fe 100644
--- a/compiler/src/dotty/tools/repl/AbstractFileClassLoader.scala
+++ b/compiler/src/dotty/tools/io/AbstractFileClassLoader.scala
@@ -11,7 +11,7 @@
  */
 
 package dotty.tools
-package repl
+package io
 
 import scala.language.unsafeNulls
 
diff --git a/compiler/test/dotty/tools/repl/AbstractFileClassLoaderTest.scala b/compiler/test/dotty/tools/io/AbstractFileClassLoaderTest.scala
similarity index 99%
rename from compiler/test/dotty/tools/repl/AbstractFileClassLoaderTest.scala
rename to compiler/test/dotty/tools/io/AbstractFileClassLoaderTest.scala
index 27796feb819b..737ee6a463db 100644
--- a/compiler/test/dotty/tools/repl/AbstractFileClassLoaderTest.scala
+++ b/compiler/test/dotty/tools/io/AbstractFileClassLoaderTest.scala
@@ -1,4 +1,5 @@
-package dotty.tools.repl
+package dotty.tools
+package io
 
 import scala.language.unsafeNulls
 
diff --git a/dist/bin/common b/dist/bin/common
index e3e4253938fb..4b1a6f6a7ffe 100755
--- a/dist/bin/common
+++ b/dist/bin/common
@@ -156,6 +156,8 @@ TASTY_CORE=$(find_lib "*tasty-core*")
 SCALA_ASM=$(find_lib "*scala-asm*")
 SCALA_LIB=$(find_lib "*scala-library*")
 SBT_INTF=$(find_lib "*compiler-interface*")
+DOTTY_DIST=$(find_lib "*scala3-dist*")
+DOTTY_REPL=$(find_lib "*scala3-repl*")
 JLINE_READER=$(find_lib "*jline-reader-3*")
 JLINE_TERMINAL=$(find_lib "*jline-terminal-3*")
 JLINE_TERMINAL_JNA=$(find_lib "*jline-terminal-jna-3*")
@@ -182,6 +184,8 @@ compilerJavaClasspathArgs () {
   toolchain+="$TASTY_CORE$PSEP"
   toolchain+="$DOTTY_STAGING$PSEP"
   toolchain+="$DOTTY_TASTY_INSPECTOR$PSEP"
+  toolchain+="$DOTTY_DIST$PSEP"
+  toolchain+="$DOTTY_REPL$PSEP"
 
   # jine
   toolchain+="$JLINE_READER$PSEP"
diff --git a/dist/bin/common.bat b/dist/bin/common.bat
index 7aef606d5509..74e248915c22 100644
--- a/dist/bin/common.bat
+++ b/dist/bin/common.bat
@@ -51,6 +51,8 @@ for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*tasty-core*"')             do
 for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*scala-asm*"')              do set "_SCALA_ASM=%_LIB_DIR%\%%f"
 for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*scala-library*"')          do set "_SCALA_LIB=%_LIB_DIR%\%%f"
 for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*compiler-interface*"')     do set "_SBT_INTF=%_LIB_DIR%\%%f"
+for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*scala3-dist*"')            do set "_SCALA3_DIST=%_LIB_DIR%\%%f"
+for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*scala3-repl*"')            do set "_SCALA3_REPL=%_LIB_DIR%\%%f"
 for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*jline-reader-3*"')         do set "_JLINE_READER=%_LIB_DIR%\%%f"
 for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*jline-terminal-3*"')       do set "_JLINE_TERMINAL=%_LIB_DIR%\%%f"
 for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*jline-terminal-jna-3*"')   do set "_JLINE_TERMINAL_JNA=%_LIB_DIR%\%%f"
diff --git a/dist/bin/scala.bat b/dist/bin/scala.bat
index ca908fd340be..5911fdd45c64 100644
--- a/dist/bin/scala.bat
+++ b/dist/bin/scala.bat
@@ -73,6 +73,8 @@ set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_COMP%%_PSEP%"
 set "__TOOLCHAIN=%__TOOLCHAIN%%_TASTY_CORE%%_PSEP%"
 set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_STAGING%%_PSEP%"
 set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_TASTY_INSPECTOR%%_PSEP%"
+set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_DIST%%_PSEP%"
+set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_REPL%%_PSEP%"
 
 @rem # jline
 set "__TOOLCHAIN=%__TOOLCHAIN%%_JLINE_READER%%_PSEP%"
diff --git a/dist/bin/scalac.bat b/dist/bin/scalac.bat
index 454158c85666..fb5f185d587d 100644
--- a/dist/bin/scalac.bat
+++ b/dist/bin/scalac.bat
@@ -102,6 +102,8 @@ set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_COMP%%_PSEP%"
 set "__TOOLCHAIN=%__TOOLCHAIN%%_TASTY_CORE%%_PSEP%"
 set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_STAGING%%_PSEP%"
 set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_TASTY_INSPECTOR%%_PSEP%"
+set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_DIST%%_PSEP%"
+set "__TOOLCHAIN=%__TOOLCHAIN%%_SCALA3_REPL%%_PSEP%"
 
 @rem # jline
 set "__TOOLCHAIN=%__TOOLCHAIN%%_JLINE_READER%%_PSEP%"
diff --git a/dist/bin/scaladoc b/dist/bin/scaladoc
index 8b9ec41a7f8c..89b571011146 100755
--- a/dist/bin/scaladoc
+++ b/dist/bin/scaladoc
@@ -60,6 +60,8 @@ classpathArgs () {
   CLASS_PATH+="$(find_lib "*scala3-library*")$PSEP"
   CLASS_PATH+="$(find_lib "*tasty-core*")$PSEP"
   CLASS_PATH+="$(find_lib "*scala3-tasty-inspector*")$PSEP"
+  CLASS_PATH+="$(find_lib "*scala3-repl*")$PSEP"
+  CLASS_PATH+="$(find_lib "*scala3-dist*")$PSEP"
   CLASS_PATH+="$(find_lib "*flexmark-0*")$PSEP"
   CLASS_PATH+="$(find_lib "*flexmark*")$PSEP"
   CLASS_PATH+="$(find_lib "*flexmark-ext-anchorlink*")$PSEP"
diff --git a/dist/bin/scaladoc.bat b/dist/bin/scaladoc.bat
index bcc0d71788a3..74bba9c02b8f 100644
--- a/dist/bin/scaladoc.bat
+++ b/dist/bin/scaladoc.bat
@@ -110,6 +110,8 @@ call :updateClasspath "scala3-interfaces"
 call :updateClasspath "scala3-library"
 call :updateClasspath "tasty-core"
 call :updateClasspath "scala3-tasty-inspector"
+call :updateClasspath "scala3-repl"
+call :updateClasspath "scala3-dist"
 call :updateClasspath "flexmark-0"
 call :updateClasspath "flexmark-html-parser"
 call :updateClasspath "flexmark-ext-anchorlink"
diff --git a/compiler/src/dotty/tools/MainGenericCompiler.scala b/dist/src/dotty/tools/MainGenericCompiler.scala
similarity index 99%
rename from compiler/src/dotty/tools/MainGenericCompiler.scala
rename to dist/src/dotty/tools/MainGenericCompiler.scala
index aa924a237f73..a1e344a65ffa 100644
--- a/compiler/src/dotty/tools/MainGenericCompiler.scala
+++ b/dist/src/dotty/tools/MainGenericCompiler.scala
@@ -15,6 +15,8 @@ import dotty.tools.io.Jar
 import dotty.tools.runner.ScalaClassLoader
 import java.nio.file.Paths
 import dotty.tools.dotc.config.CommandLineParser
+import dotty.tools.repl
+import dotty.tools.scripting
 import dotty.tools.scripting.StringDriver
 
 enum CompileMode:
diff --git a/compiler/src/dotty/tools/MainGenericRunner.scala b/dist/src/dotty/tools/MainGenericRunner.scala
similarity index 99%
rename from compiler/src/dotty/tools/MainGenericRunner.scala
rename to dist/src/dotty/tools/MainGenericRunner.scala
index 6f4366a00b77..7c96a1a70743 100644
--- a/compiler/src/dotty/tools/MainGenericRunner.scala
+++ b/dist/src/dotty/tools/MainGenericRunner.scala
@@ -15,6 +15,8 @@ import dotty.tools.io.Jar
 import dotty.tools.runner.ScalaClassLoader
 import java.nio.file.Paths
 import dotty.tools.dotc.config.CommandLineParser
+import dotty.tools.repl
+import dotty.tools.scripting
 import dotty.tools.scripting.{StringDriver, StringDriverException, ScriptingException}
 
 enum ExecuteMode:
diff --git a/project/Build.scala b/project/Build.scala
index ee1ed242e1b2..e25402d819f9 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -596,9 +596,6 @@ object Build {
       libraryDependencies ++= Seq(
         "org.scala-lang.modules" % "scala-asm" % "9.5.0-scala-1", // used by the backend
         Dependencies.compilerInterface,
-        "org.jline" % "jline-reader" % "3.19.0",   // used by the REPL
-        "org.jline" % "jline-terminal" % "3.19.0",
-        "org.jline" % "jline-terminal-jna" % "3.19.0", // needed for Windows
         ("io.get-coursier" %% "coursier" % "2.0.16" % Test).cross(CrossVersion.for3Use2_13),
       ),
 
@@ -642,8 +639,6 @@ object Build {
           "-Ddotty.tests.classes.compilerInterface=" + findArtifactPath(externalDeps, "compiler-interface"),
           "-Ddotty.tests.classes.scalaLibrary=" + findArtifactPath(externalDeps, "scala-library"),
           "-Ddotty.tests.classes.scalaAsm=" + findArtifactPath(externalDeps, "scala-asm"),
-          "-Ddotty.tests.classes.jlineTerminal=" + findArtifactPath(externalDeps, "jline-terminal"),
-          "-Ddotty.tests.classes.jlineReader=" + findArtifactPath(externalDeps, "jline-reader"),
         )
       },
 
@@ -896,6 +891,24 @@ object Build {
   lazy val `scala3-library` = project.in(file("library")).asDottyLibrary(NonBootstrapped)
   lazy val `scala3-library-bootstrapped`: Project = project.in(file("library")).asDottyLibrary(Bootstrapped)
 
+  lazy val `scala3-repl` = project.in(file("repl")).
+    asDottyLibrary(NonBootstrapped).
+    dependsOn(`scala3-compiler` % "compile->compile;test->test").
+    settings(
+      libraryDependencies ++= Seq(
+        "org.jline" % "jline-reader" % "3.19.0",
+        "org.jline" % "jline-terminal" % "3.19.0",
+        "org.jline" % "jline-terminal-jna" % "3.19.0", // needed for Windows
+      ),
+      javaOptions ++= {
+        val externalDeps = externalCompilerClasspathTask.value
+        Seq(
+          "-Ddotty.tests.classes.jlineTerminal=" + findArtifactPath(externalDeps, "jline-terminal"),
+          "-Ddotty.tests.classes.jlineReader=" + findArtifactPath(externalDeps, "jline-reader"),
+        )
+      }
+    )
+
   def dottyLibrary(implicit mode: Mode): Project = mode match {
     case NonBootstrapped => `scala3-library`
     case Bootstrapped => `scala3-library-bootstrapped`
@@ -954,6 +967,7 @@ object Build {
     // when compiling a project that depends on scala3-staging (see sbt-test/sbt-dotty/quoted-example-project),
     // but we always need it to be present on the JVM classpath at runtime.
     dependsOn(dottyCompiler(Bootstrapped) % "provided; compile->runtime; test->test").
+    dependsOn(`scala3-repl` % "test->test").
     settings(
       javaOptions := (`scala3-compiler-bootstrapped` / javaOptions).value
     )
@@ -1164,7 +1178,7 @@ object Build {
   lazy val `scala3-sbt-bridge` = project.in(file("sbt-bridge/src")).
     // We cannot depend on any bootstrapped project to compile the bridge, since the
     // bridge is needed to compile these projects.
-    dependsOn(`scala3-compiler` % Provided).
+    dependsOn(`scala3-compiler` % Provided, `scala3-repl` % Provided).
     settings(commonJavaSettings).
     settings(
       description := "sbt compiler bridge for Dotty",
@@ -1272,6 +1286,7 @@ object Build {
 
   lazy val `scala3-language-server` = project.in(file("language-server")).
     dependsOn(dottyCompiler(Bootstrapped)).
+    dependsOn(`scala3-repl`).
     settings(commonBootstrappedSettings).
     settings(
       libraryDependencies ++= Seq(
@@ -1976,8 +1991,8 @@ object Build {
   )
 
   lazy val commonDistSettings = Seq(
+    name := "scala3-dist",
     packMain := Map(),
-    publishArtifact := false,
     packGenerateMakefile := false,
     packExpandedClasspath := true,
     packArchiveName := "scala3-" + dottyVersion
@@ -2076,7 +2091,7 @@ object Build {
     def asDist(implicit mode: Mode): Project = project.
       enablePlugins(PackPlugin).
       withCommonSettings.
-      dependsOn(`scala3-interfaces`, dottyCompiler, dottyLibrary, tastyCore, `scala3-staging`, `scala3-tasty-inspector`, scaladoc).
+      dependsOn(`scala3-interfaces`, dottyCompiler, dottyLibrary, tastyCore, `scala3-staging`, `scala3-tasty-inspector`, `scala3-repl`, scaladoc).
       settings(commonDistSettings).
       bootstrappedSettings(
         target := baseDirectory.value / "target" // override setting in commonBootstrappedSettings
diff --git a/compiler/resources/META-INF/services/javax.script.ScriptEngineFactory b/repl/resources/META-INF/services/javax.script.ScriptEngineFactory
similarity index 100%
rename from compiler/resources/META-INF/services/javax.script.ScriptEngineFactory
rename to repl/resources/META-INF/services/javax.script.ScriptEngineFactory
diff --git a/compiler/src/dotty/tools/repl/CollectTopLevelImports.scala b/repl/src/dotty/tools/repl/CollectTopLevelImports.scala
similarity index 100%
rename from compiler/src/dotty/tools/repl/CollectTopLevelImports.scala
rename to repl/src/dotty/tools/repl/CollectTopLevelImports.scala
diff --git a/compiler/src/dotty/tools/repl/JLineTerminal.scala b/repl/src/dotty/tools/repl/JLineTerminal.scala
similarity index 100%
rename from compiler/src/dotty/tools/repl/JLineTerminal.scala
rename to repl/src/dotty/tools/repl/JLineTerminal.scala
diff --git a/compiler/src/dotty/tools/repl/Main.scala b/repl/src/dotty/tools/repl/Main.scala
similarity index 100%
rename from compiler/src/dotty/tools/repl/Main.scala
rename to repl/src/dotty/tools/repl/Main.scala
diff --git a/compiler/src/dotty/tools/repl/ParseResult.scala b/repl/src/dotty/tools/repl/ParseResult.scala
similarity index 100%
rename from compiler/src/dotty/tools/repl/ParseResult.scala
rename to repl/src/dotty/tools/repl/ParseResult.scala
diff --git a/compiler/src/dotty/tools/repl/Rendering.scala b/repl/src/dotty/tools/repl/Rendering.scala
similarity index 99%
rename from compiler/src/dotty/tools/repl/Rendering.scala
rename to repl/src/dotty/tools/repl/Rendering.scala
index c647ef302bb9..800a4c1d83fd 100644
--- a/compiler/src/dotty/tools/repl/Rendering.scala
+++ b/repl/src/dotty/tools/repl/Rendering.scala
@@ -4,6 +4,7 @@ package repl
 import scala.language.unsafeNulls
 
 import dotc.*, core.*
+import dotty.tools.io.AbstractFileClassLoader
 import Contexts.*, Denotations.*, Flags.*, NameOps.*, StdNames.*, Symbols.*
 import printing.ReplPrinter
 import reporting.Diagnostic
diff --git a/compiler/src/dotty/tools/repl/ReplCommand.scala b/repl/src/dotty/tools/repl/ReplCommand.scala
similarity index 100%
rename from compiler/src/dotty/tools/repl/ReplCommand.scala
rename to repl/src/dotty/tools/repl/ReplCommand.scala
diff --git a/compiler/src/dotty/tools/repl/ReplCompiler.scala b/repl/src/dotty/tools/repl/ReplCompiler.scala
similarity index 100%
rename from compiler/src/dotty/tools/repl/ReplCompiler.scala
rename to repl/src/dotty/tools/repl/ReplCompiler.scala
diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/repl/src/dotty/tools/repl/ReplDriver.scala
similarity index 100%
rename from compiler/src/dotty/tools/repl/ReplDriver.scala
rename to repl/src/dotty/tools/repl/ReplDriver.scala
diff --git a/compiler/src/dotty/tools/repl/ScriptEngine.scala b/repl/src/dotty/tools/repl/ScriptEngine.scala
similarity index 100%
rename from compiler/src/dotty/tools/repl/ScriptEngine.scala
rename to repl/src/dotty/tools/repl/ScriptEngine.scala
diff --git a/compiler/src/dotty/tools/repl/package.scala b/repl/src/dotty/tools/repl/package.scala
similarity index 100%
rename from compiler/src/dotty/tools/repl/package.scala
rename to repl/src/dotty/tools/repl/package.scala
diff --git a/compiler/src/dotty/tools/repl/results.scala b/repl/src/dotty/tools/repl/results.scala
similarity index 100%
rename from compiler/src/dotty/tools/repl/results.scala
rename to repl/src/dotty/tools/repl/results.scala
diff --git a/compiler/test-resources/pending/repl/i2554 b/repl/test-resources/pending/repl/i2554
similarity index 100%
rename from compiler/test-resources/pending/repl/i2554
rename to repl/test-resources/pending/repl/i2554
diff --git a/compiler/test-resources/pending/repl/i4539 b/repl/test-resources/pending/repl/i4539
similarity index 100%
rename from compiler/test-resources/pending/repl/i4539
rename to repl/test-resources/pending/repl/i4539
diff --git a/compiler/test-resources/repl/10886 b/repl/test-resources/repl/10886
similarity index 100%
rename from compiler/test-resources/repl/10886
rename to repl/test-resources/repl/10886
diff --git a/compiler/test-resources/repl/1379 b/repl/test-resources/repl/1379
similarity index 100%
rename from compiler/test-resources/repl/1379
rename to repl/test-resources/repl/1379
diff --git a/compiler/test-resources/repl/3932 b/repl/test-resources/repl/3932
similarity index 100%
rename from compiler/test-resources/repl/3932
rename to repl/test-resources/repl/3932
diff --git a/compiler/test-resources/repl/7472 b/repl/test-resources/repl/7472
similarity index 100%
rename from compiler/test-resources/repl/7472
rename to repl/test-resources/repl/7472
diff --git a/compiler/test-resources/repl/commandPrefixes b/repl/test-resources/repl/commandPrefixes
similarity index 100%
rename from compiler/test-resources/repl/commandPrefixes
rename to repl/test-resources/repl/commandPrefixes
diff --git a/compiler/test-resources/repl/defaultClassloader b/repl/test-resources/repl/defaultClassloader
similarity index 100%
rename from compiler/test-resources/repl/defaultClassloader
rename to repl/test-resources/repl/defaultClassloader
diff --git a/compiler/test-resources/repl/defs b/repl/test-resources/repl/defs
similarity index 100%
rename from compiler/test-resources/repl/defs
rename to repl/test-resources/repl/defs
diff --git a/compiler/test-resources/repl/erased b/repl/test-resources/repl/erased
similarity index 100%
rename from compiler/test-resources/repl/erased
rename to repl/test-resources/repl/erased
diff --git a/compiler/test-resources/repl/erased-implicit b/repl/test-resources/repl/erased-implicit
similarity index 100%
rename from compiler/test-resources/repl/erased-implicit
rename to repl/test-resources/repl/erased-implicit
diff --git a/compiler/test-resources/repl/errmsgs b/repl/test-resources/repl/errmsgs
similarity index 100%
rename from compiler/test-resources/repl/errmsgs
rename to repl/test-resources/repl/errmsgs
diff --git a/compiler/test-resources/repl/functions b/repl/test-resources/repl/functions
similarity index 100%
rename from compiler/test-resources/repl/functions
rename to repl/test-resources/repl/functions
diff --git a/compiler/test-resources/repl/getClass b/repl/test-resources/repl/getClass
similarity index 100%
rename from compiler/test-resources/repl/getClass
rename to repl/test-resources/repl/getClass
diff --git a/compiler/test-resources/repl/i10044 b/repl/test-resources/repl/i10044
similarity index 100%
rename from compiler/test-resources/repl/i10044
rename to repl/test-resources/repl/i10044
diff --git a/compiler/test-resources/repl/i10355 b/repl/test-resources/repl/i10355
similarity index 100%
rename from compiler/test-resources/repl/i10355
rename to repl/test-resources/repl/i10355
diff --git a/compiler/test-resources/repl/i11146 b/repl/test-resources/repl/i11146
similarity index 100%
rename from compiler/test-resources/repl/i11146
rename to repl/test-resources/repl/i11146
diff --git a/compiler/test-resources/repl/i13181 b/repl/test-resources/repl/i13181
similarity index 100%
rename from compiler/test-resources/repl/i13181
rename to repl/test-resources/repl/i13181
diff --git a/compiler/test-resources/repl/i13208.default.scala b/repl/test-resources/repl/i13208.default.scala
similarity index 100%
rename from compiler/test-resources/repl/i13208.default.scala
rename to repl/test-resources/repl/i13208.default.scala
diff --git a/compiler/test-resources/repl/i13208.scala b/repl/test-resources/repl/i13208.scala
similarity index 100%
rename from compiler/test-resources/repl/i13208.scala
rename to repl/test-resources/repl/i13208.scala
diff --git a/compiler/test-resources/repl/i1369 b/repl/test-resources/repl/i1369
similarity index 100%
rename from compiler/test-resources/repl/i1369
rename to repl/test-resources/repl/i1369
diff --git a/compiler/test-resources/repl/i1370 b/repl/test-resources/repl/i1370
similarity index 100%
rename from compiler/test-resources/repl/i1370
rename to repl/test-resources/repl/i1370
diff --git a/compiler/test-resources/repl/i1374 b/repl/test-resources/repl/i1374
similarity index 100%
rename from compiler/test-resources/repl/i1374
rename to repl/test-resources/repl/i1374
diff --git a/compiler/test-resources/repl/i1433 b/repl/test-resources/repl/i1433
similarity index 100%
rename from compiler/test-resources/repl/i1433
rename to repl/test-resources/repl/i1433
diff --git a/compiler/test-resources/repl/i14540 b/repl/test-resources/repl/i14540
similarity index 100%
rename from compiler/test-resources/repl/i14540
rename to repl/test-resources/repl/i14540
diff --git a/compiler/test-resources/repl/i15493 b/repl/test-resources/repl/i15493
similarity index 100%
rename from compiler/test-resources/repl/i15493
rename to repl/test-resources/repl/i15493
diff --git a/compiler/test-resources/repl/i17231 b/repl/test-resources/repl/i17231
similarity index 100%
rename from compiler/test-resources/repl/i17231
rename to repl/test-resources/repl/i17231
diff --git a/compiler/test-resources/repl/i1854 b/repl/test-resources/repl/i1854
similarity index 100%
rename from compiler/test-resources/repl/i1854
rename to repl/test-resources/repl/i1854
diff --git a/compiler/test-resources/repl/i2063 b/repl/test-resources/repl/i2063
similarity index 100%
rename from compiler/test-resources/repl/i2063
rename to repl/test-resources/repl/i2063
diff --git a/compiler/test-resources/repl/i2213 b/repl/test-resources/repl/i2213
similarity index 100%
rename from compiler/test-resources/repl/i2213
rename to repl/test-resources/repl/i2213
diff --git a/compiler/test-resources/repl/i2310 b/repl/test-resources/repl/i2310
similarity index 100%
rename from compiler/test-resources/repl/i2310
rename to repl/test-resources/repl/i2310
diff --git a/compiler/test-resources/repl/i2462 b/repl/test-resources/repl/i2462
similarity index 100%
rename from compiler/test-resources/repl/i2462
rename to repl/test-resources/repl/i2462
diff --git a/compiler/test-resources/repl/i2631 b/repl/test-resources/repl/i2631
similarity index 100%
rename from compiler/test-resources/repl/i2631
rename to repl/test-resources/repl/i2631
diff --git a/compiler/test-resources/repl/i2977 b/repl/test-resources/repl/i2977
similarity index 100%
rename from compiler/test-resources/repl/i2977
rename to repl/test-resources/repl/i2977
diff --git a/compiler/test-resources/repl/i3388 b/repl/test-resources/repl/i3388
similarity index 100%
rename from compiler/test-resources/repl/i3388
rename to repl/test-resources/repl/i3388
diff --git a/compiler/test-resources/repl/i3536 b/repl/test-resources/repl/i3536
similarity index 100%
rename from compiler/test-resources/repl/i3536
rename to repl/test-resources/repl/i3536
diff --git a/compiler/test-resources/repl/i3536_bind b/repl/test-resources/repl/i3536_bind
similarity index 100%
rename from compiler/test-resources/repl/i3536_bind
rename to repl/test-resources/repl/i3536_bind
diff --git a/compiler/test-resources/repl/i3536_defdef b/repl/test-resources/repl/i3536_defdef
similarity index 100%
rename from compiler/test-resources/repl/i3536_defdef
rename to repl/test-resources/repl/i3536_defdef
diff --git a/compiler/test-resources/repl/i3536_object b/repl/test-resources/repl/i3536_object
similarity index 100%
rename from compiler/test-resources/repl/i3536_object
rename to repl/test-resources/repl/i3536_object
diff --git a/compiler/test-resources/repl/i3536_patterndef_some b/repl/test-resources/repl/i3536_patterndef_some
similarity index 100%
rename from compiler/test-resources/repl/i3536_patterndef_some
rename to repl/test-resources/repl/i3536_patterndef_some
diff --git a/compiler/test-resources/repl/i3536_patterndef_tuple b/repl/test-resources/repl/i3536_patterndef_tuple
similarity index 100%
rename from compiler/test-resources/repl/i3536_patterndef_tuple
rename to repl/test-resources/repl/i3536_patterndef_tuple
diff --git a/compiler/test-resources/repl/i3536_typedef b/repl/test-resources/repl/i3536_typedef
similarity index 100%
rename from compiler/test-resources/repl/i3536_typedef
rename to repl/test-resources/repl/i3536_typedef
diff --git a/compiler/test-resources/repl/i3536_var b/repl/test-resources/repl/i3536_var
similarity index 100%
rename from compiler/test-resources/repl/i3536_var
rename to repl/test-resources/repl/i3536_var
diff --git a/compiler/test-resources/repl/i3966 b/repl/test-resources/repl/i3966
similarity index 100%
rename from compiler/test-resources/repl/i3966
rename to repl/test-resources/repl/i3966
diff --git a/compiler/test-resources/repl/i4010 b/repl/test-resources/repl/i4010
similarity index 100%
rename from compiler/test-resources/repl/i4010
rename to repl/test-resources/repl/i4010
diff --git a/compiler/test-resources/repl/i4184 b/repl/test-resources/repl/i4184
similarity index 100%
rename from compiler/test-resources/repl/i4184
rename to repl/test-resources/repl/i4184
diff --git a/compiler/test-resources/repl/i4217 b/repl/test-resources/repl/i4217
similarity index 100%
rename from compiler/test-resources/repl/i4217
rename to repl/test-resources/repl/i4217
diff --git a/compiler/test-resources/repl/i4301 b/repl/test-resources/repl/i4301
similarity index 100%
rename from compiler/test-resources/repl/i4301
rename to repl/test-resources/repl/i4301
diff --git a/compiler/test-resources/repl/i4566 b/repl/test-resources/repl/i4566
similarity index 100%
rename from compiler/test-resources/repl/i4566
rename to repl/test-resources/repl/i4566
diff --git a/compiler/test-resources/repl/i4852 b/repl/test-resources/repl/i4852
similarity index 100%
rename from compiler/test-resources/repl/i4852
rename to repl/test-resources/repl/i4852
diff --git a/compiler/test-resources/repl/i5218 b/repl/test-resources/repl/i5218
similarity index 100%
rename from compiler/test-resources/repl/i5218
rename to repl/test-resources/repl/i5218
diff --git a/compiler/test-resources/repl/i5345 b/repl/test-resources/repl/i5345
similarity index 100%
rename from compiler/test-resources/repl/i5345
rename to repl/test-resources/repl/i5345
diff --git a/compiler/test-resources/repl/i5350 b/repl/test-resources/repl/i5350
similarity index 100%
rename from compiler/test-resources/repl/i5350
rename to repl/test-resources/repl/i5350
diff --git a/compiler/test-resources/repl/i5733 b/repl/test-resources/repl/i5733
similarity index 100%
rename from compiler/test-resources/repl/i5733
rename to repl/test-resources/repl/i5733
diff --git a/compiler/test-resources/repl/i5890 b/repl/test-resources/repl/i5890
similarity index 100%
rename from compiler/test-resources/repl/i5890
rename to repl/test-resources/repl/i5890
diff --git a/compiler/test-resources/repl/i6474 b/repl/test-resources/repl/i6474
similarity index 100%
rename from compiler/test-resources/repl/i6474
rename to repl/test-resources/repl/i6474
diff --git a/compiler/test-resources/repl/i6643 b/repl/test-resources/repl/i6643
similarity index 100%
rename from compiler/test-resources/repl/i6643
rename to repl/test-resources/repl/i6643
diff --git a/compiler/test-resources/repl/i6676 b/repl/test-resources/repl/i6676
similarity index 100%
rename from compiler/test-resources/repl/i6676
rename to repl/test-resources/repl/i6676
diff --git a/compiler/test-resources/repl/i6986 b/repl/test-resources/repl/i6986
similarity index 100%
rename from compiler/test-resources/repl/i6986
rename to repl/test-resources/repl/i6986
diff --git a/compiler/test-resources/repl/i7410 b/repl/test-resources/repl/i7410
similarity index 100%
rename from compiler/test-resources/repl/i7410
rename to repl/test-resources/repl/i7410
diff --git a/compiler/test-resources/repl/i7644 b/repl/test-resources/repl/i7644
similarity index 100%
rename from compiler/test-resources/repl/i7644
rename to repl/test-resources/repl/i7644
diff --git a/compiler/test-resources/repl/i8548 b/repl/test-resources/repl/i8548
similarity index 100%
rename from compiler/test-resources/repl/i8548
rename to repl/test-resources/repl/i8548
diff --git a/compiler/test-resources/repl/i9102 b/repl/test-resources/repl/i9102
similarity index 100%
rename from compiler/test-resources/repl/i9102
rename to repl/test-resources/repl/i9102
diff --git a/compiler/test-resources/repl/i9227 b/repl/test-resources/repl/i9227
similarity index 100%
rename from compiler/test-resources/repl/i9227
rename to repl/test-resources/repl/i9227
diff --git a/compiler/test-resources/repl/i9538 b/repl/test-resources/repl/i9538
similarity index 100%
rename from compiler/test-resources/repl/i9538
rename to repl/test-resources/repl/i9538
diff --git a/compiler/test-resources/repl/import b/repl/test-resources/repl/import
similarity index 100%
rename from compiler/test-resources/repl/import
rename to repl/test-resources/repl/import
diff --git a/compiler/test-resources/repl/import-shadowing b/repl/test-resources/repl/import-shadowing
similarity index 100%
rename from compiler/test-resources/repl/import-shadowing
rename to repl/test-resources/repl/import-shadowing
diff --git a/compiler/test-resources/repl/importFromObj b/repl/test-resources/repl/importFromObj
similarity index 100%
rename from compiler/test-resources/repl/importFromObj
rename to repl/test-resources/repl/importFromObj
diff --git a/compiler/test-resources/repl/innerClasses b/repl/test-resources/repl/innerClasses
similarity index 100%
rename from compiler/test-resources/repl/innerClasses
rename to repl/test-resources/repl/innerClasses
diff --git a/compiler/test-resources/repl/notFound b/repl/test-resources/repl/notFound
similarity index 100%
rename from compiler/test-resources/repl/notFound
rename to repl/test-resources/repl/notFound
diff --git a/compiler/test-resources/repl/nowarn.scala b/repl/test-resources/repl/nowarn.scala
similarity index 100%
rename from compiler/test-resources/repl/nowarn.scala
rename to repl/test-resources/repl/nowarn.scala
diff --git a/compiler/test-resources/repl/onePlusOne b/repl/test-resources/repl/onePlusOne
similarity index 100%
rename from compiler/test-resources/repl/onePlusOne
rename to repl/test-resources/repl/onePlusOne
diff --git a/compiler/test-resources/repl/outputStream b/repl/test-resources/repl/outputStream
similarity index 100%
rename from compiler/test-resources/repl/outputStream
rename to repl/test-resources/repl/outputStream
diff --git a/compiler/test-resources/repl/overrides b/repl/test-resources/repl/overrides
similarity index 100%
rename from compiler/test-resources/repl/overrides
rename to repl/test-resources/repl/overrides
diff --git a/compiler/test-resources/repl/parsing b/repl/test-resources/repl/parsing
similarity index 100%
rename from compiler/test-resources/repl/parsing
rename to repl/test-resources/repl/parsing
diff --git a/compiler/test-resources/repl/patdef b/repl/test-resources/repl/patdef
similarity index 100%
rename from compiler/test-resources/repl/patdef
rename to repl/test-resources/repl/patdef
diff --git a/compiler/test-resources/repl/renderArray b/repl/test-resources/repl/renderArray
similarity index 100%
rename from compiler/test-resources/repl/renderArray
rename to repl/test-resources/repl/renderArray
diff --git a/compiler/test-resources/repl/renderEmptyString b/repl/test-resources/repl/renderEmptyString
similarity index 100%
rename from compiler/test-resources/repl/renderEmptyString
rename to repl/test-resources/repl/renderEmptyString
diff --git a/compiler/test-resources/repl/renderNothing b/repl/test-resources/repl/renderNothing
similarity index 100%
rename from compiler/test-resources/repl/renderNothing
rename to repl/test-resources/repl/renderNothing
diff --git a/compiler/test-resources/repl/renderNull b/repl/test-resources/repl/renderNull
similarity index 100%
rename from compiler/test-resources/repl/renderNull
rename to repl/test-resources/repl/renderNull
diff --git a/compiler/test-resources/repl/reset-command b/repl/test-resources/repl/reset-command
similarity index 100%
rename from compiler/test-resources/repl/reset-command
rename to repl/test-resources/repl/reset-command
diff --git a/compiler/test-resources/repl/rewrite-messages b/repl/test-resources/repl/rewrite-messages
similarity index 100%
rename from compiler/test-resources/repl/rewrite-messages
rename to repl/test-resources/repl/rewrite-messages
diff --git a/compiler/test-resources/repl/settings-command b/repl/test-resources/repl/settings-command
similarity index 100%
rename from compiler/test-resources/repl/settings-command
rename to repl/test-resources/repl/settings-command
diff --git a/compiler/test-resources/repl/settings-outputDir b/repl/test-resources/repl/settings-outputDir
similarity index 100%
rename from compiler/test-resources/repl/settings-outputDir
rename to repl/test-resources/repl/settings-outputDir
diff --git a/compiler/test-resources/repl/settings-repl-disable-display b/repl/test-resources/repl/settings-repl-disable-display
similarity index 100%
rename from compiler/test-resources/repl/settings-repl-disable-display
rename to repl/test-resources/repl/settings-repl-disable-display
diff --git a/compiler/test-resources/repl/settings-repl-max-print-both-truncation-settings b/repl/test-resources/repl/settings-repl-max-print-both-truncation-settings
similarity index 100%
rename from compiler/test-resources/repl/settings-repl-max-print-both-truncation-settings
rename to repl/test-resources/repl/settings-repl-max-print-both-truncation-settings
diff --git a/compiler/test-resources/repl/settings-repl-max-print-characters b/repl/test-resources/repl/settings-repl-max-print-characters
similarity index 100%
rename from compiler/test-resources/repl/settings-repl-max-print-characters
rename to repl/test-resources/repl/settings-repl-max-print-characters
diff --git a/compiler/test-resources/repl/settings-repl-max-print-elements b/repl/test-resources/repl/settings-repl-max-print-elements
similarity index 100%
rename from compiler/test-resources/repl/settings-repl-max-print-elements
rename to repl/test-resources/repl/settings-repl-max-print-elements
diff --git a/compiler/test-resources/repl/top-level-block b/repl/test-resources/repl/top-level-block
similarity index 100%
rename from compiler/test-resources/repl/top-level-block
rename to repl/test-resources/repl/top-level-block
diff --git a/compiler/test-resources/repl/toplevelTry b/repl/test-resources/repl/toplevelTry
similarity index 100%
rename from compiler/test-resources/repl/toplevelTry
rename to repl/test-resources/repl/toplevelTry
diff --git a/compiler/test-resources/repl/unicodeChars b/repl/test-resources/repl/unicodeChars
similarity index 100%
rename from compiler/test-resources/repl/unicodeChars
rename to repl/test-resources/repl/unicodeChars
diff --git a/compiler/test-resources/repl/valueClassMember b/repl/test-resources/repl/valueClassMember
similarity index 100%
rename from compiler/test-resources/repl/valueClassMember
rename to repl/test-resources/repl/valueClassMember
diff --git a/compiler/test-resources/repl/varOrder b/repl/test-resources/repl/varOrder
similarity index 100%
rename from compiler/test-resources/repl/varOrder
rename to repl/test-resources/repl/varOrder
diff --git a/compiler/test-resources/repl-macros/i15104a b/repl/test/dotty/tools/repl-macros/i15104a
similarity index 100%
rename from compiler/test-resources/repl-macros/i15104a
rename to repl/test/dotty/tools/repl-macros/i15104a
diff --git a/compiler/test-resources/repl-macros/i15104b b/repl/test/dotty/tools/repl-macros/i15104b
similarity index 100%
rename from compiler/test-resources/repl-macros/i15104b
rename to repl/test/dotty/tools/repl-macros/i15104b
diff --git a/compiler/test-resources/repl-macros/i15104c b/repl/test/dotty/tools/repl-macros/i15104c
similarity index 100%
rename from compiler/test-resources/repl-macros/i15104c
rename to repl/test/dotty/tools/repl-macros/i15104c
diff --git a/compiler/test-resources/repl-macros/i5551 b/repl/test/dotty/tools/repl-macros/i5551
similarity index 100%
rename from compiler/test-resources/repl-macros/i5551
rename to repl/test/dotty/tools/repl-macros/i5551
diff --git a/compiler/test/dotty/tools/repl/DocTests.scala b/repl/test/dotty/tools/repl/DocTests.scala
similarity index 100%
rename from compiler/test/dotty/tools/repl/DocTests.scala
rename to repl/test/dotty/tools/repl/DocTests.scala
diff --git a/compiler/test/dotty/tools/repl/JavaDefinedTests.scala b/repl/test/dotty/tools/repl/JavaDefinedTests.scala
similarity index 100%
rename from compiler/test/dotty/tools/repl/JavaDefinedTests.scala
rename to repl/test/dotty/tools/repl/JavaDefinedTests.scala
diff --git a/compiler/test/dotty/tools/repl/LoadTests.scala b/repl/test/dotty/tools/repl/LoadTests.scala
similarity index 100%
rename from compiler/test/dotty/tools/repl/LoadTests.scala
rename to repl/test/dotty/tools/repl/LoadTests.scala
diff --git a/compiler/test/dotty/tools/repl/ReplCompilerTests.scala b/repl/test/dotty/tools/repl/ReplCompilerTests.scala
similarity index 100%
rename from compiler/test/dotty/tools/repl/ReplCompilerTests.scala
rename to repl/test/dotty/tools/repl/ReplCompilerTests.scala
diff --git a/compiler/test/dotty/tools/repl/ReplTest.scala b/repl/test/dotty/tools/repl/ReplTest.scala
similarity index 100%
rename from compiler/test/dotty/tools/repl/ReplTest.scala
rename to repl/test/dotty/tools/repl/ReplTest.scala
diff --git a/compiler/test/dotty/tools/repl/ScriptedTests.scala b/repl/test/dotty/tools/repl/ScriptedTests.scala
similarity index 100%
rename from compiler/test/dotty/tools/repl/ScriptedTests.scala
rename to repl/test/dotty/tools/repl/ScriptedTests.scala
diff --git a/compiler/test/dotty/tools/repl/ShadowingBatchTests.scala b/repl/test/dotty/tools/repl/ShadowingBatchTests.scala
similarity index 100%
rename from compiler/test/dotty/tools/repl/ShadowingBatchTests.scala
rename to repl/test/dotty/tools/repl/ShadowingBatchTests.scala
diff --git a/compiler/test/dotty/tools/repl/ShadowingTests.scala b/repl/test/dotty/tools/repl/ShadowingTests.scala
similarity index 100%
rename from compiler/test/dotty/tools/repl/ShadowingTests.scala
rename to repl/test/dotty/tools/repl/ShadowingTests.scala
diff --git a/compiler/test/dotty/tools/repl/TabcompleteTests.scala b/repl/test/dotty/tools/repl/TabcompleteTests.scala
similarity index 100%
rename from compiler/test/dotty/tools/repl/TabcompleteTests.scala
rename to repl/test/dotty/tools/repl/TabcompleteTests.scala
diff --git a/compiler/test/dotty/tools/repl/TypeTests.scala b/repl/test/dotty/tools/repl/TypeTests.scala
similarity index 100%
rename from compiler/test/dotty/tools/repl/TypeTests.scala
rename to repl/test/dotty/tools/repl/TypeTests.scala
diff --git a/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetCompiler.scala b/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetCompiler.scala
index 03fdd4e849ff..51d89236e5aa 100644
--- a/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetCompiler.scala
+++ b/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetCompiler.scala
@@ -12,8 +12,7 @@ import dotty.tools.dotc.interfaces.{SourceFile => ISourceFile}
 import dotty.tools.dotc.reporting.{ Diagnostic, StoreReporter }
 import dotty.tools.dotc.parsing.Parsers.Parser
 import dotty.tools.dotc.{ Compiler, Run }
-import dotty.tools.io.{AbstractFile, VirtualDirectory}
-import dotty.tools.repl.AbstractFileClassLoader
+import dotty.tools.io.{AbstractFile, AbstractFileClassLoader, VirtualDirectory}
 import dotty.tools.dotc.util.Spans._
 import dotty.tools.dotc.interfaces.Diagnostic._
 import dotty.tools.dotc.util.{ SourcePosition, NoSourcePosition, SourceFile, NoSource }
diff --git a/staging/src/scala/quoted/staging/QuoteDriver.scala b/staging/src/scala/quoted/staging/QuoteDriver.scala
index 8de0cd218b23..8c057a8239f8 100644
--- a/staging/src/scala/quoted/staging/QuoteDriver.scala
+++ b/staging/src/scala/quoted/staging/QuoteDriver.scala
@@ -5,8 +5,7 @@ import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.Driver
 import dotty.tools.dotc.core.Contexts.{Context, ContextBase, FreshContext}
 import dotty.tools.dotc.quoted.QuotesCache
-import dotty.tools.io.{AbstractFile, Directory, PlainDirectory, VirtualDirectory}
-import dotty.tools.repl.AbstractFileClassLoader
+import dotty.tools.io.{AbstractFile, AbstractFileClassLoader, Directory, PlainDirectory, VirtualDirectory}
 import dotty.tools.dotc.reporting._
 import dotty.tools.dotc.util.ClasspathFromClassloader
 import scala.quoted._
diff --git a/tests/pos-with-compiler-cc/dotc/quoted/Interpreter.scala b/tests/pos-with-compiler-cc/dotc/quoted/Interpreter.scala
index 061b2f3d3890..cb275fe1de4e 100644
--- a/tests/pos-with-compiler-cc/dotc/quoted/Interpreter.scala
+++ b/tests/pos-with-compiler-cc/dotc/quoted/Interpreter.scala
@@ -29,7 +29,7 @@ import dotty.tools.dotc.transform.TreeMapWithStages._
 import dotty.tools.dotc.typer.ImportInfo.withRootImports
 import dotty.tools.dotc.util.SrcPos
 import dotty.tools.dotc.reporting.Message
-import dotty.tools.repl.AbstractFileClassLoader
+import dotty.tools.io.AbstractFileClassLoader
 
 /** Tree interpreter for metaprogramming constructs */
 abstract class Interpreter(pos: SrcPos, classLoader: ClassLoader)(using DetachedContext):
diff --git a/tests/pos-with-compiler-cc/dotc/transform/Splicer.scala b/tests/pos-with-compiler-cc/dotc/transform/Splicer.scala
index 09c820169179..c4bfb390a9c5 100644
--- a/tests/pos-with-compiler-cc/dotc/transform/Splicer.scala
+++ b/tests/pos-with-compiler-cc/dotc/transform/Splicer.scala
@@ -23,7 +23,7 @@ import dotty.tools.dotc.quoted.Interpreter
 
 import scala.util.control.NonFatal
 import dotty.tools.dotc.util.SrcPos
-import dotty.tools.repl.AbstractFileClassLoader
+import dotty.tools.io.AbstractFileClassLoader
 
 import scala.reflect.ClassTag
 
diff --git a/tests/pos-with-compiler-cc/dotc/util/ClasspathFromClassloader.scala b/tests/pos-with-compiler-cc/dotc/util/ClasspathFromClassloader.scala
index 25def103083d..198499f2593e 100644
--- a/tests/pos-with-compiler-cc/dotc/util/ClasspathFromClassloader.scala
+++ b/tests/pos-with-compiler-cc/dotc/util/ClasspathFromClassloader.scala
@@ -5,7 +5,7 @@ import scala.language.unsafeNulls
 import java.net.URLClassLoader
 import java.nio.file.Paths
 
-import dotty.tools.repl.AbstractFileClassLoader
+import dotty.tools.io.AbstractFileClassLoader
 
 object ClasspathFromClassloader {