diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..994e17a23
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+```
+$ sbt release
+```
diff --git a/build.sbt b/build.sbt
index 9ac713786..20b5153f6 100644
--- a/build.sbt
+++ b/build.sbt
@@ -33,14 +33,10 @@ def commonSettings: Seq[Setting[_]] = Seq(
   publishArtifact in Test := true
 )
 
-def testedBaseSettings: Seq[Setting[_]] =
-  commonSettings ++ testDependencies
-
 lazy val utilRoot: Project = (project in file(".")).
-  // configs(Sxr.sxrConf).
   aggregate(
     utilInterface, utilControl, utilCollection, utilApplyMacro, utilComplete,
-    utilLogging, utilRelation, utilLogic, utilCache, utilTracking
+    utilLogging, utilRelation, utilLogic, utilCache, utilTracking, utilTesting
   ).
   settings(
     inThisBuild(Seq(
@@ -65,7 +61,10 @@ lazy val utilRoot: Project = (project in file(".")).
     name := "Util Root",
     publish := {},
     publishLocal := {},
-    publishArtifact := false
+    publishArtifact in Compile := false,
+    publishArtifact in Test := false,
+    publishArtifact := false,
+    customCommands
   )
 
 // defines Java structures used across Scala versions, such as the API structures and relationships extracted by
@@ -86,8 +85,9 @@ lazy val utilControl = (project in internalPath / "util-control").
   )
 
 lazy val utilCollection = (project in internalPath / "util-collection").
+  dependsOn(utilTesting % Test).
   settings(
-    testedBaseSettings,
+    commonSettings,
     Util.keywordsSettings,
     name := "Util Collection"
   )
@@ -95,26 +95,25 @@ lazy val utilCollection = (project in internalPath / "util-collection").
 lazy val utilApplyMacro = (project in internalPath / "util-appmacro").
   dependsOn(utilCollection).
   settings(
-    testedBaseSettings,
+    commonSettings,
     name := "Util Apply Macro",
     libraryDependencies += scalaCompiler.value
   )
 
 // Command line-related utilities.
 lazy val utilComplete = (project in internalPath / "util-complete").
-  dependsOn(utilCollection, utilControl).
+  dependsOn(utilCollection, utilControl, utilTesting % Test).
   settings(
-    testedBaseSettings,
+    commonSettings,
     name := "Util Completion",
-    libraryDependencies ++= Seq(jline, sbtIO),
-    crossScalaVersions := Seq(scala210, scala211)
+    libraryDependencies ++= Seq(jline, sbtIO)
   )
 
 // logging
 lazy val utilLogging = (project in internalPath / "util-logging").
-  dependsOn(utilInterface).
+  dependsOn(utilInterface, utilTesting % Test).
   settings(
-    testedBaseSettings,
+    commonSettings,
     publishArtifact in (Test, packageBin) := true,
     name := "Util Logging",
     libraryDependencies += jline
@@ -122,16 +121,17 @@ lazy val utilLogging = (project in internalPath / "util-logging").
 
 // Relation
 lazy val utilRelation = (project in internalPath / "util-relation").
+  dependsOn(utilTesting % Test).
   settings(
-    testedBaseSettings,
+    commonSettings,
     name := "Util Relation"
   )
 
 // A logic with restricted negation as failure for a unique, stable model
 lazy val utilLogic = (project in internalPath / "util-logic").
-  dependsOn(utilCollection, utilRelation).
+  dependsOn(utilCollection, utilRelation, utilTesting % Test).
   settings(
-    testedBaseSettings,
+    commonSettings,
     name := "Util Logic"
   )
 
@@ -152,3 +152,21 @@ lazy val utilTracking = (project in internalPath / "util-tracking").
     name := "Util Tracking",
     libraryDependencies += sbtIO
   )
+
+// Internal utility for testing
+lazy val utilTesting = (project in internalPath / "util-testing").
+  settings(
+    commonSettings,
+    name := "Util Testing",
+    libraryDependencies ++= Seq(scalaCheck, scalatest)
+  )
+
+def customCommands: Seq[Setting[_]] = Seq(
+  commands += Command.command("release") { state =>
+    // "clean" ::
+    "so compile" ::
+    "so publishSigned" ::
+    "reload" ::
+    state
+  }
+)
diff --git a/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/ContextUtil.scala b/internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/ContextUtil.scala
similarity index 99%
rename from internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/ContextUtil.scala
rename to internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/ContextUtil.scala
index 4bdf92dc7..e5cd74270 100644
--- a/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/ContextUtil.scala
+++ b/internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/ContextUtil.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 package appmacro
 
 import scala.reflect._
diff --git a/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/Convert.scala b/internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/Convert.scala
similarity index 98%
rename from internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/Convert.scala
rename to internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/Convert.scala
index ecfa0ea4f..1d0ebede1 100644
--- a/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/Convert.scala
+++ b/internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/Convert.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 package appmacro
 
 import scala.reflect._
diff --git a/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/Instance.scala b/internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/Instance.scala
similarity index 99%
rename from internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/Instance.scala
rename to internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/Instance.scala
index 111fbc3ca..2eb6f6877 100644
--- a/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/Instance.scala
+++ b/internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/Instance.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 package appmacro
 
 import Classes.Applicative
diff --git a/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/KListBuilder.scala b/internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/KListBuilder.scala
similarity index 99%
rename from internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/KListBuilder.scala
rename to internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/KListBuilder.scala
index 3f0a12e28..5d19f5b6c 100644
--- a/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/KListBuilder.scala
+++ b/internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/KListBuilder.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 package appmacro
 
 import Types.Id
diff --git a/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/MixedBuilder.scala b/internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/MixedBuilder.scala
similarity index 95%
rename from internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/MixedBuilder.scala
rename to internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/MixedBuilder.scala
index c99610275..cc2897ae3 100644
--- a/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/MixedBuilder.scala
+++ b/internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/MixedBuilder.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 package appmacro
 
 import scala.reflect._
diff --git a/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/TupleBuilder.scala b/internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/TupleBuilder.scala
similarity index 99%
rename from internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/TupleBuilder.scala
rename to internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/TupleBuilder.scala
index ab87ead81..7ed352457 100644
--- a/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/TupleBuilder.scala
+++ b/internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/TupleBuilder.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 package appmacro
 
 import Types.Id
diff --git a/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/TupleNBuilder.scala b/internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/TupleNBuilder.scala
similarity index 98%
rename from internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/TupleNBuilder.scala
rename to internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/TupleNBuilder.scala
index 7c582328e..c94a781f0 100644
--- a/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/TupleNBuilder.scala
+++ b/internal/util-appmacro/src/main/scala/sbt/internal/util/appmacro/TupleNBuilder.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 package appmacro
 
 import Types.Id
diff --git a/internal/util-cache/src/main/scala/sbt/util/internal/Cache.scala b/internal/util-cache/src/main/scala/sbt/internal/util/Cache.scala
similarity index 99%
rename from internal/util-cache/src/main/scala/sbt/util/internal/Cache.scala
rename to internal/util-cache/src/main/scala/sbt/internal/util/Cache.scala
index a42236c57..f441fbc20 100644
--- a/internal/util-cache/src/main/scala/sbt/util/internal/Cache.scala
+++ b/internal/util-cache/src/main/scala/sbt/internal/util/Cache.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 import sbinary.{ CollectionTypes, DefaultProtocol, Format, Input, JavaFormats, Output => Out }
 import java.io.{ ByteArrayInputStream, ByteArrayOutputStream, File, InputStream, OutputStream }
diff --git a/internal/util-cache/src/main/scala/sbt/util/internal/CacheIO.scala b/internal/util-cache/src/main/scala/sbt/internal/util/CacheIO.scala
similarity index 98%
rename from internal/util-cache/src/main/scala/sbt/util/internal/CacheIO.scala
rename to internal/util-cache/src/main/scala/sbt/internal/util/CacheIO.scala
index 7c0ab222d..95c00f47a 100644
--- a/internal/util-cache/src/main/scala/sbt/util/internal/CacheIO.scala
+++ b/internal/util-cache/src/main/scala/sbt/internal/util/CacheIO.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 import java.io.{ File, FileNotFoundException }
 import sbinary.{ DefaultProtocol, Format, Operations }
diff --git a/internal/util-cache/src/main/scala/sbt/util/internal/FileInfo.scala b/internal/util-cache/src/main/scala/sbt/internal/util/FileInfo.scala
similarity index 99%
rename from internal/util-cache/src/main/scala/sbt/util/internal/FileInfo.scala
rename to internal/util-cache/src/main/scala/sbt/internal/util/FileInfo.scala
index 92ed6c8b6..923f13189 100644
--- a/internal/util-cache/src/main/scala/sbt/util/internal/FileInfo.scala
+++ b/internal/util-cache/src/main/scala/sbt/internal/util/FileInfo.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 import java.io.{ File, IOException }
 import sbinary.{ DefaultProtocol, Format }
diff --git a/internal/util-cache/src/main/scala/sbt/util/internal/SeparatedCache.scala b/internal/util-cache/src/main/scala/sbt/internal/util/SeparatedCache.scala
similarity index 98%
rename from internal/util-cache/src/main/scala/sbt/util/internal/SeparatedCache.scala
rename to internal/util-cache/src/main/scala/sbt/internal/util/SeparatedCache.scala
index 03fd2c2e5..a68e46083 100644
--- a/internal/util-cache/src/main/scala/sbt/util/internal/SeparatedCache.scala
+++ b/internal/util-cache/src/main/scala/sbt/internal/util/SeparatedCache.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 import Types.:+:
 import sbinary.{ DefaultProtocol, Format, Input, Output => Out }
diff --git a/internal/util-cache/src/test/scala/CacheTest.scala b/internal/util-cache/src/test/scala/CacheTest.scala
index d204d1f5e..569b0bf24 100644
--- a/internal/util-cache/src/test/scala/CacheTest.scala
+++ b/internal/util-cache/src/test/scala/CacheTest.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 
 import java.io.File
 import Types.:+:
diff --git a/internal/util-collection/src/main/scala/sbt/util/internal/AList.scala b/internal/util-collection/src/main/scala/sbt/internal/util/AList.scala
similarity index 99%
rename from internal/util-collection/src/main/scala/sbt/util/internal/AList.scala
rename to internal/util-collection/src/main/scala/sbt/internal/util/AList.scala
index e825b385c..3247e9a8a 100644
--- a/internal/util-collection/src/main/scala/sbt/util/internal/AList.scala
+++ b/internal/util-collection/src/main/scala/sbt/internal/util/AList.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 
 import Classes.Applicative
 import Types._
diff --git a/internal/util-collection/src/main/scala/sbt/util/internal/Attributes.scala b/internal/util-collection/src/main/scala/sbt/internal/util/Attributes.scala
similarity index 99%
rename from internal/util-collection/src/main/scala/sbt/util/internal/Attributes.scala
rename to internal/util-collection/src/main/scala/sbt/internal/util/Attributes.scala
index fb4bb8eaa..817896567 100644
--- a/internal/util-collection/src/main/scala/sbt/util/internal/Attributes.scala
+++ b/internal/util-collection/src/main/scala/sbt/internal/util/Attributes.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 import Types._
 import scala.reflect.Manifest
diff --git a/internal/util-collection/src/main/scala/sbt/util/internal/Classes.scala b/internal/util-collection/src/main/scala/sbt/internal/util/Classes.scala
similarity index 97%
rename from internal/util-collection/src/main/scala/sbt/util/internal/Classes.scala
rename to internal/util-collection/src/main/scala/sbt/internal/util/Classes.scala
index 678eb0651..b44cb8606 100644
--- a/internal/util-collection/src/main/scala/sbt/util/internal/Classes.scala
+++ b/internal/util-collection/src/main/scala/sbt/internal/util/Classes.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 
 object Classes {
   trait Applicative[M[_]] {
diff --git a/internal/util-collection/src/main/scala/sbt/util/internal/Dag.scala b/internal/util-collection/src/main/scala/sbt/internal/util/Dag.scala
similarity index 99%
rename from internal/util-collection/src/main/scala/sbt/util/internal/Dag.scala
rename to internal/util-collection/src/main/scala/sbt/internal/util/Dag.scala
index d41730e88..3a6e1d414 100644
--- a/internal/util-collection/src/main/scala/sbt/util/internal/Dag.scala
+++ b/internal/util-collection/src/main/scala/sbt/internal/util/Dag.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 David MacIver, Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 trait Dag[Node <: Dag[Node]] {
   self: Node =>
diff --git a/internal/util-collection/src/main/scala/sbt/util/internal/HList.scala b/internal/util-collection/src/main/scala/sbt/internal/util/HList.scala
similarity index 96%
rename from internal/util-collection/src/main/scala/sbt/util/internal/HList.scala
rename to internal/util-collection/src/main/scala/sbt/internal/util/HList.scala
index 01cded498..37c19dfdc 100644
--- a/internal/util-collection/src/main/scala/sbt/util/internal/HList.scala
+++ b/internal/util-collection/src/main/scala/sbt/internal/util/HList.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 import Types._
 
diff --git a/internal/util-collection/src/main/scala/sbt/util/internal/IDSet.scala b/internal/util-collection/src/main/scala/sbt/internal/util/IDSet.scala
similarity index 98%
rename from internal/util-collection/src/main/scala/sbt/util/internal/IDSet.scala
rename to internal/util-collection/src/main/scala/sbt/internal/util/IDSet.scala
index cefe13186..d7a9f7c1a 100644
--- a/internal/util-collection/src/main/scala/sbt/util/internal/IDSet.scala
+++ b/internal/util-collection/src/main/scala/sbt/internal/util/IDSet.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 /** A mutable set interface that uses object identity to test for set membership.*/
 trait IDSet[T] {
diff --git a/internal/util-collection/src/main/scala/sbt/util/internal/INode.scala b/internal/util-collection/src/main/scala/sbt/internal/util/INode.scala
similarity index 99%
rename from internal/util-collection/src/main/scala/sbt/util/internal/INode.scala
rename to internal/util-collection/src/main/scala/sbt/internal/util/INode.scala
index 3e2310f2f..d7a15eee8 100644
--- a/internal/util-collection/src/main/scala/sbt/util/internal/INode.scala
+++ b/internal/util-collection/src/main/scala/sbt/internal/util/INode.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 
 import java.lang.Runnable
 import java.util.concurrent.{ atomic, Executor, LinkedBlockingQueue }
diff --git a/internal/util-collection/src/main/scala/sbt/util/internal/KList.scala b/internal/util-collection/src/main/scala/sbt/internal/util/KList.scala
similarity index 98%
rename from internal/util-collection/src/main/scala/sbt/util/internal/KList.scala
rename to internal/util-collection/src/main/scala/sbt/internal/util/KList.scala
index 1df8c4df5..5530ba0bc 100644
--- a/internal/util-collection/src/main/scala/sbt/util/internal/KList.scala
+++ b/internal/util-collection/src/main/scala/sbt/internal/util/KList.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 
 import Types._
 import Classes.Applicative
diff --git a/internal/util-collection/src/main/scala/sbt/util/internal/PMap.scala b/internal/util-collection/src/main/scala/sbt/internal/util/PMap.scala
similarity index 99%
rename from internal/util-collection/src/main/scala/sbt/util/internal/PMap.scala
rename to internal/util-collection/src/main/scala/sbt/internal/util/PMap.scala
index f9ac4b0a0..a62755544 100644
--- a/internal/util-collection/src/main/scala/sbt/util/internal/PMap.scala
+++ b/internal/util-collection/src/main/scala/sbt/internal/util/PMap.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 import collection.mutable
 
diff --git a/internal/util-collection/src/main/scala/sbt/util/internal/Param.scala b/internal/util-collection/src/main/scala/sbt/internal/util/Param.scala
similarity index 95%
rename from internal/util-collection/src/main/scala/sbt/util/internal/Param.scala
rename to internal/util-collection/src/main/scala/sbt/internal/util/Param.scala
index 16bd17e49..08a58c837 100644
--- a/internal/util-collection/src/main/scala/sbt/util/internal/Param.scala
+++ b/internal/util-collection/src/main/scala/sbt/internal/util/Param.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 import Types._
 
diff --git a/internal/util-collection/src/main/scala/sbt/util/internal/Positions.scala b/internal/util-collection/src/main/scala/sbt/internal/util/Positions.scala
similarity index 94%
rename from internal/util-collection/src/main/scala/sbt/util/internal/Positions.scala
rename to internal/util-collection/src/main/scala/sbt/internal/util/Positions.scala
index fd64e4538..a11ae9c24 100755
--- a/internal/util-collection/src/main/scala/sbt/util/internal/Positions.scala
+++ b/internal/util-collection/src/main/scala/sbt/internal/util/Positions.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 
 sealed trait SourcePosition
 
diff --git a/internal/util-collection/src/main/scala/sbt/util/internal/Settings.scala b/internal/util-collection/src/main/scala/sbt/internal/util/Settings.scala
similarity index 99%
rename from internal/util-collection/src/main/scala/sbt/util/internal/Settings.scala
rename to internal/util-collection/src/main/scala/sbt/internal/util/Settings.scala
index 9e6cdf95e..f742a778c 100644
--- a/internal/util-collection/src/main/scala/sbt/util/internal/Settings.scala
+++ b/internal/util-collection/src/main/scala/sbt/internal/util/Settings.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2011 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 import Types._
 
diff --git a/internal/util-collection/src/main/scala/sbt/util/internal/Show.scala b/internal/util-collection/src/main/scala/sbt/internal/util/Show.scala
similarity index 84%
rename from internal/util-collection/src/main/scala/sbt/util/internal/Show.scala
rename to internal/util-collection/src/main/scala/sbt/internal/util/Show.scala
index 930431e13..4a0343ed7 100644
--- a/internal/util-collection/src/main/scala/sbt/util/internal/Show.scala
+++ b/internal/util-collection/src/main/scala/sbt/internal/util/Show.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 
 trait Show[T] {
   def apply(t: T): String
diff --git a/internal/util-collection/src/main/scala/sbt/util/internal/ShowLines.scala b/internal/util-collection/src/main/scala/sbt/internal/util/ShowLines.scala
similarity index 92%
rename from internal/util-collection/src/main/scala/sbt/util/internal/ShowLines.scala
rename to internal/util-collection/src/main/scala/sbt/internal/util/ShowLines.scala
index 794f3d5cb..f99a1394c 100644
--- a/internal/util-collection/src/main/scala/sbt/util/internal/ShowLines.scala
+++ b/internal/util-collection/src/main/scala/sbt/internal/util/ShowLines.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 
 trait ShowLines[A] {
   def showLines(a: A): Seq[String]
diff --git a/internal/util-collection/src/main/scala/sbt/util/internal/Signal.scala b/internal/util-collection/src/main/scala/sbt/internal/util/Signal.scala
similarity index 99%
rename from internal/util-collection/src/main/scala/sbt/util/internal/Signal.scala
rename to internal/util-collection/src/main/scala/sbt/internal/util/Signal.scala
index f8e3ed17d..8631fc75b 100644
--- a/internal/util-collection/src/main/scala/sbt/util/internal/Signal.scala
+++ b/internal/util-collection/src/main/scala/sbt/internal/util/Signal.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 
 object Signals {
   val CONT = "CONT"
diff --git a/internal/util-collection/src/main/scala/sbt/util/internal/TypeFunctions.scala b/internal/util-collection/src/main/scala/sbt/internal/util/TypeFunctions.scala
similarity index 98%
rename from internal/util-collection/src/main/scala/sbt/util/internal/TypeFunctions.scala
rename to internal/util-collection/src/main/scala/sbt/internal/util/TypeFunctions.scala
index ed1669f35..b7aac6360 100644
--- a/internal/util-collection/src/main/scala/sbt/util/internal/TypeFunctions.scala
+++ b/internal/util-collection/src/main/scala/sbt/internal/util/TypeFunctions.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 trait TypeFunctions {
   type Id[X] = X
diff --git a/internal/util-collection/src/main/scala/sbt/util/internal/Types.scala b/internal/util-collection/src/main/scala/sbt/internal/util/Types.scala
similarity index 88%
rename from internal/util-collection/src/main/scala/sbt/util/internal/Types.scala
rename to internal/util-collection/src/main/scala/sbt/internal/util/Types.scala
index 972f12769..9b6eb0733 100644
--- a/internal/util-collection/src/main/scala/sbt/util/internal/Types.scala
+++ b/internal/util-collection/src/main/scala/sbt/internal/util/Types.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 object Types extends Types
 
diff --git a/internal/util-collection/src/main/scala/sbt/util/internal/Util.scala b/internal/util-collection/src/main/scala/sbt/internal/util/Util.scala
similarity index 98%
rename from internal/util-collection/src/main/scala/sbt/util/internal/Util.scala
rename to internal/util-collection/src/main/scala/sbt/internal/util/Util.scala
index ba158ae57..4f82cae9c 100644
--- a/internal/util-collection/src/main/scala/sbt/util/internal/Util.scala
+++ b/internal/util-collection/src/main/scala/sbt/internal/util/Util.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2011 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 import java.util.Locale
 
diff --git a/internal/util-collection/src/test/scala/DagSpecification.scala b/internal/util-collection/src/test/scala/DagSpecification.scala
index 47c1b802b..9e5025488 100644
--- a/internal/util-collection/src/test/scala/DagSpecification.scala
+++ b/internal/util-collection/src/test/scala/DagSpecification.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008 Mark Harrah */
 
-package sbt.util.internal
+package sbt.internal.util
 
 import org.scalacheck._
 import Prop._
diff --git a/internal/util-collection/src/test/scala/KeyTest.scala b/internal/util-collection/src/test/scala/KeyTest.scala
index 8bdcd76bf..461655b88 100644
--- a/internal/util-collection/src/test/scala/KeyTest.scala
+++ b/internal/util-collection/src/test/scala/KeyTest.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 
 import org.scalacheck._
 import Prop._
diff --git a/internal/util-collection/src/test/scala/LiteralTest.scala b/internal/util-collection/src/test/scala/LiteralTest.scala
index 32da58a7b..b50d02632 100644
--- a/internal/util-collection/src/test/scala/LiteralTest.scala
+++ b/internal/util-collection/src/test/scala/LiteralTest.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 import Types._
 
diff --git a/internal/util-collection/src/test/scala/PMapTest.scala b/internal/util-collection/src/test/scala/PMapTest.scala
index e8aa2c6fa..9e1dde2c9 100644
--- a/internal/util-collection/src/test/scala/PMapTest.scala
+++ b/internal/util-collection/src/test/scala/PMapTest.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 import Types._
 
diff --git a/internal/util-collection/src/test/scala/SettingsExample.scala b/internal/util-collection/src/test/scala/SettingsExample.scala
index 96a8e01f6..f7b2f2cf0 100644
--- a/internal/util-collection/src/test/scala/SettingsExample.scala
+++ b/internal/util-collection/src/test/scala/SettingsExample.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 
 /** Define our settings system */
 
diff --git a/internal/util-collection/src/test/scala/SettingsTest.scala b/internal/util-collection/src/test/scala/SettingsTest.scala
index 3321c644b..8b77dba16 100644
--- a/internal/util-collection/src/test/scala/SettingsTest.scala
+++ b/internal/util-collection/src/test/scala/SettingsTest.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 
 import org.scalacheck._
 import Prop._
diff --git a/internal/util-complete/src/main/scala/sbt/util/internal/LineReader.scala b/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala
similarity index 98%
rename from internal/util-complete/src/main/scala/sbt/util/internal/LineReader.scala
rename to internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala
index c01986a0f..18cc431d7 100644
--- a/internal/util-complete/src/main/scala/sbt/util/internal/LineReader.scala
+++ b/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009  Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 import jline.console.ConsoleReader
 import jline.console.history.{ FileHistory, MemoryHistory }
@@ -128,7 +128,7 @@ final class FullReader(historyPath: Option[File], complete: Parser[_], val handl
   protected[this] val reader =
     {
       val cr = JLine.createReader(historyPath)
-      sbt.util.internal.complete.JLineCompletion.installCustomCompletor(cr, complete)
+      sbt.internal.util.complete.JLineCompletion.installCustomCompletor(cr, complete)
       cr
     }
 }
diff --git a/internal/util-complete/src/main/scala/sbt/util/internal/complete/Completions.scala b/internal/util-complete/src/main/scala/sbt/internal/util/complete/Completions.scala
similarity index 99%
rename from internal/util-complete/src/main/scala/sbt/util/internal/complete/Completions.scala
rename to internal/util-complete/src/main/scala/sbt/internal/util/complete/Completions.scala
index b3a562dc7..c035f3620 100644
--- a/internal/util-complete/src/main/scala/sbt/util/internal/complete/Completions.scala
+++ b/internal/util-complete/src/main/scala/sbt/internal/util/complete/Completions.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010  Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 package complete
 
 /**
diff --git a/internal/util-complete/src/main/scala/sbt/util/internal/complete/EditDistance.scala b/internal/util-complete/src/main/scala/sbt/internal/util/complete/EditDistance.scala
similarity index 97%
rename from internal/util-complete/src/main/scala/sbt/util/internal/complete/EditDistance.scala
rename to internal/util-complete/src/main/scala/sbt/internal/util/complete/EditDistance.scala
index 873d9035c..8cb617348 100644
--- a/internal/util-complete/src/main/scala/sbt/util/internal/complete/EditDistance.scala
+++ b/internal/util-complete/src/main/scala/sbt/internal/util/complete/EditDistance.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 package complete
 
 import java.lang.Character.{ toLowerCase => lower }
diff --git a/internal/util-complete/src/main/scala/sbt/util/internal/complete/ExampleSource.scala b/internal/util-complete/src/main/scala/sbt/internal/util/complete/ExampleSource.scala
similarity index 99%
rename from internal/util-complete/src/main/scala/sbt/util/internal/complete/ExampleSource.scala
rename to internal/util-complete/src/main/scala/sbt/internal/util/complete/ExampleSource.scala
index 932951e34..6539554a6 100644
--- a/internal/util-complete/src/main/scala/sbt/util/internal/complete/ExampleSource.scala
+++ b/internal/util-complete/src/main/scala/sbt/internal/util/complete/ExampleSource.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 package complete
 
 import java.io.File
diff --git a/internal/util-complete/src/main/scala/sbt/util/internal/complete/History.scala b/internal/util-complete/src/main/scala/sbt/internal/util/complete/History.scala
similarity index 98%
rename from internal/util-complete/src/main/scala/sbt/util/internal/complete/History.scala
rename to internal/util-complete/src/main/scala/sbt/internal/util/complete/History.scala
index bd925cd17..350c58dfa 100644
--- a/internal/util-complete/src/main/scala/sbt/util/internal/complete/History.scala
+++ b/internal/util-complete/src/main/scala/sbt/internal/util/complete/History.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010  Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 package complete
 
 import History.number
diff --git a/internal/util-complete/src/main/scala/sbt/util/internal/complete/HistoryCommands.scala b/internal/util-complete/src/main/scala/sbt/internal/util/complete/HistoryCommands.scala
similarity index 98%
rename from internal/util-complete/src/main/scala/sbt/util/internal/complete/HistoryCommands.scala
rename to internal/util-complete/src/main/scala/sbt/internal/util/complete/HistoryCommands.scala
index 662b914c0..f74d4e448 100644
--- a/internal/util-complete/src/main/scala/sbt/util/internal/complete/HistoryCommands.scala
+++ b/internal/util-complete/src/main/scala/sbt/internal/util/complete/HistoryCommands.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010  Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 package complete
 
 import java.io.File
diff --git a/internal/util-complete/src/main/scala/sbt/util/internal/complete/JLineCompletion.scala b/internal/util-complete/src/main/scala/sbt/internal/util/complete/JLineCompletion.scala
similarity index 99%
rename from internal/util-complete/src/main/scala/sbt/util/internal/complete/JLineCompletion.scala
rename to internal/util-complete/src/main/scala/sbt/internal/util/complete/JLineCompletion.scala
index c674e21db..e098f59f6 100644
--- a/internal/util-complete/src/main/scala/sbt/util/internal/complete/JLineCompletion.scala
+++ b/internal/util-complete/src/main/scala/sbt/internal/util/complete/JLineCompletion.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2011  Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 package complete
 
 import jline.console.ConsoleReader
diff --git a/internal/util-complete/src/main/scala/sbt/util/internal/complete/Parser.scala b/internal/util-complete/src/main/scala/sbt/internal/util/complete/Parser.scala
similarity index 99%
rename from internal/util-complete/src/main/scala/sbt/util/internal/complete/Parser.scala
rename to internal/util-complete/src/main/scala/sbt/internal/util/complete/Parser.scala
index 659f20e7b..a41c0d7d2 100644
--- a/internal/util-complete/src/main/scala/sbt/util/internal/complete/Parser.scala
+++ b/internal/util-complete/src/main/scala/sbt/internal/util/complete/Parser.scala
@@ -1,12 +1,12 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2010, 2011  Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 package complete
 
 import Parser._
-import sbt.util.internal.Types.{ left, right, some }
-import sbt.util.internal.Util.{ makeList, separate }
+import sbt.internal.util.Types.{ left, right, some }
+import sbt.internal.util.Util.{ makeList, separate }
 
 /**
  * A String parser that provides semi-automatic tab completion.
diff --git a/internal/util-complete/src/main/scala/sbt/util/internal/complete/Parsers.scala b/internal/util-complete/src/main/scala/sbt/internal/util/complete/Parsers.scala
similarity index 99%
rename from internal/util-complete/src/main/scala/sbt/util/internal/complete/Parsers.scala
rename to internal/util-complete/src/main/scala/sbt/internal/util/complete/Parsers.scala
index e0b81884f..9463d1acb 100644
--- a/internal/util-complete/src/main/scala/sbt/util/internal/complete/Parsers.scala
+++ b/internal/util-complete/src/main/scala/sbt/internal/util/complete/Parsers.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2011  Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 package complete
 
 import Parser._
diff --git a/internal/util-complete/src/main/scala/sbt/util/internal/complete/ProcessError.scala b/internal/util-complete/src/main/scala/sbt/internal/util/complete/ProcessError.scala
similarity index 97%
rename from internal/util-complete/src/main/scala/sbt/util/internal/complete/ProcessError.scala
rename to internal/util-complete/src/main/scala/sbt/internal/util/complete/ProcessError.scala
index 2faa17634..6d74ed2d2 100644
--- a/internal/util-complete/src/main/scala/sbt/util/internal/complete/ProcessError.scala
+++ b/internal/util-complete/src/main/scala/sbt/internal/util/complete/ProcessError.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 package complete
 
 object ProcessError {
diff --git a/internal/util-complete/src/main/scala/sbt/util/internal/complete/TokenCompletions.scala b/internal/util-complete/src/main/scala/sbt/internal/util/complete/TokenCompletions.scala
similarity index 98%
rename from internal/util-complete/src/main/scala/sbt/util/internal/complete/TokenCompletions.scala
rename to internal/util-complete/src/main/scala/sbt/internal/util/complete/TokenCompletions.scala
index 6d3e5100f..0d0b2980e 100644
--- a/internal/util-complete/src/main/scala/sbt/util/internal/complete/TokenCompletions.scala
+++ b/internal/util-complete/src/main/scala/sbt/internal/util/complete/TokenCompletions.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 package complete
 
 import Completion.{ token => ctoken, tokenDisplay }
diff --git a/internal/util-complete/src/main/scala/sbt/util/internal/complete/TypeString.scala b/internal/util-complete/src/main/scala/sbt/internal/util/complete/TypeString.scala
similarity index 99%
rename from internal/util-complete/src/main/scala/sbt/util/internal/complete/TypeString.scala
rename to internal/util-complete/src/main/scala/sbt/internal/util/complete/TypeString.scala
index 1ac092023..9a308a2bf 100644
--- a/internal/util-complete/src/main/scala/sbt/util/internal/complete/TypeString.scala
+++ b/internal/util-complete/src/main/scala/sbt/internal/util/complete/TypeString.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 package complete
 
 import DefaultParsers._
diff --git a/internal/util-complete/src/main/scala/sbt/util/internal/complete/UpperBound.scala b/internal/util-complete/src/main/scala/sbt/internal/util/complete/UpperBound.scala
similarity index 98%
rename from internal/util-complete/src/main/scala/sbt/util/internal/complete/UpperBound.scala
rename to internal/util-complete/src/main/scala/sbt/internal/util/complete/UpperBound.scala
index cd42e688b..6b600f9ed 100644
--- a/internal/util-complete/src/main/scala/sbt/util/internal/complete/UpperBound.scala
+++ b/internal/util-complete/src/main/scala/sbt/internal/util/complete/UpperBound.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008,2010  Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 package complete
 
 sealed trait UpperBound {
diff --git a/internal/util-complete/src/test/scala/ParserTest.scala b/internal/util-complete/src/test/scala/ParserTest.scala
index c1bd8c45c..1db99b513 100644
--- a/internal/util-complete/src/test/scala/ParserTest.scala
+++ b/internal/util-complete/src/test/scala/ParserTest.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 package complete
 
 object JLineTest {
diff --git a/internal/util-complete/src/test/scala/sbt/complete/FileExamplesTest.scala b/internal/util-complete/src/test/scala/sbt/complete/FileExamplesTest.scala
index a0db3d777..2af9388a7 100644
--- a/internal/util-complete/src/test/scala/sbt/complete/FileExamplesTest.scala
+++ b/internal/util-complete/src/test/scala/sbt/complete/FileExamplesTest.scala
@@ -1,54 +1,60 @@
-package sbt.util.internal
+package sbt.internal.util
 package complete
 
-import org.specs2.mutable.Specification
-import org.specs2.specification.Scope
 import java.io.File
 import sbt.io.IO._
 
-class FileExamplesTest extends Specification {
+class FileExamplesTest extends UnitSpec {
 
-  "listing all files in an absolute base directory" should {
-    "produce the entire base directory's contents" in new directoryStructure {
-      fileExamples().toList should containTheSameElementsAs(allRelativizedPaths)
+  "listing all files in an absolute base directory" should
+    "produce the entire base directory's contents" in {
+      val _ = new DirectoryStructure {
+        fileExamples().toList should contain theSameElementsAs (allRelativizedPaths)
+      }
+    }
+
+  "listing files with a prefix that matches none" should
+    "produce an empty list" in {
+      val _ = new DirectoryStructure(withCompletionPrefix = "z") {
+        fileExamples().toList shouldBe empty
+      }
+    }
+
+  "listing single-character prefixed files" should
+    "produce matching paths only" in {
+      val _ = new DirectoryStructure(withCompletionPrefix = "f") {
+        fileExamples().toList should contain theSameElementsAs (prefixedPathsOnly)
+      }
+    }
+
+  "listing directory-prefixed files" should
+    "produce matching paths only" in {
+      val _ = new DirectoryStructure(withCompletionPrefix = "far") {
+        fileExamples().toList should contain theSameElementsAs (prefixedPathsOnly)
+      }
+    }
+
+  it should "produce sub-dir contents only when appending a file separator to the directory" in {
+    val _ = new DirectoryStructure(withCompletionPrefix = "far" + File.separator) {
+      fileExamples().toList should contain theSameElementsAs (prefixedPathsOnly)
     }
   }
 
-  "listing files with a prefix that matches none" should {
-    "produce an empty list" in new directoryStructure(withCompletionPrefix = "z") {
-      fileExamples().toList should beEmpty
-    }
-  }
-
-  "listing single-character prefixed files" should {
-    "produce matching paths only" in new directoryStructure(withCompletionPrefix = "f") {
-      fileExamples().toList should containTheSameElementsAs(prefixedPathsOnly)
-    }
-  }
-
-  "listing directory-prefixed files" should {
-    "produce matching paths only" in new directoryStructure(withCompletionPrefix = "far") {
-      fileExamples().toList should containTheSameElementsAs(prefixedPathsOnly)
+  "listing files with a sub-path prefix" should
+    "produce matching paths only" in {
+      val _ = new DirectoryStructure(withCompletionPrefix = "far" + File.separator + "ba") {
+        fileExamples().toList should contain theSameElementsAs (prefixedPathsOnly)
+      }
     }
 
-    "produce sub-dir contents only when appending a file separator to the directory" in new directoryStructure(withCompletionPrefix = "far" + File.separator) {
-      fileExamples().toList should containTheSameElementsAs(prefixedPathsOnly)
+  "completing a full path" should
+    "produce a list with an empty string" in {
+      val _ = new DirectoryStructure(withCompletionPrefix = "bazaar") {
+        fileExamples().toList shouldEqual List("")
+      }
     }
-  }
 
-  "listing files with a sub-path prefix" should {
-    "produce matching paths only" in new directoryStructure(withCompletionPrefix = "far" + File.separator + "ba") {
-      fileExamples().toList should containTheSameElementsAs(prefixedPathsOnly)
-    }
-  }
-
-  "completing a full path" should {
-    "produce a list with an empty string" in new directoryStructure(withCompletionPrefix = "bazaar") {
-      fileExamples().toList shouldEqual List("")
-    }
-  }
-
-  class directoryStructure(withCompletionPrefix: String = "") extends Scope with DelayedInit {
+  class DirectoryStructure(withCompletionPrefix: String = "") extends DelayedInit {
     var fileExamples: FileExamples = _
     var baseDir: File = _
     var childFiles: List[File] = _
diff --git a/internal/util-complete/src/test/scala/sbt/complete/FixedSetExamplesTest.scala b/internal/util-complete/src/test/scala/sbt/complete/FixedSetExamplesTest.scala
index 4323b8e24..b043497db 100644
--- a/internal/util-complete/src/test/scala/sbt/complete/FixedSetExamplesTest.scala
+++ b/internal/util-complete/src/test/scala/sbt/complete/FixedSetExamplesTest.scala
@@ -1,26 +1,23 @@
-package sbt.util.internal
+package sbt.internal.util
 package complete
 
-import org.specs2.mutable.Specification
-import org.specs2.specification.Scope
+class FixedSetExamplesTest extends UnitSpec {
 
-class FixedSetExamplesTest extends Specification {
-
-  "adding a prefix" should {
-    "produce a smaller set of examples with the prefix removed" in new examples {
-      fixedSetExamples.withAddedPrefix("f")() must containTheSameElementsAs(List("oo", "ool", "u"))
-      fixedSetExamples.withAddedPrefix("fo")() must containTheSameElementsAs(List("o", "ol"))
-      fixedSetExamples.withAddedPrefix("b")() must containTheSameElementsAs(List("ar"))
+  "adding a prefix" should "produce a smaller set of examples with the prefix removed" in {
+    val _ = new Examples {
+      fixedSetExamples.withAddedPrefix("f")() should contain theSameElementsAs (List("oo", "ool", "u"))
+      fixedSetExamples.withAddedPrefix("fo")() should contain theSameElementsAs (List("o", "ol"))
+      fixedSetExamples.withAddedPrefix("b")() should contain theSameElementsAs (List("ar"))
     }
   }
 
-  "without a prefix" should {
-    "produce the original set" in new examples {
-      fixedSetExamples() mustEqual exampleSet
+  "without a prefix" should "produce the original set" in {
+    val _ = new Examples {
+      fixedSetExamples() shouldBe exampleSet
     }
   }
 
-  trait examples extends Scope {
+  trait Examples {
     val exampleSet = List("foo", "bar", "fool", "fu")
     val fixedSetExamples = FixedSetExamples(exampleSet)
   }
diff --git a/internal/util-complete/src/test/scala/sbt/complete/ParserWithExamplesTest.scala b/internal/util-complete/src/test/scala/sbt/complete/ParserWithExamplesTest.scala
index 854569e88..684cbe403 100644
--- a/internal/util-complete/src/test/scala/sbt/complete/ParserWithExamplesTest.scala
+++ b/internal/util-complete/src/test/scala/sbt/complete/ParserWithExamplesTest.scala
@@ -1,61 +1,64 @@
-package sbt.util.internal
+package sbt.internal.util
 package complete
 
-import org.specs2.mutable.Specification
-import org.specs2.specification.Scope
 import Completion._
 
-class ParserWithExamplesTest extends Specification {
+class ParserWithExamplesTest extends UnitSpec {
 
-  "listing a limited number of completions" should {
-    "grab only the needed number of elements from the iterable source of examples" in new parserWithLazyExamples {
-      parserWithExamples.completions(0)
-      examples.size shouldEqual maxNumberOfExamples
+  "listing a limited number of completions" should
+    "grab only the needed number of elements from the iterable source of examples" in {
+      val _ = new ParserWithLazyExamples {
+        parserWithExamples.completions(0)
+        examples.size shouldEqual maxNumberOfExamples
+      }
     }
-  }
 
-  "listing only valid completions" should {
-    "use the delegate parser to remove invalid examples" in new parserWithValidExamples {
-      val validCompletions = Completions(Set(
-        suggestion("blue"),
-        suggestion("red")))
-      parserWithExamples.completions(0) shouldEqual validCompletions
+  "listing only valid completions" should
+    "use the delegate parser to remove invalid examples" in {
+      val _ = new ParserWithValidExamples {
+        val validCompletions = Completions(Set(
+          suggestion("blue"),
+          suggestion("red")))
+        parserWithExamples.completions(0) shouldEqual validCompletions
+      }
     }
-  }
 
-  "listing valid completions in a derived parser" should {
-    "produce only valid examples that start with the character of the derivation" in new parserWithValidExamples {
-      val derivedCompletions = Completions(Set(
-        suggestion("lue")))
-      parserWithExamples.derive('b').completions(0) shouldEqual derivedCompletions
+  "listing valid completions in a derived parser" should
+    "produce only valid examples that start with the character of the derivation" in {
+      val _ = new ParserWithValidExamples {
+        val derivedCompletions = Completions(Set(
+          suggestion("lue")))
+        parserWithExamples.derive('b').completions(0) shouldEqual derivedCompletions
+      }
     }
-  }
 
-  "listing valid and invalid completions" should {
-    "produce the entire source of examples" in new parserWithAllExamples {
-      val completions = Completions(examples.map(suggestion(_)).toSet)
-      parserWithExamples.completions(0) shouldEqual completions
+  "listing valid and invalid completions" should
+    "produce the entire source of examples" in {
+      val _ = new parserWithAllExamples {
+        val completions = Completions(examples.map(suggestion(_)).toSet)
+        parserWithExamples.completions(0) shouldEqual completions
+      }
     }
-  }
 
-  "listing valid and invalid completions in a derived parser" should {
-    "produce only examples that start with the character of the derivation" in new parserWithAllExamples {
-      val derivedCompletions = Completions(Set(
-        suggestion("lue"),
-        suggestion("lock")))
-      parserWithExamples.derive('b').completions(0) shouldEqual derivedCompletions
+  "listing valid and invalid completions in a derived parser" should
+    "produce only examples that start with the character of the derivation" in {
+      val _ = new parserWithAllExamples {
+        val derivedCompletions = Completions(Set(
+          suggestion("lue"),
+          suggestion("lock")))
+        parserWithExamples.derive('b').completions(0) shouldEqual derivedCompletions
+      }
     }
-  }
 
-  class parserWithLazyExamples extends parser(GrowableSourceOfExamples(), maxNumberOfExamples = 5, removeInvalidExamples = false)
+  class ParserWithLazyExamples extends ParserExample(GrowableSourceOfExamples(), maxNumberOfExamples = 5, removeInvalidExamples = false)
 
-  class parserWithValidExamples extends parser(removeInvalidExamples = true)
+  class ParserWithValidExamples extends ParserExample(removeInvalidExamples = true)
 
-  class parserWithAllExamples extends parser(removeInvalidExamples = false)
+  class parserWithAllExamples extends ParserExample(removeInvalidExamples = false)
 
-  case class parser(examples: Iterable[String] = Set("blue", "yellow", "greeen", "block", "red"),
+  case class ParserExample(examples: Iterable[String] = Set("blue", "yellow", "greeen", "block", "red"),
     maxNumberOfExamples: Int = 25,
-    removeInvalidExamples: Boolean) extends Scope {
+    removeInvalidExamples: Boolean) {
 
     import DefaultParsers._
 
diff --git a/internal/util-control/src/main/scala/sbt/util/internal/ErrorHandling.scala b/internal/util-control/src/main/scala/sbt/internal/util/ErrorHandling.scala
similarity index 97%
rename from internal/util-control/src/main/scala/sbt/util/internal/ErrorHandling.scala
rename to internal/util-control/src/main/scala/sbt/internal/util/ErrorHandling.scala
index 6a93451cf..ae0d5443e 100644
--- a/internal/util-control/src/main/scala/sbt/util/internal/ErrorHandling.scala
+++ b/internal/util-control/src/main/scala/sbt/internal/util/ErrorHandling.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009  Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 import java.io.IOException
 
diff --git a/internal/util-control/src/main/scala/sbt/util/internal/ExitHook.scala b/internal/util-control/src/main/scala/sbt/internal/util/ExitHook.scala
similarity index 96%
rename from internal/util-control/src/main/scala/sbt/util/internal/ExitHook.scala
rename to internal/util-control/src/main/scala/sbt/internal/util/ExitHook.scala
index 80b2b9a75..823c64b01 100644
--- a/internal/util-control/src/main/scala/sbt/util/internal/ExitHook.scala
+++ b/internal/util-control/src/main/scala/sbt/internal/util/ExitHook.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009, 2010  Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 /** Defines a function to call as sbt exits.*/
 trait ExitHook {
diff --git a/internal/util-control/src/main/scala/sbt/util/internal/MessageOnlyException.scala b/internal/util-control/src/main/scala/sbt/internal/util/MessageOnlyException.scala
similarity index 97%
rename from internal/util-control/src/main/scala/sbt/util/internal/MessageOnlyException.scala
rename to internal/util-control/src/main/scala/sbt/internal/util/MessageOnlyException.scala
index 425928a11..32c16ee4d 100644
--- a/internal/util-control/src/main/scala/sbt/util/internal/MessageOnlyException.scala
+++ b/internal/util-control/src/main/scala/sbt/internal/util/MessageOnlyException.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2011 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 final class MessageOnlyException(override val toString: String) extends RuntimeException(toString)
 
diff --git a/internal/util-logging/src/main/scala/sbt/util/internal/BasicLogger.scala b/internal/util-logging/src/main/scala/sbt/internal/util/BasicLogger.scala
similarity index 64%
rename from internal/util-logging/src/main/scala/sbt/util/internal/BasicLogger.scala
rename to internal/util-logging/src/main/scala/sbt/internal/util/BasicLogger.scala
index b9a2913e2..1838822c5 100644
--- a/internal/util-logging/src/main/scala/sbt/util/internal/BasicLogger.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/BasicLogger.scala
@@ -1,17 +1,19 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
+
+import sbt.util._
 
 /** Implements the level-setting methods of Logger.*/
 abstract class BasicLogger extends AbstractLogger {
-  private var traceEnabledVar = java.lang.Integer.MAX_VALUE
+  private var traceEnabledVar: Int = java.lang.Integer.MAX_VALUE
   private var level: Level.Value = Level.Info
   private var successEnabledVar = true
-  def successEnabled = synchronized { successEnabledVar }
+  def successEnabled: Boolean = synchronized { successEnabledVar }
   def setSuccessEnabled(flag: Boolean): Unit = synchronized { successEnabledVar = flag }
-  def getLevel = synchronized { level }
+  def getLevel: Level.Value = synchronized { level }
   def setLevel(newLevel: Level.Value): Unit = synchronized { level = newLevel }
   def setTrace(level: Int): Unit = synchronized { traceEnabledVar = level }
-  def getTrace = synchronized { traceEnabledVar }
-}
\ No newline at end of file
+  def getTrace: Int = synchronized { traceEnabledVar }
+}
diff --git a/internal/util-logging/src/main/scala/sbt/util/internal/BufferedLogger.scala b/internal/util-logging/src/main/scala/sbt/internal/util/BufferedLogger.scala
similarity index 98%
rename from internal/util-logging/src/main/scala/sbt/util/internal/BufferedLogger.scala
rename to internal/util-logging/src/main/scala/sbt/internal/util/BufferedLogger.scala
index a1aaa002a..d1f03cc72 100644
--- a/internal/util-logging/src/main/scala/sbt/util/internal/BufferedLogger.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/BufferedLogger.scala
@@ -1,8 +1,9 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
+import sbt.util._
 import scala.collection.mutable.ListBuffer
 
 /**
diff --git a/internal/util-logging/src/main/scala/sbt/util/internal/ConsoleLogger.scala b/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleLogger.scala
similarity index 99%
rename from internal/util-logging/src/main/scala/sbt/util/internal/ConsoleLogger.scala
rename to internal/util-logging/src/main/scala/sbt/internal/util/ConsoleLogger.scala
index ae9e2c670..5ca3fe9ee 100644
--- a/internal/util-logging/src/main/scala/sbt/util/internal/ConsoleLogger.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleLogger.scala
@@ -1,8 +1,9 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010, 2011 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
+import sbt.util._
 import java.io.{ BufferedWriter, PrintStream, PrintWriter }
 import java.util.Locale
 
diff --git a/internal/util-logging/src/main/scala/sbt/util/internal/ConsoleOut.scala b/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleOut.scala
similarity index 98%
rename from internal/util-logging/src/main/scala/sbt/util/internal/ConsoleOut.scala
rename to internal/util-logging/src/main/scala/sbt/internal/util/ConsoleOut.scala
index 4c20ee329..cffec8781 100644
--- a/internal/util-logging/src/main/scala/sbt/util/internal/ConsoleOut.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleOut.scala
@@ -1,5 +1,6 @@
-package sbt.util.internal
+package sbt.internal.util
 
+import sbt.util._
 import java.io.{ BufferedWriter, PrintStream, PrintWriter }
 
 sealed trait ConsoleOut {
diff --git a/internal/util-logging/src/main/scala/sbt/util/internal/FilterLogger.scala b/internal/util-logging/src/main/scala/sbt/internal/util/FilterLogger.scala
similarity index 96%
rename from internal/util-logging/src/main/scala/sbt/util/internal/FilterLogger.scala
rename to internal/util-logging/src/main/scala/sbt/internal/util/FilterLogger.scala
index d0f503495..d52901c7b 100644
--- a/internal/util-logging/src/main/scala/sbt/util/internal/FilterLogger.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/FilterLogger.scala
@@ -1,7 +1,9 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
+
+import sbt.util._
 
 /**
  * A filter logger is used to delegate messages but not the logging level to another logger.  This means
diff --git a/internal/util-logging/src/main/scala/sbt/util/internal/FullLogger.scala b/internal/util-logging/src/main/scala/sbt/internal/util/FullLogger.scala
similarity index 95%
rename from internal/util-logging/src/main/scala/sbt/util/internal/FullLogger.scala
rename to internal/util-logging/src/main/scala/sbt/internal/util/FullLogger.scala
index 64066abdb..1493e2d0f 100644
--- a/internal/util-logging/src/main/scala/sbt/util/internal/FullLogger.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/FullLogger.scala
@@ -1,7 +1,9 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
+
+import sbt.util._
 
 /** Promotes the simple Logger interface to the full AbstractLogger interface. */
 class FullLogger(delegate: Logger) extends BasicLogger {
diff --git a/internal/util-logging/src/main/scala/sbt/util/internal/GlobalLogging.scala b/internal/util-logging/src/main/scala/sbt/internal/util/GlobalLogging.scala
similarity index 97%
rename from internal/util-logging/src/main/scala/sbt/util/internal/GlobalLogging.scala
rename to internal/util-logging/src/main/scala/sbt/internal/util/GlobalLogging.scala
index df9b5e0e3..191408393 100644
--- a/internal/util-logging/src/main/scala/sbt/util/internal/GlobalLogging.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/GlobalLogging.scala
@@ -1,8 +1,9 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
+import sbt.util._
 import java.io.{ File, PrintWriter }
 
 /**
diff --git a/internal/util-logging/src/main/scala/sbt/util/internal/LoggerWriter.scala b/internal/util-logging/src/main/scala/sbt/internal/util/LoggerWriter.scala
similarity index 97%
rename from internal/util-logging/src/main/scala/sbt/util/internal/LoggerWriter.scala
rename to internal/util-logging/src/main/scala/sbt/internal/util/LoggerWriter.scala
index b616a045b..7b440c200 100644
--- a/internal/util-logging/src/main/scala/sbt/util/internal/LoggerWriter.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/LoggerWriter.scala
@@ -1,7 +1,9 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
+
+import sbt.util._
 
 /**
  * Provides a `java.io.Writer` interface to a `Logger`.  Content is line-buffered and logged at `level`.
diff --git a/internal/util-logging/src/main/scala/sbt/util/internal/MainLogging.scala b/internal/util-logging/src/main/scala/sbt/internal/util/MainLogging.scala
similarity index 97%
rename from internal/util-logging/src/main/scala/sbt/util/internal/MainLogging.scala
rename to internal/util-logging/src/main/scala/sbt/internal/util/MainLogging.scala
index 9a1240fc6..aeab7e5cd 100644
--- a/internal/util-logging/src/main/scala/sbt/util/internal/MainLogging.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/MainLogging.scala
@@ -1,5 +1,6 @@
-package sbt.util.internal
+package sbt.internal.util
 
+import sbt.util._
 import java.io.PrintWriter
 
 object MainLogging {
diff --git a/internal/util-logging/src/main/scala/sbt/util/internal/MultiLogger.scala b/internal/util-logging/src/main/scala/sbt/internal/util/MultiLogger.scala
similarity index 97%
rename from internal/util-logging/src/main/scala/sbt/util/internal/MultiLogger.scala
rename to internal/util-logging/src/main/scala/sbt/internal/util/MultiLogger.scala
index add4a8761..84168fd27 100644
--- a/internal/util-logging/src/main/scala/sbt/util/internal/MultiLogger.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/MultiLogger.scala
@@ -2,7 +2,9 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
+
+import sbt.util._
 
 // note that setting the logging level on this logger has no effect on its behavior, only
 //   on the behavior of the delegates.
diff --git a/internal/util-logging/src/main/scala/sbt/util/internal/StackTrace.scala b/internal/util-logging/src/main/scala/sbt/internal/util/StackTrace.scala
similarity index 98%
rename from internal/util-logging/src/main/scala/sbt/util/internal/StackTrace.scala
rename to internal/util-logging/src/main/scala/sbt/internal/util/StackTrace.scala
index 595529d49..af16e35d4 100644
--- a/internal/util-logging/src/main/scala/sbt/util/internal/StackTrace.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/StackTrace.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Tony Sloane
  */
-package sbt.util.internal
+package sbt.internal.util
 
 object StackTrace {
   def isSbtClass(name: String) = name.startsWith("sbt") || name.startsWith("xsbt")
diff --git a/internal/util-logging/src/main/scala/sbt/util/AbtractLogger.scala b/internal/util-logging/src/main/scala/sbt/util/AbtractLogger.scala
new file mode 100644
index 000000000..51b7f08b5
--- /dev/null
+++ b/internal/util-logging/src/main/scala/sbt/util/AbtractLogger.scala
@@ -0,0 +1,28 @@
+package sbt.util
+
+abstract class AbstractLogger extends Logger {
+  def getLevel: Level.Value
+  def setLevel(newLevel: Level.Value): Unit
+  def setTrace(flag: Int): Unit
+  def getTrace: Int
+  final def traceEnabled: Boolean = getTrace >= 0
+  def successEnabled: Boolean
+  def setSuccessEnabled(flag: Boolean): Unit
+
+  def atLevel(level: Level.Value): Boolean = level.id >= getLevel.id
+  def control(event: ControlEvent.Value, message: => String): Unit
+
+  def logAll(events: Seq[LogEvent]): Unit
+  /** Defined in terms of other methods in Logger and should not be called from them. */
+  final def log(event: LogEvent): Unit = {
+    event match {
+      case s: Success       => success(s.msg)
+      case l: Log           => log(l.level, l.msg)
+      case t: Trace         => trace(t.exception)
+      case setL: SetLevel   => setLevel(setL.newLevel)
+      case setT: SetTrace   => setTrace(setT.level)
+      case setS: SetSuccess => setSuccessEnabled(setS.enabled)
+      case c: ControlEvent  => control(c.event, c.msg)
+    }
+  }
+}
diff --git a/internal/util-logging/src/main/scala/sbt/util/internal/Level.scala b/internal/util-logging/src/main/scala/sbt/util/Level.scala
similarity index 97%
rename from internal/util-logging/src/main/scala/sbt/util/internal/Level.scala
rename to internal/util-logging/src/main/scala/sbt/util/Level.scala
index 5a9d3e717..2f319cffd 100644
--- a/internal/util-logging/src/main/scala/sbt/util/internal/Level.scala
+++ b/internal/util-logging/src/main/scala/sbt/util/Level.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009 Mark Harrah
  */
-package sbt.util.internal
+package sbt.util
 
 /**
  * An enumeration defining the levels available for logging.  A level includes all of the levels
@@ -25,4 +25,4 @@ object Level extends Enumeration {
   def apply(s: String) = values.find(s == _.toString)
   /** Same as apply, defined for use in pattern matching. */
   private[sbt] def unapply(s: String) = apply(s)
-}
\ No newline at end of file
+}
diff --git a/internal/util-logging/src/main/scala/sbt/util/internal/LogEvent.scala b/internal/util-logging/src/main/scala/sbt/util/LogEvent.scala
similarity index 95%
rename from internal/util-logging/src/main/scala/sbt/util/internal/LogEvent.scala
rename to internal/util-logging/src/main/scala/sbt/util/LogEvent.scala
index a03c306b1..b6225896f 100644
--- a/internal/util-logging/src/main/scala/sbt/util/internal/LogEvent.scala
+++ b/internal/util-logging/src/main/scala/sbt/util/LogEvent.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009 Mark Harrah
  */
-package sbt.util.internal
+package sbt.util
 
 sealed trait LogEvent extends NotNull
 final class Success(val msg: String) extends LogEvent
diff --git a/internal/util-logging/src/main/scala/sbt/util/internal/Logger.scala b/internal/util-logging/src/main/scala/sbt/util/Logger.scala
similarity index 80%
rename from internal/util-logging/src/main/scala/sbt/util/internal/Logger.scala
rename to internal/util-logging/src/main/scala/sbt/util/Logger.scala
index a3daea79a..17e19f902 100644
--- a/internal/util-logging/src/main/scala/sbt/util/internal/Logger.scala
+++ b/internal/util-logging/src/main/scala/sbt/util/Logger.scala
@@ -1,39 +1,42 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010  Mark Harrah
  */
-package sbt.util.internal
+package sbt.util
 
 import xsbti.{ Logger => xLogger, F0 }
 import xsbti.{ Maybe, Position, Problem, Severity }
 import sys.process.ProcessLogger
+import sbt.internal.util.{ BufferedLogger, FullLogger }
 
 import java.io.File
 
-abstract class AbstractLogger extends Logger {
-  def getLevel: Level.Value
-  def setLevel(newLevel: Level.Value): Unit
-  def setTrace(flag: Int): Unit
-  def getTrace: Int
-  final def traceEnabled: Boolean = getTrace >= 0
-  def successEnabled: Boolean
-  def setSuccessEnabled(flag: Boolean): Unit
+/**
+ * This is intended to be the simplest logging interface for use by code that wants to log.
+ * It does not include configuring the logger.
+ */
+abstract class Logger extends xLogger {
+  final def verbose(message: => String): Unit = debug(message)
+  final def debug(message: => String): Unit = log(Level.Debug, message)
+  final def info(message: => String): Unit = log(Level.Info, message)
+  final def warn(message: => String): Unit = log(Level.Warn, message)
+  final def error(message: => String): Unit = log(Level.Error, message)
+  // Added by sys.process.ProcessLogger
+  final def err(message: => String): Unit = log(Level.Error, message)
+  // sys.process.ProcessLogger
+  final def out(message: => String): Unit = log(Level.Info, message)
 
-  def atLevel(level: Level.Value): Boolean = level.id >= getLevel.id
-  def control(event: ControlEvent.Value, message: => String): Unit
+  def ansiCodesSupported: Boolean = false
 
-  def logAll(events: Seq[LogEvent]): Unit
-  /** Defined in terms of other methods in Logger and should not be called from them. */
-  final def log(event: LogEvent): Unit = {
-    event match {
-      case s: Success       => success(s.msg)
-      case l: Log           => log(l.level, l.msg)
-      case t: Trace         => trace(t.exception)
-      case setL: SetLevel   => setLevel(setL.newLevel)
-      case setT: SetTrace   => setTrace(setT.level)
-      case setS: SetSuccess => setSuccessEnabled(setS.enabled)
-      case c: ControlEvent  => control(c.event, c.msg)
-    }
-  }
+  def trace(t: => Throwable): Unit
+  def success(message: => String): Unit
+  def log(level: Level.Value, message: => String): Unit
+
+  def debug(msg: F0[String]): Unit = log(Level.Debug, msg)
+  def warn(msg: F0[String]): Unit = log(Level.Warn, msg)
+  def info(msg: F0[String]): Unit = log(Level.Info, msg)
+  def error(msg: F0[String]): Unit = log(Level.Error, msg)
+  def trace(msg: F0[Throwable]): Unit = trace(msg.apply)
+  def log(level: Level.Value, msg: F0[String]): Unit = log(level, msg.apply)
 }
 
 object Logger {
@@ -107,32 +110,3 @@ object Logger {
       override def toString = s"[$severity] $pos: $message"
     }
 }
-
-/**
- * This is intended to be the simplest logging interface for use by code that wants to log.
- * It does not include configuring the logger.
- */
-trait Logger extends xLogger {
-  final def verbose(message: => String): Unit = debug(message)
-  final def debug(message: => String): Unit = log(Level.Debug, message)
-  final def info(message: => String): Unit = log(Level.Info, message)
-  final def warn(message: => String): Unit = log(Level.Warn, message)
-  final def error(message: => String): Unit = log(Level.Error, message)
-  // Added by sys.process.ProcessLogger
-  final def err(message: => String): Unit = log(Level.Error, message)
-  // sys.process.ProcessLogger
-  final def out(message: => String): Unit = log(Level.Info, message)
-
-  def ansiCodesSupported: Boolean = false
-
-  def trace(t: => Throwable): Unit
-  def success(message: => String): Unit
-  def log(level: Level.Value, message: => String): Unit
-
-  def debug(msg: F0[String]): Unit = log(Level.Debug, msg)
-  def warn(msg: F0[String]): Unit = log(Level.Warn, msg)
-  def info(msg: F0[String]): Unit = log(Level.Info, msg)
-  def error(msg: F0[String]): Unit = log(Level.Error, msg)
-  def trace(msg: F0[Throwable]): Unit = trace(msg.apply)
-  def log(level: Level.Value, msg: F0[String]): Unit = log(level, msg.apply)
-}
diff --git a/internal/util-logging/src/test/scala/Escapes.scala b/internal/util-logging/src/test/scala/Escapes.scala
index bf2e0bdd3..9078f4d59 100644
--- a/internal/util-logging/src/test/scala/Escapes.scala
+++ b/internal/util-logging/src/test/scala/Escapes.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 
 import org.scalacheck._
 import Prop._
@@ -61,6 +61,7 @@ object Escapes extends Properties("Escapes") {
   final case class EscapeAndNot(escape: EscapeSequence, notEscape: String) {
     override def toString = s"EscapeAntNot(escape = [$escape], notEscape = [${notEscape.map(_.toInt)}])"
   }
+  // 2.10.5 warns on "implicit numeric widening" but it looks like a bug: https://issues.scala-lang.org/browse/SI-8450
   final case class EscapeSequence(content: String, terminator: Char) {
     if (!content.isEmpty) {
       assert(content.tail.forall(c => !isEscapeTerminator(c)), "Escape sequence content contains an escape terminator: '" + content + "'")
diff --git a/internal/util-logging/src/test/scala/LogWriterTest.scala b/internal/util-logging/src/test/scala/LogWriterTest.scala
index 5f73cdd2d..1f33a3761 100644
--- a/internal/util-logging/src/test/scala/LogWriterTest.scala
+++ b/internal/util-logging/src/test/scala/LogWriterTest.scala
@@ -1,8 +1,9 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah */
 
-package sbt.util.internal
+package sbt.internal.util
 
+import sbt.util._
 import org.scalacheck._
 import Arbitrary.{ arbitrary => arb, _ }
 import Gen.{ listOfN, oneOf }
diff --git a/internal/util-logging/src/test/scala/TestLogger.scala b/internal/util-logging/src/test/scala/TestLogger.scala
index c66f358ea..b9ddda148 100644
--- a/internal/util-logging/src/test/scala/TestLogger.scala
+++ b/internal/util-logging/src/test/scala/TestLogger.scala
@@ -1,4 +1,6 @@
-package sbt.util.internal
+package sbt.internal.util
+
+import sbt.util._
 
 object TestLogger {
   def apply[T](f: Logger => T): T =
diff --git a/internal/util-logic/src/main/scala/sbt/util/internal/logic/Logic.scala b/internal/util-logic/src/main/scala/sbt/internal/util/logic/Logic.scala
similarity index 99%
rename from internal/util-logic/src/main/scala/sbt/util/internal/logic/Logic.scala
rename to internal/util-logic/src/main/scala/sbt/internal/util/logic/Logic.scala
index 3e6f8ba8c..795423c54 100644
--- a/internal/util-logic/src/main/scala/sbt/util/internal/logic/Logic.scala
+++ b/internal/util-logic/src/main/scala/sbt/internal/util/logic/Logic.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 package logic
 
 import scala.annotation.tailrec
diff --git a/internal/util-logic/src/test/scala/sbt/logic/Test.scala b/internal/util-logic/src/test/scala/sbt/logic/Test.scala
index f6170f1e3..59b40c34b 100644
--- a/internal/util-logic/src/test/scala/sbt/logic/Test.scala
+++ b/internal/util-logic/src/test/scala/sbt/logic/Test.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 package logic
 
 import org.scalacheck._
diff --git a/internal/util-relation/src/main/scala/sbt/util/internal/Relation.scala b/internal/util-relation/src/main/scala/sbt/internal/util/Relation.scala
similarity index 99%
rename from internal/util-relation/src/main/scala/sbt/util/internal/Relation.scala
rename to internal/util-relation/src/main/scala/sbt/internal/util/Relation.scala
index 74b24629d..788f39362 100644
--- a/internal/util-relation/src/main/scala/sbt/util/internal/Relation.scala
+++ b/internal/util-relation/src/main/scala/sbt/internal/util/Relation.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010  Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 import Relation._
 
diff --git a/internal/util-relation/src/test/scala/RelationTest.scala b/internal/util-relation/src/test/scala/RelationTest.scala
index 071c79d52..31f68e0c3 100644
--- a/internal/util-relation/src/test/scala/RelationTest.scala
+++ b/internal/util-relation/src/test/scala/RelationTest.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010  Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 import org.scalacheck._
 import Prop._
diff --git a/internal/util-testing/src/main/scala/sbt/internal/util/UnitSpec.scala b/internal/util-testing/src/main/scala/sbt/internal/util/UnitSpec.scala
new file mode 100644
index 000000000..99ad43c2d
--- /dev/null
+++ b/internal/util-testing/src/main/scala/sbt/internal/util/UnitSpec.scala
@@ -0,0 +1,5 @@
+package sbt.internal.util
+
+import org.scalatest._
+
+abstract class UnitSpec extends FlatSpec with Matchers
diff --git a/internal/util-tracking/src/main/scala/sbt/util/internal/ChangeReport.scala b/internal/util-tracking/src/main/scala/sbt/internal/util/ChangeReport.scala
similarity index 99%
rename from internal/util-tracking/src/main/scala/sbt/util/internal/ChangeReport.scala
rename to internal/util-tracking/src/main/scala/sbt/internal/util/ChangeReport.scala
index a2561d723..10afbea6f 100644
--- a/internal/util-tracking/src/main/scala/sbt/util/internal/ChangeReport.scala
+++ b/internal/util-tracking/src/main/scala/sbt/internal/util/ChangeReport.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009, 2010 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 object ChangeReport {
   def modified[T](files: Set[T]): ChangeReport[T] =
diff --git a/internal/util-tracking/src/main/scala/sbt/util/internal/Tracked.scala b/internal/util-tracking/src/main/scala/sbt/internal/util/Tracked.scala
similarity index 99%
rename from internal/util-tracking/src/main/scala/sbt/util/internal/Tracked.scala
rename to internal/util-tracking/src/main/scala/sbt/internal/util/Tracked.scala
index 58361e116..ae3e060a8 100644
--- a/internal/util-tracking/src/main/scala/sbt/util/internal/Tracked.scala
+++ b/internal/util-tracking/src/main/scala/sbt/internal/util/Tracked.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009, 2010 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 import java.io.{ File, IOException }
 import CacheIO.{ fromFile, toFile }
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index b0516b9cc..881899bb1 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -5,7 +5,7 @@ object Dependencies {
   lazy val scala210 = "2.10.5"
   lazy val scala211 = "2.11.7"
 
-  lazy val sbtIO = "org.scala-sbt" %% "io" % "1.0.0-M1"
+  lazy val sbtIO = "org.scala-sbt" %% "io" % "1.0.0-M3"
   lazy val jline = "jline" % "jline" % "2.11"
   lazy val sbtSerialization = "org.scala-sbt" %% "serialization" % "0.1.2"
   lazy val sbinary = "org.scala-tools.sbinary" %% "sbinary" % "0.4.2"
@@ -23,10 +23,6 @@ object Dependencies {
 
   lazy val scalaXml = scala211Module("scala-xml", "1.0.1")
 
-  lazy val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.11.4"
-  lazy val specs2 = "org.specs2" %% "specs2" % "2.3.11"
-  lazy val testDependencies = libraryDependencies ++= Seq(
-    scalaCheck,
-    specs2
-  ).map(_ % "test")
+  lazy val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.12.4"
+  lazy val scalatest = "org.scalatest" %% "scalatest" % "2.2.4"
 }
diff --git a/project/Util.scala b/project/Util.scala
index 406c62723..cfe97dd1c 100644
--- a/project/Util.scala
+++ b/project/Util.scala
@@ -7,8 +7,10 @@ object Util {
   lazy val generateKeywords = TaskKey[File]("generateKeywords")
 
   lazy val javaOnlySettings = Seq[Setting[_]](
+    crossPaths := false,
     compileOrder := CompileOrder.JavaThenScala,
-    unmanagedSourceDirectories in Compile <<= Seq(javaSource in Compile).join
+    unmanagedSourceDirectories in Compile <<= Seq(javaSource in Compile).join,
+    crossScalaVersions := Seq(Dependencies.scala211)
   )
 
   def getScalaKeywords: Set[String] =
@@ -20,7 +22,7 @@ object Util {
     {
       val init = keywords.map(tn => '"' + tn + '"').mkString("Set(", ", ", ")")
       val ObjectName = "ScalaKeywords"
-      val PackageName = "sbt.util.internal"
+      val PackageName = "sbt.internal.util"
       val keywordsSrc =
         """package %s
 object %s {
diff --git a/project/doge.sbt b/project/doge.sbt
new file mode 100644
index 000000000..fedea9490
--- /dev/null
+++ b/project/doge.sbt
@@ -0,0 +1 @@
+addSbtPlugin("com.eed3si9n" % "sbt-doge" % "0.1.3")