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 2f873cf6c..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,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 package complete
 
 import java.io.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 db1ebe67f..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,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 package complete
 
 class FixedSetExamplesTest extends UnitSpec {
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 fc7c0ae90..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,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 package complete
 
 import Completion._
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 96%
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..9dd58e48e 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,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 /** Implements the level-setting methods of Logger.*/
 abstract class BasicLogger extends AbstractLogger {
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 99%
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..4877de61f 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,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.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..5be85eb24 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,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010, 2011 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.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..30da238da 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,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 
 import java.io.{ BufferedWriter, PrintStream, PrintWriter }
 
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 97%
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..4d5111c44 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,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.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 97%
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..460012e10 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,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.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 98%
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..d58c72eae 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,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 import java.io.{ File, PrintWriter }
 
diff --git a/internal/util-logging/src/main/scala/sbt/util/internal/Level.scala b/internal/util-logging/src/main/scala/sbt/internal/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/internal/util/Level.scala
index 5a9d3e717..a12e53fee 100644
--- a/internal/util-logging/src/main/scala/sbt/util/internal/Level.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/Level.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 /**
  * An enumeration defining the levels available for logging.  A level includes all of the levels
diff --git a/internal/util-logging/src/main/scala/sbt/util/internal/LogEvent.scala b/internal/util-logging/src/main/scala/sbt/internal/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/internal/util/LogEvent.scala
index a03c306b1..70a4d5031 100644
--- a/internal/util-logging/src/main/scala/sbt/util/internal/LogEvent.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/LogEvent.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.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/internal/util/Logger.scala
similarity index 99%
rename from internal/util-logging/src/main/scala/sbt/util/internal/Logger.scala
rename to internal/util-logging/src/main/scala/sbt/internal/util/Logger.scala
index a3daea79a..bcd0963c2 100644
--- a/internal/util-logging/src/main/scala/sbt/util/internal/Logger.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/Logger.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010  Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.util
 
 import xsbti.{ Logger => xLogger, F0 }
 import xsbti.{ Maybe, Position, Problem, Severity }
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 98%
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..eea18b15b 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,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.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..95402b4ff 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,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 
 import java.io.PrintWriter
 
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 98%
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..cb5ff12d6 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,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 Mark Harrah
  */
-package sbt.util.internal
+package sbt.internal.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/test/scala/Escapes.scala b/internal/util-logging/src/test/scala/Escapes.scala
index bf2e0bdd3..153a5da56 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._
diff --git a/internal/util-logging/src/test/scala/LogWriterTest.scala b/internal/util-logging/src/test/scala/LogWriterTest.scala
index 5f73cdd2d..156f45455 100644
--- a/internal/util-logging/src/test/scala/LogWriterTest.scala
+++ b/internal/util-logging/src/test/scala/LogWriterTest.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 Arbitrary.{ arbitrary => arb, _ }
diff --git a/internal/util-logging/src/test/scala/TestLogger.scala b/internal/util-logging/src/test/scala/TestLogger.scala
index c66f358ea..74dcbb448 100644
--- a/internal/util-logging/src/test/scala/TestLogger.scala
+++ b/internal/util-logging/src/test/scala/TestLogger.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.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/util/internal/UnitSpec.scala b/internal/util-testing/src/main/scala/sbt/internal/util/UnitSpec.scala
similarity index 75%
rename from internal/util-testing/src/main/scala/sbt/util/internal/UnitSpec.scala
rename to internal/util-testing/src/main/scala/sbt/internal/util/UnitSpec.scala
index 83f17298e..99ad43c2d 100644
--- a/internal/util-testing/src/main/scala/sbt/util/internal/UnitSpec.scala
+++ b/internal/util-testing/src/main/scala/sbt/internal/util/UnitSpec.scala
@@ -1,4 +1,4 @@
-package sbt.util.internal
+package sbt.internal.util
 
 import org.scalatest._
 
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/Util.scala b/project/Util.scala
index 406c62723..abaa4849e 100644
--- a/project/Util.scala
+++ b/project/Util.scala
@@ -20,7 +20,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 {