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-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._