diff --git a/main-actions/src/main/scala/sbt/Compiler.scala b/main-actions/src/main/scala/sbt/Compiler.scala
index 49e7c973a..7a319b5bb 100644
--- a/main-actions/src/main/scala/sbt/Compiler.scala
+++ b/main-actions/src/main/scala/sbt/Compiler.scala
@@ -12,7 +12,6 @@ import java.io.File
 import sbt.internal.librarymanagement.IvyConfiguration
 import sbt.librarymanagement.{ ModuleID, VersionNumber }
 import sbt.util.Logger
-import sbt.internal.util.CacheStore
 
 object Compiler {
   val DefaultMaxErrors = 100
@@ -34,31 +33,31 @@ object Compiler {
   private[sbt] def scalaCompilerBridgeSource2_12: ModuleID = scalaCompilerBridgeSource("2.12")
 
   def compilers(
-    cpOptions: ClasspathOptions, ivyConfiguration: IvyConfiguration, fileToStore: File => CacheStore
+    cpOptions: ClasspathOptions, ivyConfiguration: IvyConfiguration
   )(implicit app: AppConfiguration, log: Logger): Compilers = {
     val scalaProvider = app.provider.scalaProvider
     val instance = ScalaInstance(scalaProvider.version, scalaProvider.launcher)
     val sourceModule = scalaCompilerBridgeSource2_12
-    compilers(instance, cpOptions, None, ivyConfiguration, fileToStore, sourceModule)
+    compilers(instance, cpOptions, None, ivyConfiguration, sourceModule)
   }
 
   // TODO: Get java compiler
   def compilers(
     instance: ScalaInstance, cpOptions: ClasspathOptions, javaHome: Option[File],
-    ivyConfiguration: IvyConfiguration, fileToStore: File => CacheStore, sourcesModule: ModuleID
+    ivyConfiguration: IvyConfiguration, sourcesModule: ModuleID
   )(implicit app: AppConfiguration, log: Logger): Compilers = {
-    val scalac = scalaCompiler(instance, cpOptions, javaHome, ivyConfiguration, fileToStore, sourcesModule)
+    val scalac = scalaCompiler(instance, cpOptions, javaHome, ivyConfiguration, sourcesModule)
     val javac = JavaTools.directOrFork(instance, cpOptions, javaHome)
     new Compilers(scalac, javac)
   }
 
   def scalaCompiler(
     instance: ScalaInstance, cpOptions: ClasspathOptions, javaHome: Option[File],
-    ivyConfiguration: IvyConfiguration, fileToStore: File => CacheStore, sourcesModule: ModuleID
+    ivyConfiguration: IvyConfiguration, sourcesModule: ModuleID
   )(implicit app: AppConfiguration, log: Logger): AnalyzingCompiler = {
     val launcher = app.provider.scalaProvider.launcher
     val componentManager = new ZincComponentManager(launcher.globalLock, app.provider.components, Option(launcher.ivyHome), log)
-    val provider = ComponentCompiler.interfaceProvider(componentManager, ivyConfiguration, fileToStore, sourcesModule)
+    val provider = ComponentCompiler.interfaceProvider(componentManager, ivyConfiguration, sourcesModule)
     new AnalyzingCompiler(instance, provider, cpOptions, _ => (), None)
   }
 
diff --git a/main-actions/src/main/scala/sbt/Doc.scala b/main-actions/src/main/scala/sbt/Doc.scala
index 6a1e020d7..4324c017d 100644
--- a/main-actions/src/main/scala/sbt/Doc.scala
+++ b/main-actions/src/main/scala/sbt/Doc.scala
@@ -10,7 +10,7 @@ import Predef.{ conforms => _, _ }
 import sbt.io.syntax._
 import sbt.io.IO
 
-import sbt.internal.util.CacheStoreFactory
+import sbt.util.CacheStoreFactory
 import xsbti.Reporter
 import xsbti.compile.JavaTools
 
diff --git a/main-actions/src/main/scala/sbt/Package.scala b/main-actions/src/main/scala/sbt/Package.scala
index 6afe000ee..552f29c74 100644
--- a/main-actions/src/main/scala/sbt/Package.scala
+++ b/main-actions/src/main/scala/sbt/Package.scala
@@ -14,10 +14,11 @@ import sjsonnew.JsonFormat
 
 import sbt.util.Logger
 
-import sbt.internal.util.{ CacheStoreFactory, FilesInfo, HNil, ModifiedFileInfo, PlainFileInfo }
-import sbt.internal.util.FileInfo.{ exists, lastModified }
-import sbt.internal.util.CacheImplicits._
-import sbt.internal.util.Tracked.inputChanged
+import sbt.util.{ CacheStoreFactory, FilesInfo, ModifiedFileInfo, PlainFileInfo }
+import sbt.internal.util.HNil
+import sbt.util.FileInfo.{ exists, lastModified }
+import sbt.util.CacheImplicits._
+import sbt.util.Tracked.inputChanged
 
 sealed trait PackageOption
 object Package {
@@ -59,10 +60,10 @@ object Package {
     }
     setVersion(main)
 
-    val cachedMakeJar = inputChanged(cacheStoreFactory derive "inputs") { (inChanged, inputs: Map[File, String] :+: FilesInfo[ModifiedFileInfo] :+: Manifest :+: HNil) =>
+    val cachedMakeJar = inputChanged(cacheStoreFactory make "inputs") { (inChanged, inputs: Map[File, String] :+: FilesInfo[ModifiedFileInfo] :+: Manifest :+: HNil) =>
       import exists.format
       val sources :+: _ :+: manifest :+: HNil = inputs
-      inputChanged(cacheStoreFactory derive "output") { (outChanged, jar: PlainFileInfo) =>
+      inputChanged(cacheStoreFactory make "output") { (outChanged, jar: PlainFileInfo) =>
         if (inChanged || outChanged)
           makeJar(sources.toSeq, jar.file, manifest, log)
         else
diff --git a/main-actions/src/main/scala/sbt/RawCompileLike.scala b/main-actions/src/main/scala/sbt/RawCompileLike.scala
index f3a0c7497..a1669bbe2 100644
--- a/main-actions/src/main/scala/sbt/RawCompileLike.scala
+++ b/main-actions/src/main/scala/sbt/RawCompileLike.scala
@@ -11,10 +11,11 @@ import sbt.io.syntax._
 import sbt.io.IO
 
 import sbt.internal.util.Types.:+:
-import sbt.internal.util.CacheImplicits._
-import sbt.internal.util.Tracked.inputChanged
-import sbt.internal.util.{ CacheStoreFactory, FilesInfo, HashFileInfo, HNil, ModifiedFileInfo, PlainFileInfo }
-import sbt.internal.util.FileInfo.{ exists, hash, lastModified }
+import sbt.util.CacheImplicits._
+import sbt.util.Tracked.inputChanged
+import sbt.util.{ CacheStoreFactory, FilesInfo, HashFileInfo, ModifiedFileInfo, PlainFileInfo }
+import sbt.internal.util.HNil
+import sbt.util.FileInfo.{ exists, hash, lastModified }
 import xsbti.compile.ClasspathOptions
 
 import sbt.internal.util.ManagedLogger
@@ -47,8 +48,8 @@ object RawCompileLike {
       implicit val stringEquiv: Equiv[String] = defaultEquiv
       implicit val fileEquiv: Equiv[File] = defaultEquiv
       implicit val intEquiv: Equiv[Int] = defaultEquiv
-      val cachedComp = inputChanged(cacheStoreFactory derive "inputs") { (inChanged, in: Inputs) =>
-        inputChanged(cacheStoreFactory derive "output") { (outChanged, outputs: FilesInfo[PlainFileInfo]) =>
+      val cachedComp = inputChanged(cacheStoreFactory make "inputs") { (inChanged, in: Inputs) =>
+        inputChanged(cacheStoreFactory make "output") { (outChanged, outputs: FilesInfo[PlainFileInfo]) =>
           if (inChanged || outChanged)
             doCompile(sources, classpath, outputDirectory, options, maxErrors, log)
           else
diff --git a/main-actions/src/main/scala/sbt/Sync.scala b/main-actions/src/main/scala/sbt/Sync.scala
index 417cc8e48..f19973719 100644
--- a/main-actions/src/main/scala/sbt/Sync.scala
+++ b/main-actions/src/main/scala/sbt/Sync.scala
@@ -5,8 +5,9 @@ package sbt
 
 import java.io.File
 
-import sbt.internal.util.{ CacheStore, FileInfo, Relation }
-import sbt.internal.util.CacheImplicits._
+import sbt.internal.util.Relation
+import sbt.util.CacheImplicits._
+import sbt.util.{ FileInfo, CacheStore }
 
 import sbt.io.IO
 
diff --git a/main-actions/src/test/scala/sbt/CacheIvyTest.scala b/main-actions/src/test/scala/sbt/CacheIvyTest.scala
index 93e403c44..eb41444ed 100644
--- a/main-actions/src/test/scala/sbt/CacheIvyTest.scala
+++ b/main-actions/src/test/scala/sbt/CacheIvyTest.scala
@@ -6,7 +6,7 @@ import Prop._
 import sbt.librarymanagement._
 
 class CacheIvyTest extends Properties("CacheIvy") {
-  import sbt.internal.util.{ CacheStore, SingletonCache }
+  import sbt.util.{ CacheStore, SingletonCache }
   import SingletonCache._
 
   import sjsonnew._
diff --git a/main-settings/src/main/scala/sbt/Previous.scala b/main-settings/src/main/scala/sbt/Previous.scala
index a7c2a2b85..9ce344705 100644
--- a/main-settings/src/main/scala/sbt/Previous.scala
+++ b/main-settings/src/main/scala/sbt/Previous.scala
@@ -2,7 +2,8 @@ package sbt
 
 import Def.{ Initialize, ScopedKey }
 import Previous._
-import sbt.internal.util.{ ~>, IMap, Input, Output, RMap, StampedFormat }
+import sbt.internal.util.{ ~>, IMap, RMap }
+import sbt.util.{ Input, Output, StampedFormat }
 import sjsonnew.JsonFormat
 
 /**
diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index d262342ca..323e74a35 100755
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -15,12 +15,9 @@ import sbt.internal.CommandStrings.ExportStream
 import sbt.internal.io.WatchState
 import sbt.internal.librarymanagement._
 import sbt.internal.librarymanagement.mavenint.{ PomExtraDependencyAttributes, SbtPomExtraProperties }
-import sbt.internal.librarymanagement.syntax._
-import sbt.internal.librarymanagement.{ CustomPomParser, DependencyFilter }
 import sbt.internal.testing.TestLogger
 import sbt.internal.util._
 import sbt.internal.util.Attributed.data
-import sbt.internal.util.CacheImplicits._
 import sbt.internal.util.complete._
 import sbt.internal.util.Types._
 import sbt.io.syntax._
@@ -29,9 +26,10 @@ import sbt.librarymanagement.Artifact.{ DocClassifier, SourceClassifier }
 import sbt.librarymanagement.Configurations.{ Compile, CompilerPlugin, IntegrationTest, names, Provided, Runtime, Test }
 import sbt.librarymanagement.CrossVersion.{ binarySbtVersion, binaryScalaVersion, partialVersion }
 import sbt.librarymanagement.{ `package` => _, _ }
-import sbt.librarymanagement.{ Configuration, Configurations, ConflictManager, CrossVersion, MavenRepository, Resolver, ScalaArtifacts, UpdateOptions }
+import sbt.librarymanagement.syntax._
 import sbt.util.InterfaceUtil.{ f1, o2m }
-import sbt.util.{ Level, Logger, ShowLines }
+import sbt.util._
+import sbt.util.CacheImplicits._
 import scala.concurrent.duration.FiniteDuration
 import scala.util.control.NonFatal
 import scala.xml.NodeSeq
@@ -129,7 +127,6 @@ object Defaults extends BuildCommon {
       includeFilter in unmanagedSources :== ("*.java" | "*.scala") && new SimpleFileFilter(_.isFile),
       includeFilter in unmanagedJars :== "*.jar" | "*.so" | "*.dll" | "*.jnilib" | "*.zip",
       includeFilter in unmanagedResources :== AllPassFilter,
-      fileToStore :== DefaultFileToStore,
       bgList := { bgJobService.value.jobs },
       ps := psTask.value,
       bgStop := bgStopTask.evaluated,
@@ -321,7 +318,7 @@ object Defaults extends BuildCommon {
     compilers := {
       val compilers = Compiler.compilers(
         scalaInstance.value, classpathOptions.value, javaHome.value, bootIvyConfiguration.value,
-        fileToStore.value, scalaCompilerBridgeSource.value
+        scalaCompilerBridgeSource.value
       )(appConfiguration.value, streams.value.log)
       if (java.lang.Boolean.getBoolean("sbt.disable.interface.classloader.cache")) compilers else {
         compilers.withScalac(
@@ -1126,7 +1123,7 @@ object Defaults extends BuildCommon {
       val t = classDirectory.value
       val dirs = resourceDirectories.value
       val s = streams.value
-      val cacheStore = s.cacheStoreFactory derive "copy-resources"
+      val cacheStore = s.cacheStoreFactory make "copy-resources"
       val mappings = (resources.value --- dirs) pair (rebase(dirs, t) | flat(t))
       s.log.debug("Copy resource mappings: " + mappings.mkString("\n\t", "\n\t", ""))
       Sync(cacheStore)(mappings)
@@ -1507,7 +1504,7 @@ object Classpaths {
   private[sbt] def ivySbt0: Initialize[Task[IvySbt]] =
     Def.task {
       Credentials.register(credentials.value, streams.value.log)
-      new IvySbt(ivyConfiguration.value, fileToStore.value)
+      new IvySbt(ivyConfiguration.value)
     }
   def moduleSettings0: Initialize[Task[ModuleSettings]] = Def.task {
     InlineConfiguration(ivyValidate.value, ivyScala.value,
@@ -1582,6 +1579,7 @@ object Classpaths {
   def withExcludes(out: File, classifiers: Seq[String], lock: xsbti.GlobalLock)(f: Map[ModuleID, Set[String]] => UpdateReport): UpdateReport =
     {
       import sbt.librarymanagement.LibraryManagementCodec._
+      import sbt.util.FileBasedStore
       implicit val isoString: sjsonnew.IsoString[scala.json.ast.unsafe.JValue] = sjsonnew.IsoString.iso(
         sjsonnew.support.scalajson.unsafe.CompactPrinter.apply,
         sjsonnew.support.scalajson.unsafe.Parser.parseUnsafe
@@ -1770,7 +1768,7 @@ object Classpaths {
           out.allFiles.forall(f => fileUptodate(f, out.stamps)) &&
           fileUptodate(out.cachedDescriptor, out.stamps)
 
-      val outStore = cacheStoreFactory derive "output"
+      val outStore = cacheStoreFactory make "output"
       def skipWork: In => UpdateReport = {
         import LibraryManagementCodec._
         Tracked.lastOutput[In, UpdateReport](outStore) {
@@ -1803,7 +1801,7 @@ object Classpaths {
       }
       def doWork: In => UpdateReport = {
         import AltLibraryManagementCodec._
-        Tracked.inputChanged(cacheStoreFactory derive "inputs")(doWorkInternal)
+        Tracked.inputChanged(cacheStoreFactory make "inputs")(doWorkInternal)
       }
       val f = if (skip && !force) skipWork else doWork
       f(module.owner.configuration :+: module.moduleSettings :+: config :+: HNil)
@@ -1835,8 +1833,8 @@ object Classpaths {
         case NonFatal(e) => Map()
       }
 
-    val outCacheStore = cacheStoreFactory derive "output_dsp"
-    val f = Tracked.inputChanged(cacheStoreFactory derive "input_dsp") { (inChanged: Boolean, in: Seq[ModuleID]) =>
+    val outCacheStore = cacheStoreFactory make "output_dsp"
+    val f = Tracked.inputChanged(cacheStoreFactory make "input_dsp") { (inChanged: Boolean, in: Seq[ModuleID]) =>
 
       implicit val NoPositionFormat: JsonFormat[NoPosition.type] = asSingleton(NoPosition)
       implicit val LinePositionFormat: IsoLList.Aux[LinePosition, String :*: Int :*: LNil] = LList.iso(
diff --git a/main/src/main/scala/sbt/Keys.scala b/main/src/main/scala/sbt/Keys.scala
index 235da2c74..86ee095ff 100644
--- a/main/src/main/scala/sbt/Keys.scala
+++ b/main/src/main/scala/sbt/Keys.scala
@@ -31,7 +31,7 @@ import KeyRanks._
 import sbt.internal.{ BuildStructure, LoadedBuild, PluginDiscovery, BuildDependencies, SessionSettings, LogManager }
 import sbt.io.FileFilter
 import sbt.internal.io.WatchState
-import sbt.internal.util.{ AttributeKey, CacheStore, SourcePosition }
+import sbt.internal.util.{ AttributeKey, SourcePosition }
 
 import sbt.librarymanagement.Configurations.CompilerPlugin
 import sbt.librarymanagement.LibraryManagementCodec._
@@ -80,8 +80,6 @@ import sbt.BuildSyntax._
 object Keys {
   val TraceValues = "-1 to disable, 0 for up to the first sbt frame, or a positive number to set the maximum number of frames shown."
 
-  val fileToStore = SettingKey[File => CacheStore]("file-to-store", "How to go from a file to a store.", ASetting)
-
   // logging
   val logLevel = SettingKey[Level.Value]("log-level", "The amount of logging sent to the screen.", ASetting)
   val persistLogLevel = SettingKey[Level.Value]("persist-log-level", "The amount of logging sent to a file for persistence.", CSetting)
diff --git a/main/src/main/scala/sbt/internal/ConsoleProject.scala b/main/src/main/scala/sbt/internal/ConsoleProject.scala
index 1ef42da61..803c26da0 100644
--- a/main/src/main/scala/sbt/internal/ConsoleProject.scala
+++ b/main/src/main/scala/sbt/internal/ConsoleProject.scala
@@ -19,8 +19,7 @@ object ConsoleProject {
       ScalaInstance(scalaProvider.version, scalaProvider.launcher)
     }
     val sourcesModule = extracted.get(Keys.scalaCompilerBridgeSource)
-    val fileToStore = extracted.get(Keys.fileToStore)
-    val compiler = Compiler.scalaCompiler(scalaInstance, ClasspathOptionsUtil.repl, None, ivyConf, fileToStore, sourcesModule)(state.configuration, log)
+    val compiler = Compiler.scalaCompiler(scalaInstance, ClasspathOptionsUtil.repl, None, ivyConf, sourcesModule)(state.configuration, log)
     val imports = BuildUtil.getImports(unit.unit) ++ BuildUtil.importAll(bindings.map(_._1))
     val importString = imports.mkString("", ";\n", ";\n\n")
     val initCommands = importString + extra
diff --git a/main/src/main/scala/sbt/internal/Load.scala b/main/src/main/scala/sbt/internal/Load.scala
index a3faaaf7d..fdeae3667 100755
--- a/main/src/main/scala/sbt/internal/Load.scala
+++ b/main/src/main/scala/sbt/internal/Load.scala
@@ -5,7 +5,7 @@ package sbt
 package internal
 
 import sbt.librarymanagement.{ Configuration, Configurations, Resolver, UpdateOptions }
-import sbt.internal.librarymanagement.{ DefaultFileToStore, InlineIvyConfiguration, IvyPaths }
+import sbt.internal.librarymanagement.{ InlineIvyConfiguration, IvyPaths }
 
 import java.io.File
 import java.net.URI
@@ -75,7 +75,7 @@ private[sbt] object Load {
       val ivyPaths = IvyPaths(baseDirectory, bootIvyHome(state.configuration))
       val ivyConfiguration = new InlineIvyConfiguration(ivyPaths, Resolver.withDefaultResolvers(Nil).toVector,
         Vector.empty, Vector.empty, localOnly, lock, checksums, None, UpdateOptions(), log)
-      val compilers = Compiler.compilers(ClasspathOptionsUtil.boot, ivyConfiguration, DefaultFileToStore)(state.configuration, log)
+      val compilers = Compiler.compilers(ClasspathOptionsUtil.boot, ivyConfiguration)(state.configuration, log)
       val evalPluginDef = EvaluateTask.evalPluginDef(log) _
       val delegates = defaultDelegates
       val pluginMgmt = PluginManagement(loader)
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 36a961ec7..879e0b3b2 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -11,10 +11,10 @@ object Dependencies {
   val baseScalaVersion = scala212
 
   // sbt modules
-  private val ioVersion = "1.0.0-M9"
-  private val utilVersion = "1.0.0-M21"
-  private val lmVersion = "1.0.0-X7"
-  private val zincVersion = "1.0.0-X11"
+  private val ioVersion = "1.0.0-M11"
+  private val utilVersion = "1.0.0-M23"
+  private val lmVersion = "1.0.0-X10"
+  private val zincVersion = "1.0.0-X14"
 
   private val sbtIO = "org.scala-sbt" %% "io" % ioVersion
 
diff --git a/sbt/src/main/scala/Import.scala b/sbt/src/main/scala/Import.scala
index cb2880053..2f8a9c976 100644
--- a/sbt/src/main/scala/Import.scala
+++ b/sbt/src/main/scala/Import.scala
@@ -37,22 +37,45 @@ trait Import {
 
   // sbt.util
   type AbstractLogger = sbt.util.AbstractLogger
-  val ControlEvent = sbt.util.ControlEvent
+  type BasicCache[I, O] = sbt.util.BasicCache[I, O]
+  type BasicCacheImplicits = sbt.util.BasicCacheImplicits
+  type Cache[I, O] = sbt.util.Cache[I, O]
+  val Cache = sbt.util.Cache
+  val CacheImplicits = sbt.util.CacheImplicits
+  type Changed[O] = sbt.util.Changed[O]
+  type ChangeReport[T] = sbt.util.ChangeReport[T]
+  val ChangeReport = sbt.util.ChangeReport
   type ControlEvent = sbt.util.ControlEvent
+  val ControlEvent = sbt.util.ControlEvent
+  type Difference = sbt.util.Difference
+  val Difference = sbt.util.Difference
+  type EmptyChangeReport[T] = sbt.util.EmptyChangeReport[T]
+  val FileFunction = sbt.util.FileFunction
+  type FileInfo = sbt.util.FileInfo
+  val FileInfo = sbt.util.FileInfo
+  type FilesInfo[F <: FileInfo] = sbt.util.FilesInfo[F]
+  val FilesInfo = sbt.util.FilesInfo
+  type HashFileInfo = sbt.util.HashFileInfo
+  type HashModifiedFileInfo = sbt.util.HashModifiedFileInfo
   val Level = sbt.util.Level
   type Log = sbt.util.Log
   type LogEvent = sbt.util.LogEvent
-  val Logger = sbt.util.Logger
   type Logger = sbt.util.Logger
+  val Logger = sbt.util.Logger
+  type ModifiedFileInfo = sbt.util.ModifiedFileInfo
+  type PlainFileInfo = sbt.util.PlainFileInfo
   type SetLevel = sbt.util.SetLevel
   type SetSuccess = sbt.util.SetSuccess
   type SetTrace = sbt.util.SetTrace
-  val Show = sbt.util.Show
   type Show[T] = sbt.util.Show[T]
-  val ShowLines = sbt.util.ShowLines
+  val Show = sbt.util.Show
   type ShowLines[A] = sbt.util.ShowLines[A]
+  val ShowLines = sbt.util.ShowLines
   type Success = sbt.util.Success
+  type Timestamp = sbt.util.Timestamp
   type Trace = sbt.util.Trace
+  type Tracked = sbt.util.Tracked
+  val Tracked = sbt.util.Tracked
 
   // sbt.internal.util
   val AList = sbt.internal.util.AList
@@ -66,16 +89,8 @@ trait Import {
   type AttributeMap = sbt.internal.util.AttributeMap
   val Attributed = sbt.internal.util.Attributed
   type Attributed[D] = sbt.internal.util.Attributed[D]
-  type BasicCache[I, O] = sbt.internal.util.BasicCache[I, O]
-  type BasicCacheImplicits = sbt.internal.util.BasicCacheImplicits
   type BasicLogger = sbt.internal.util.BasicLogger
   type BufferedLogger = sbt.internal.util.BufferedLogger
-  val Cache = sbt.internal.util.Cache
-  type Cache[I, O] = sbt.internal.util.Cache[I, O]
-  val CacheImplicits = sbt.internal.util.CacheImplicits
-  val ChangeReport = sbt.internal.util.ChangeReport
-  type ChangeReport[T] = sbt.internal.util.ChangeReport[T]
-  type Changed[O] = sbt.internal.util.Changed[O]
   val Classes = sbt.internal.util.Classes
   val ConsoleLogger = sbt.internal.util.ConsoleLogger
   type ConsoleLogger = sbt.internal.util.ConsoleLogger
@@ -84,9 +99,6 @@ trait Import {
   val Dag = sbt.internal.util.Dag
   type Dag[A <: Dag[A]] = sbt.internal.util.Dag[A]
   type DelegatingPMap[K[_], V[_]] = sbt.internal.util.DelegatingPMap[K, V]
-  val Difference = sbt.internal.util.Difference
-  type Difference = sbt.internal.util.Difference
-  type EmptyChangeReport[T] = sbt.internal.util.EmptyChangeReport[T]
   val ErrorHandling = sbt.internal.util.ErrorHandling
   type EvaluateSettings[S] = sbt.internal.util.EvaluateSettings[S]
   val EvaluationState = sbt.internal.util.EvaluationState
@@ -94,12 +106,7 @@ trait Import {
   type ExitHook = sbt.internal.util.ExitHook
   val ExitHooks = sbt.internal.util.ExitHooks
   type FeedbackProvidedException = sbt.internal.util.FeedbackProvidedException
-  val FileFunction = sbt.internal.util.FileFunction
-  val FileInfo = sbt.internal.util.FileInfo
-  type FileInfo = sbt.internal.util.FileInfo
   type FilePosition = sbt.internal.util.FilePosition
-  val FilesInfo = sbt.internal.util.FilesInfo
-  type FilesInfo[F <: FileInfo] = sbt.internal.util.FilesInfo[F]
   type FilterLogger = sbt.internal.util.FilterLogger
   type Fn1[A, B] = sbt.internal.util.Fn1[A, B]
   val FullLogger = sbt.internal.util.FullLogger
@@ -112,8 +119,6 @@ trait Import {
   type HList = sbt.internal.util.HList
   val HNil = sbt.internal.util.HNil
   type HNil = sbt.internal.util.HNil
-  type HashFileInfo = sbt.internal.util.HashFileInfo
-  type HashModifiedFileInfo = sbt.internal.util.HashModifiedFileInfo
   val IDSet = sbt.internal.util.IDSet
   type IDSet[T] = sbt.internal.util.IDSet[T]
   val IMap = sbt.internal.util.IMap
@@ -133,14 +138,12 @@ trait Import {
   val LoggerWriter = sbt.internal.util.LoggerWriter
   type LoggerWriter = sbt.internal.util.LoggerWriter
   type MessageOnlyException = sbt.internal.util.MessageOnlyException
-  type ModifiedFileInfo = sbt.internal.util.ModifiedFileInfo
   type MultiLogger = sbt.internal.util.MultiLogger
   val NoPosition = sbt.internal.util.NoPosition
   val PMap = sbt.internal.util.PMap
   type PMap[K[_], V[_]] = sbt.internal.util.PMap[K, V]
   val Param = sbt.internal.util.Param
   type Param[A[_], B[_]] = sbt.internal.util.Param[A, B]
-  type PlainFileInfo = sbt.internal.util.PlainFileInfo
   type RMap[K[_], V[_]] = sbt.internal.util.RMap[K, V]
   val RangePosition = sbt.internal.util.RangePosition
   type RangePosition = sbt.internal.util.RangePosition
@@ -155,9 +158,6 @@ trait Import {
   type SourcePosition = sbt.internal.util.SourcePosition
   val StackTrace = sbt.internal.util.StackTrace
   type SuppressedTraceContext = sbt.internal.util.SuppressedTraceContext
-  type Timestamp = sbt.internal.util.Timestamp
-  val Tracked = sbt.internal.util.Tracked
-  type Tracked = sbt.internal.util.Tracked
   type TranslatedException = sbt.internal.util.TranslatedException
   type TranslatedIOException = sbt.internal.util.TranslatedIOException
   val TypeFunctions = sbt.internal.util.TypeFunctions
diff --git a/sbt/src/main/scala/package.scala b/sbt/src/main/scala/package.scala
index 976bcbae9..c01d390e5 100644
--- a/sbt/src/main/scala/package.scala
+++ b/sbt/src/main/scala/package.scala
@@ -6,7 +6,7 @@ package object sbt extends sbt.IOSyntax0
     with sbt.internal.util.Types
     with sbt.internal.librarymanagement.impl.DependencyBuilders
     with sbt.ProjectExtra
-    with sbt.internal.librarymanagement.DependencyFilterExtra
+    with sbt.librarymanagement.DependencyFilterExtra
     with sbt.BuildExtra
     with sbt.TaskMacroExtra
     with sbt.ScopeFilter.Make
diff --git a/sbt/src/sbt-test/dependency-management/cache-update/build.sbt b/sbt/src/sbt-test/dependency-management/cache-update/build.sbt
index 3367d488f..1b8656650 100644
--- a/sbt/src/sbt-test/dependency-management/cache-update/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/cache-update/build.sbt
@@ -21,11 +21,11 @@ TaskKey[Unit]("check") := {
 
   type In = IvyConfiguration :+: ModuleSettings :+: UpdateConfiguration :+: HNil
 
-  import sbt.internal.util.CacheImplicits._
+  import sbt.util.CacheImplicits._
   import sbt.Classpaths.AltLibraryManagementCodec._
 
   val f: In => Unit =
-    Tracked.inputChanged(cacheStoreFactory derive "inputs") { (inChanged: Boolean, in: In) =>
+    Tracked.inputChanged(cacheStoreFactory make "inputs") { (inChanged: Boolean, in: In) =>
       if (inChanged)
         sys.error(s"Update cache is invalidated: ${module.owner.configuration}, ${module.moduleSettings}, $config")
     }
diff --git a/sbt/src/sbt-test/dependency-management/inline-dependencies-a/build.sbt b/sbt/src/sbt-test/dependency-management/inline-dependencies-a/build.sbt
index d05605894..825964118 100644
--- a/sbt/src/sbt-test/dependency-management/inline-dependencies-a/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/inline-dependencies-a/build.sbt
@@ -1,4 +1,4 @@
-import sbt.internal.librarymanagement.syntax._
+import sbt.librarymanagement.syntax._
 
 libraryDependencies += "org.scalacheck" % "scalacheck" % "1.5"
 
diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt b/sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt
index 4972ad1ac..ba2d3870e 100644
--- a/sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt
@@ -1,4 +1,4 @@
-import sbt.internal.librarymanagement.syntax._
+import sbt.librarymanagement.syntax._
 
 Seq(externalIvySettings(), externalIvyFile())
 
diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-b/build.sbt b/sbt/src/sbt-test/dependency-management/ivy-settings-b/build.sbt
index 17de0f07f..bb2006ef1 100644
--- a/sbt/src/sbt-test/dependency-management/ivy-settings-b/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/ivy-settings-b/build.sbt
@@ -1,4 +1,4 @@
-import sbt.internal.librarymanagement.syntax._
+import sbt.librarymanagement.syntax._
 
 externalIvySettings()
 
diff --git a/sbt/src/sbt-test/dependency-management/scala-home/changes/real-build.sbt b/sbt/src/sbt-test/dependency-management/scala-home/changes/real-build.sbt
index 7055185a2..0a8b3d1f6 100644
--- a/sbt/src/sbt-test/dependency-management/scala-home/changes/real-build.sbt
+++ b/sbt/src/sbt-test/dependency-management/scala-home/changes/real-build.sbt
@@ -1,4 +1,4 @@
-import sbt.internal.librarymanagement.syntax._
+import sbt.librarymanagement.syntax._
 
 scalaHome := Some(baseDirectory.value / "home")
 
diff --git a/sbt/src/sbt-test/dependency-management/sources/build.sbt b/sbt/src/sbt-test/dependency-management/sources/build.sbt
index 5fa6d7405..e7851f885 100644
--- a/sbt/src/sbt-test/dependency-management/sources/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/sources/build.sbt
@@ -1,4 +1,4 @@
-import sbt.internal.librarymanagement.syntax._
+import sbt.librarymanagement.syntax._
 
 lazy val root = (project in file(".")).
   settings(
diff --git a/tasks-standard/src/main/scala/sbt/std/Streams.scala b/tasks-standard/src/main/scala/sbt/std/Streams.scala
index 7e6257f5f..573c5b85a 100644
--- a/tasks-standard/src/main/scala/sbt/std/Streams.scala
+++ b/tasks-standard/src/main/scala/sbt/std/Streams.scala
@@ -26,7 +26,7 @@ import sbt.io.syntax._
 import sbt.internal.util.ManagedLogger
 
 import sjsonnew.{ IsoString, SupportConverter }
-import sbt.internal.util.{ CacheStoreFactory, DirectoryStoreFactory, Input, Output, PlainInput, PlainOutput }
+import sbt.util.{ CacheStoreFactory, DirectoryStoreFactory, Input, Output, PlainInput, PlainOutput }
 
 // no longer specific to Tasks, so 'TaskStreams' should be renamed
 /**