From bc54e035ef9810cceab1e5c4a8aa1b6d0ba6d67b Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Fri, 4 Sep 2015 12:54:09 -0400
Subject: [PATCH] Move util into sbt.util.internal package

---
 .../sbt/{ => util/internal}/appmacro/ContextUtil.scala     | 2 +-
 .../scala/sbt/{ => util/internal}/appmacro/Convert.scala   | 2 +-
 .../scala/sbt/{ => util/internal}/appmacro/Instance.scala  | 2 +-
 .../sbt/{ => util/internal}/appmacro/KListBuilder.scala    | 2 +-
 .../sbt/{ => util/internal}/appmacro/MixedBuilder.scala    | 2 +-
 .../sbt/{ => util/internal}/appmacro/TupleBuilder.scala    | 2 +-
 .../sbt/{ => util/internal}/appmacro/TupleNBuilder.scala   | 2 +-
 .../src/main/scala/sbt/{ => util/internal}/Cache.scala     | 2 +-
 .../src/main/scala/sbt/{ => util/internal}/CacheIO.scala   | 2 +-
 .../src/main/scala/sbt/{ => util/internal}/FileInfo.scala  | 2 +-
 .../scala/sbt/{ => util/internal}/SeparatedCache.scala     | 2 +-
 internal/util-cache/src/test/scala/CacheTest.scala         | 2 +-
 .../src/main/scala/sbt/{ => util/internal}/AList.scala     | 2 +-
 .../main/scala/sbt/{ => util/internal}/Attributes.scala    | 2 +-
 .../src/main/scala/sbt/{ => util/internal}/Classes.scala   | 2 +-
 .../src/main/scala/sbt/{ => util/internal}/Dag.scala       | 2 +-
 .../src/main/scala/sbt/{ => util/internal}/HList.scala     | 2 +-
 .../src/main/scala/sbt/{ => util/internal}/IDSet.scala     | 2 +-
 .../src/main/scala/sbt/{ => util/internal}/INode.scala     | 2 +-
 .../src/main/scala/sbt/{ => util/internal}/KList.scala     | 2 +-
 .../src/main/scala/sbt/{ => util/internal}/PMap.scala      | 2 +-
 .../src/main/scala/sbt/{ => util/internal}/Param.scala     | 2 +-
 .../src/main/scala/sbt/{ => util/internal}/Positions.scala | 2 +-
 .../src/main/scala/sbt/{ => util/internal}/Settings.scala  | 2 +-
 .../src/main/scala/sbt/{ => util/internal}/Show.scala      | 2 +-
 .../src/main/scala/sbt/{ => util/internal}/ShowLines.scala | 2 +-
 .../src/main/scala/sbt/{ => util/internal}/Signal.scala    | 2 +-
 .../main/scala/sbt/{ => util/internal}/TypeFunctions.scala | 2 +-
 .../src/main/scala/sbt/{ => util/internal}/Types.scala     | 2 +-
 .../src/main/scala/sbt/{ => util/internal}/Util.scala      | 2 +-
 .../util-collection/src/test/scala/DagSpecification.scala  | 2 +-
 internal/util-collection/src/test/scala/KeyTest.scala      | 2 +-
 internal/util-collection/src/test/scala/LiteralTest.scala  | 2 +-
 internal/util-collection/src/test/scala/PMapTest.scala     | 2 +-
 .../util-collection/src/test/scala/SettingsExample.scala   | 2 +-
 internal/util-collection/src/test/scala/SettingsTest.scala | 2 +-
 .../main/scala/sbt/{ => util/internal}/LineReader.scala    | 4 ++--
 .../sbt/{ => util/internal}/complete/Completions.scala     | 3 ++-
 .../sbt/{ => util/internal}/complete/EditDistance.scala    | 3 ++-
 .../sbt/{ => util/internal}/complete/ExampleSource.scala   | 3 ++-
 .../scala/sbt/{ => util/internal}/complete/History.scala   | 2 +-
 .../sbt/{ => util/internal}/complete/HistoryCommands.scala | 2 +-
 .../sbt/{ => util/internal}/complete/JLineCompletion.scala | 3 ++-
 .../scala/sbt/{ => util/internal}/complete/Parser.scala    | 7 ++++---
 .../scala/sbt/{ => util/internal}/complete/Parsers.scala   | 3 ++-
 .../sbt/{ => util/internal}/complete/ProcessError.scala    | 3 ++-
 .../{ => util/internal}/complete/TokenCompletions.scala    | 3 ++-
 .../sbt/{ => util/internal}/complete/TypeString.scala      | 3 ++-
 .../sbt/{ => util/internal}/complete/UpperBound.scala      | 3 ++-
 internal/util-complete/src/test/scala/ParserTest.scala     | 3 ++-
 .../src/test/scala/sbt/complete/FileExamplesTest.scala     | 3 ++-
 .../src/test/scala/sbt/complete/FixedSetExamplesTest.scala | 3 ++-
 .../test/scala/sbt/complete/ParserWithExamplesTest.scala   | 3 ++-
 .../main/scala/sbt/{ => util/internal}/ErrorHandling.scala | 2 +-
 .../src/main/scala/sbt/{ => util/internal}/ExitHook.scala  | 2 +-
 .../sbt/{ => util/internal}/MessageOnlyException.scala     | 2 +-
 .../main/scala/sbt/{ => util/internal}/BasicLogger.scala   | 2 +-
 .../scala/sbt/{ => util/internal}/BufferedLogger.scala     | 2 +-
 .../main/scala/sbt/{ => util/internal}/ConsoleLogger.scala | 2 +-
 .../main/scala/sbt/{ => util/internal}/ConsoleOut.scala    | 2 +-
 .../main/scala/sbt/{ => util/internal}/FilterLogger.scala  | 2 +-
 .../main/scala/sbt/{ => util/internal}/FullLogger.scala    | 2 +-
 .../main/scala/sbt/{ => util/internal}/GlobalLogging.scala | 2 +-
 .../src/main/scala/sbt/{ => util/internal}/Level.scala     | 2 +-
 .../src/main/scala/sbt/{ => util/internal}/LogEvent.scala  | 2 +-
 .../src/main/scala/sbt/{ => util/internal}/Logger.scala    | 2 +-
 .../main/scala/sbt/{ => util/internal}/LoggerWriter.scala  | 2 +-
 .../main/scala/sbt/{ => util/internal}/MainLogging.scala   | 2 +-
 .../main/scala/sbt/{ => util/internal}/MultiLogger.scala   | 2 +-
 .../main/scala/sbt/{ => util/internal}/StackTrace.scala    | 2 +-
 internal/util-logging/src/test/scala/Escapes.scala         | 2 +-
 internal/util-logging/src/test/scala/LogWriterTest.scala   | 2 +-
 internal/util-logging/src/test/scala/TestLogger.scala      | 2 +-
 .../main/scala/sbt/{ => util/internal}/logic/Logic.scala   | 2 +-
 internal/util-logic/src/test/scala/sbt/logic/Test.scala    | 2 +-
 .../src/main/scala/sbt/{ => util/internal}/Relation.scala  | 2 +-
 internal/util-relation/src/test/scala/RelationTest.scala   | 2 +-
 .../main/scala/sbt/{ => util/internal}/ChangeReport.scala  | 2 +-
 .../src/main/scala/sbt/{ => util/internal}/Tracked.scala   | 2 +-
 project/Util.scala                                         | 2 +-
 80 files changed, 97 insertions(+), 83 deletions(-)
 rename internal/util-appmacro/src/main/scala/sbt/{ => util/internal}/appmacro/ContextUtil.scala (99%)
 rename internal/util-appmacro/src/main/scala/sbt/{ => util/internal}/appmacro/Convert.scala (98%)
 rename internal/util-appmacro/src/main/scala/sbt/{ => util/internal}/appmacro/Instance.scala (99%)
 rename internal/util-appmacro/src/main/scala/sbt/{ => util/internal}/appmacro/KListBuilder.scala (99%)
 rename internal/util-appmacro/src/main/scala/sbt/{ => util/internal}/appmacro/MixedBuilder.scala (95%)
 rename internal/util-appmacro/src/main/scala/sbt/{ => util/internal}/appmacro/TupleBuilder.scala (99%)
 rename internal/util-appmacro/src/main/scala/sbt/{ => util/internal}/appmacro/TupleNBuilder.scala (98%)
 rename internal/util-cache/src/main/scala/sbt/{ => util/internal}/Cache.scala (99%)
 rename internal/util-cache/src/main/scala/sbt/{ => util/internal}/CacheIO.scala (98%)
 rename internal/util-cache/src/main/scala/sbt/{ => util/internal}/FileInfo.scala (99%)
 rename internal/util-cache/src/main/scala/sbt/{ => util/internal}/SeparatedCache.scala (98%)
 rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/AList.scala (99%)
 rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/Attributes.scala (99%)
 rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/Classes.scala (97%)
 rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/Dag.scala (99%)
 rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/HList.scala (96%)
 rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/IDSet.scala (98%)
 rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/INode.scala (99%)
 rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/KList.scala (98%)
 rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/PMap.scala (99%)
 rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/Param.scala (95%)
 rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/Positions.scala (94%)
 rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/Settings.scala (99%)
 rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/Show.scala (84%)
 rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/ShowLines.scala (92%)
 rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/Signal.scala (99%)
 rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/TypeFunctions.scala (98%)
 rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/Types.scala (88%)
 rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/Util.scala (98%)
 rename internal/util-complete/src/main/scala/sbt/{ => util/internal}/LineReader.scala (97%)
 rename internal/util-complete/src/main/scala/sbt/{ => util/internal}/complete/Completions.scala (99%)
 rename internal/util-complete/src/main/scala/sbt/{ => util/internal}/complete/EditDistance.scala (96%)
 rename internal/util-complete/src/main/scala/sbt/{ => util/internal}/complete/ExampleSource.scala (98%)
 rename internal/util-complete/src/main/scala/sbt/{ => util/internal}/complete/History.scala (98%)
 rename internal/util-complete/src/main/scala/sbt/{ => util/internal}/complete/HistoryCommands.scala (98%)
 rename internal/util-complete/src/main/scala/sbt/{ => util/internal}/complete/JLineCompletion.scala (99%)
 rename internal/util-complete/src/main/scala/sbt/{ => util/internal}/complete/Parser.scala (99%)
 rename internal/util-complete/src/main/scala/sbt/{ => util/internal}/complete/Parsers.scala (99%)
 rename internal/util-complete/src/main/scala/sbt/{ => util/internal}/complete/ProcessError.scala (95%)
 rename internal/util-complete/src/main/scala/sbt/{ => util/internal}/complete/TokenCompletions.scala (97%)
 rename internal/util-complete/src/main/scala/sbt/{ => util/internal}/complete/TypeString.scala (98%)
 rename internal/util-complete/src/main/scala/sbt/{ => util/internal}/complete/UpperBound.scala (97%)
 rename internal/util-control/src/main/scala/sbt/{ => util/internal}/ErrorHandling.scala (97%)
 rename internal/util-control/src/main/scala/sbt/{ => util/internal}/ExitHook.scala (96%)
 rename internal/util-control/src/main/scala/sbt/{ => util/internal}/MessageOnlyException.scala (97%)
 rename internal/util-logging/src/main/scala/sbt/{ => util/internal}/BasicLogger.scala (96%)
 rename internal/util-logging/src/main/scala/sbt/{ => util/internal}/BufferedLogger.scala (99%)
 rename internal/util-logging/src/main/scala/sbt/{ => util/internal}/ConsoleLogger.scala (99%)
 rename internal/util-logging/src/main/scala/sbt/{ => util/internal}/ConsoleOut.scala (98%)
 rename internal/util-logging/src/main/scala/sbt/{ => util/internal}/FilterLogger.scala (97%)
 rename internal/util-logging/src/main/scala/sbt/{ => util/internal}/FullLogger.scala (97%)
 rename internal/util-logging/src/main/scala/sbt/{ => util/internal}/GlobalLogging.scala (98%)
 rename internal/util-logging/src/main/scala/sbt/{ => util/internal}/Level.scala (97%)
 rename internal/util-logging/src/main/scala/sbt/{ => util/internal}/LogEvent.scala (95%)
 rename internal/util-logging/src/main/scala/sbt/{ => util/internal}/Logger.scala (99%)
 rename internal/util-logging/src/main/scala/sbt/{ => util/internal}/LoggerWriter.scala (98%)
 rename internal/util-logging/src/main/scala/sbt/{ => util/internal}/MainLogging.scala (97%)
 rename internal/util-logging/src/main/scala/sbt/{ => util/internal}/MultiLogger.scala (98%)
 rename internal/util-logging/src/main/scala/sbt/{ => util/internal}/StackTrace.scala (98%)
 rename internal/util-logic/src/main/scala/sbt/{ => util/internal}/logic/Logic.scala (99%)
 rename internal/util-relation/src/main/scala/sbt/{ => util/internal}/Relation.scala (99%)
 rename internal/util-tracking/src/main/scala/sbt/{ => util/internal}/ChangeReport.scala (99%)
 rename internal/util-tracking/src/main/scala/sbt/{ => util/internal}/Tracked.scala (99%)

diff --git a/internal/util-appmacro/src/main/scala/sbt/appmacro/ContextUtil.scala b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/ContextUtil.scala
similarity index 99%
rename from internal/util-appmacro/src/main/scala/sbt/appmacro/ContextUtil.scala
rename to internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/ContextUtil.scala
index 1db77f24d..4bdf92dc7 100644
--- a/internal/util-appmacro/src/main/scala/sbt/appmacro/ContextUtil.scala
+++ b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/ContextUtil.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 package appmacro
 
 import scala.reflect._
diff --git a/internal/util-appmacro/src/main/scala/sbt/appmacro/Convert.scala b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/Convert.scala
similarity index 98%
rename from internal/util-appmacro/src/main/scala/sbt/appmacro/Convert.scala
rename to internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/Convert.scala
index 3a2e562a6..ecfa0ea4f 100644
--- a/internal/util-appmacro/src/main/scala/sbt/appmacro/Convert.scala
+++ b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/Convert.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 package appmacro
 
 import scala.reflect._
diff --git a/internal/util-appmacro/src/main/scala/sbt/appmacro/Instance.scala b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/Instance.scala
similarity index 99%
rename from internal/util-appmacro/src/main/scala/sbt/appmacro/Instance.scala
rename to internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/Instance.scala
index 7a63feca5..111fbc3ca 100644
--- a/internal/util-appmacro/src/main/scala/sbt/appmacro/Instance.scala
+++ b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/Instance.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 package appmacro
 
 import Classes.Applicative
diff --git a/internal/util-appmacro/src/main/scala/sbt/appmacro/KListBuilder.scala b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/KListBuilder.scala
similarity index 99%
rename from internal/util-appmacro/src/main/scala/sbt/appmacro/KListBuilder.scala
rename to internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/KListBuilder.scala
index 147f622bf..3f0a12e28 100644
--- a/internal/util-appmacro/src/main/scala/sbt/appmacro/KListBuilder.scala
+++ b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/KListBuilder.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 package appmacro
 
 import Types.Id
diff --git a/internal/util-appmacro/src/main/scala/sbt/appmacro/MixedBuilder.scala b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/MixedBuilder.scala
similarity index 95%
rename from internal/util-appmacro/src/main/scala/sbt/appmacro/MixedBuilder.scala
rename to internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/MixedBuilder.scala
index 019dc8b20..c99610275 100644
--- a/internal/util-appmacro/src/main/scala/sbt/appmacro/MixedBuilder.scala
+++ b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/MixedBuilder.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 package appmacro
 
 import scala.reflect._
diff --git a/internal/util-appmacro/src/main/scala/sbt/appmacro/TupleBuilder.scala b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/TupleBuilder.scala
similarity index 99%
rename from internal/util-appmacro/src/main/scala/sbt/appmacro/TupleBuilder.scala
rename to internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/TupleBuilder.scala
index a6ea2d84c..ab87ead81 100644
--- a/internal/util-appmacro/src/main/scala/sbt/appmacro/TupleBuilder.scala
+++ b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/TupleBuilder.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 package appmacro
 
 import Types.Id
diff --git a/internal/util-appmacro/src/main/scala/sbt/appmacro/TupleNBuilder.scala b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/TupleNBuilder.scala
similarity index 98%
rename from internal/util-appmacro/src/main/scala/sbt/appmacro/TupleNBuilder.scala
rename to internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/TupleNBuilder.scala
index ddef0bee3..7c582328e 100644
--- a/internal/util-appmacro/src/main/scala/sbt/appmacro/TupleNBuilder.scala
+++ b/internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/TupleNBuilder.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 package appmacro
 
 import Types.Id
diff --git a/internal/util-cache/src/main/scala/sbt/Cache.scala b/internal/util-cache/src/main/scala/sbt/util/internal/Cache.scala
similarity index 99%
rename from internal/util-cache/src/main/scala/sbt/Cache.scala
rename to internal/util-cache/src/main/scala/sbt/util/internal/Cache.scala
index 2547ddb4a..a42236c57 100644
--- a/internal/util-cache/src/main/scala/sbt/Cache.scala
+++ b/internal/util-cache/src/main/scala/sbt/util/internal/Cache.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 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/CacheIO.scala b/internal/util-cache/src/main/scala/sbt/util/internal/CacheIO.scala
similarity index 98%
rename from internal/util-cache/src/main/scala/sbt/CacheIO.scala
rename to internal/util-cache/src/main/scala/sbt/util/internal/CacheIO.scala
index 3bb952330..7c0ab222d 100644
--- a/internal/util-cache/src/main/scala/sbt/CacheIO.scala
+++ b/internal/util-cache/src/main/scala/sbt/util/internal/CacheIO.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import java.io.{ File, FileNotFoundException }
 import sbinary.{ DefaultProtocol, Format, Operations }
diff --git a/internal/util-cache/src/main/scala/sbt/FileInfo.scala b/internal/util-cache/src/main/scala/sbt/util/internal/FileInfo.scala
similarity index 99%
rename from internal/util-cache/src/main/scala/sbt/FileInfo.scala
rename to internal/util-cache/src/main/scala/sbt/util/internal/FileInfo.scala
index 12002c508..92ed6c8b6 100644
--- a/internal/util-cache/src/main/scala/sbt/FileInfo.scala
+++ b/internal/util-cache/src/main/scala/sbt/util/internal/FileInfo.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import java.io.{ File, IOException }
 import sbinary.{ DefaultProtocol, Format }
diff --git a/internal/util-cache/src/main/scala/sbt/SeparatedCache.scala b/internal/util-cache/src/main/scala/sbt/util/internal/SeparatedCache.scala
similarity index 98%
rename from internal/util-cache/src/main/scala/sbt/SeparatedCache.scala
rename to internal/util-cache/src/main/scala/sbt/util/internal/SeparatedCache.scala
index 1022832d6..03fd2c2e5 100644
--- a/internal/util-cache/src/main/scala/sbt/SeparatedCache.scala
+++ b/internal/util-cache/src/main/scala/sbt/util/internal/SeparatedCache.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 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 9208666d5..d204d1f5e 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
+package sbt.util.internal
 
 import java.io.File
 import Types.:+:
diff --git a/internal/util-collection/src/main/scala/sbt/AList.scala b/internal/util-collection/src/main/scala/sbt/util/internal/AList.scala
similarity index 99%
rename from internal/util-collection/src/main/scala/sbt/AList.scala
rename to internal/util-collection/src/main/scala/sbt/util/internal/AList.scala
index 24368219b..e825b385c 100644
--- a/internal/util-collection/src/main/scala/sbt/AList.scala
+++ b/internal/util-collection/src/main/scala/sbt/util/internal/AList.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 
 import Classes.Applicative
 import Types._
diff --git a/internal/util-collection/src/main/scala/sbt/Attributes.scala b/internal/util-collection/src/main/scala/sbt/util/internal/Attributes.scala
similarity index 99%
rename from internal/util-collection/src/main/scala/sbt/Attributes.scala
rename to internal/util-collection/src/main/scala/sbt/util/internal/Attributes.scala
index 64f379012..fb4bb8eaa 100644
--- a/internal/util-collection/src/main/scala/sbt/Attributes.scala
+++ b/internal/util-collection/src/main/scala/sbt/util/internal/Attributes.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import Types._
 import scala.reflect.Manifest
diff --git a/internal/util-collection/src/main/scala/sbt/Classes.scala b/internal/util-collection/src/main/scala/sbt/util/internal/Classes.scala
similarity index 97%
rename from internal/util-collection/src/main/scala/sbt/Classes.scala
rename to internal/util-collection/src/main/scala/sbt/util/internal/Classes.scala
index 1db644f96..678eb0651 100644
--- a/internal/util-collection/src/main/scala/sbt/Classes.scala
+++ b/internal/util-collection/src/main/scala/sbt/util/internal/Classes.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 
 object Classes {
   trait Applicative[M[_]] {
diff --git a/internal/util-collection/src/main/scala/sbt/Dag.scala b/internal/util-collection/src/main/scala/sbt/util/internal/Dag.scala
similarity index 99%
rename from internal/util-collection/src/main/scala/sbt/Dag.scala
rename to internal/util-collection/src/main/scala/sbt/util/internal/Dag.scala
index 3eb3d8ccb..d41730e88 100644
--- a/internal/util-collection/src/main/scala/sbt/Dag.scala
+++ b/internal/util-collection/src/main/scala/sbt/util/internal/Dag.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 David MacIver, Mark Harrah
  */
-package sbt;
+package sbt.util.internal
 
 trait Dag[Node <: Dag[Node]] {
   self: Node =>
diff --git a/internal/util-collection/src/main/scala/sbt/HList.scala b/internal/util-collection/src/main/scala/sbt/util/internal/HList.scala
similarity index 96%
rename from internal/util-collection/src/main/scala/sbt/HList.scala
rename to internal/util-collection/src/main/scala/sbt/util/internal/HList.scala
index 23f5488c6..01cded498 100644
--- a/internal/util-collection/src/main/scala/sbt/HList.scala
+++ b/internal/util-collection/src/main/scala/sbt/util/internal/HList.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import Types._
 
diff --git a/internal/util-collection/src/main/scala/sbt/IDSet.scala b/internal/util-collection/src/main/scala/sbt/util/internal/IDSet.scala
similarity index 98%
rename from internal/util-collection/src/main/scala/sbt/IDSet.scala
rename to internal/util-collection/src/main/scala/sbt/util/internal/IDSet.scala
index 7c21c48a7..cefe13186 100644
--- a/internal/util-collection/src/main/scala/sbt/IDSet.scala
+++ b/internal/util-collection/src/main/scala/sbt/util/internal/IDSet.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 /** 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/INode.scala b/internal/util-collection/src/main/scala/sbt/util/internal/INode.scala
similarity index 99%
rename from internal/util-collection/src/main/scala/sbt/INode.scala
rename to internal/util-collection/src/main/scala/sbt/util/internal/INode.scala
index 53f45e9f1..3e2310f2f 100644
--- a/internal/util-collection/src/main/scala/sbt/INode.scala
+++ b/internal/util-collection/src/main/scala/sbt/util/internal/INode.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 
 import java.lang.Runnable
 import java.util.concurrent.{ atomic, Executor, LinkedBlockingQueue }
diff --git a/internal/util-collection/src/main/scala/sbt/KList.scala b/internal/util-collection/src/main/scala/sbt/util/internal/KList.scala
similarity index 98%
rename from internal/util-collection/src/main/scala/sbt/KList.scala
rename to internal/util-collection/src/main/scala/sbt/util/internal/KList.scala
index 0b09ac9b1..1df8c4df5 100644
--- a/internal/util-collection/src/main/scala/sbt/KList.scala
+++ b/internal/util-collection/src/main/scala/sbt/util/internal/KList.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 
 import Types._
 import Classes.Applicative
diff --git a/internal/util-collection/src/main/scala/sbt/PMap.scala b/internal/util-collection/src/main/scala/sbt/util/internal/PMap.scala
similarity index 99%
rename from internal/util-collection/src/main/scala/sbt/PMap.scala
rename to internal/util-collection/src/main/scala/sbt/util/internal/PMap.scala
index 979e776fa..f9ac4b0a0 100644
--- a/internal/util-collection/src/main/scala/sbt/PMap.scala
+++ b/internal/util-collection/src/main/scala/sbt/util/internal/PMap.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import collection.mutable
 
diff --git a/internal/util-collection/src/main/scala/sbt/Param.scala b/internal/util-collection/src/main/scala/sbt/util/internal/Param.scala
similarity index 95%
rename from internal/util-collection/src/main/scala/sbt/Param.scala
rename to internal/util-collection/src/main/scala/sbt/util/internal/Param.scala
index 19d12798a..16bd17e49 100644
--- a/internal/util-collection/src/main/scala/sbt/Param.scala
+++ b/internal/util-collection/src/main/scala/sbt/util/internal/Param.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import Types._
 
diff --git a/internal/util-collection/src/main/scala/sbt/Positions.scala b/internal/util-collection/src/main/scala/sbt/util/internal/Positions.scala
similarity index 94%
rename from internal/util-collection/src/main/scala/sbt/Positions.scala
rename to internal/util-collection/src/main/scala/sbt/util/internal/Positions.scala
index 5d7e1915d..fd64e4538 100755
--- a/internal/util-collection/src/main/scala/sbt/Positions.scala
+++ b/internal/util-collection/src/main/scala/sbt/util/internal/Positions.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 
 sealed trait SourcePosition
 
diff --git a/internal/util-collection/src/main/scala/sbt/Settings.scala b/internal/util-collection/src/main/scala/sbt/util/internal/Settings.scala
similarity index 99%
rename from internal/util-collection/src/main/scala/sbt/Settings.scala
rename to internal/util-collection/src/main/scala/sbt/util/internal/Settings.scala
index 018d5dfc0..9e6cdf95e 100644
--- a/internal/util-collection/src/main/scala/sbt/Settings.scala
+++ b/internal/util-collection/src/main/scala/sbt/util/internal/Settings.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2011 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import Types._
 
diff --git a/internal/util-collection/src/main/scala/sbt/Show.scala b/internal/util-collection/src/main/scala/sbt/util/internal/Show.scala
similarity index 84%
rename from internal/util-collection/src/main/scala/sbt/Show.scala
rename to internal/util-collection/src/main/scala/sbt/util/internal/Show.scala
index 1f8e9703b..930431e13 100644
--- a/internal/util-collection/src/main/scala/sbt/Show.scala
+++ b/internal/util-collection/src/main/scala/sbt/util/internal/Show.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 
 trait Show[T] {
   def apply(t: T): String
diff --git a/internal/util-collection/src/main/scala/sbt/ShowLines.scala b/internal/util-collection/src/main/scala/sbt/util/internal/ShowLines.scala
similarity index 92%
rename from internal/util-collection/src/main/scala/sbt/ShowLines.scala
rename to internal/util-collection/src/main/scala/sbt/util/internal/ShowLines.scala
index 126b6360e..794f3d5cb 100644
--- a/internal/util-collection/src/main/scala/sbt/ShowLines.scala
+++ b/internal/util-collection/src/main/scala/sbt/util/internal/ShowLines.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 
 trait ShowLines[A] {
   def showLines(a: A): Seq[String]
diff --git a/internal/util-collection/src/main/scala/sbt/Signal.scala b/internal/util-collection/src/main/scala/sbt/util/internal/Signal.scala
similarity index 99%
rename from internal/util-collection/src/main/scala/sbt/Signal.scala
rename to internal/util-collection/src/main/scala/sbt/util/internal/Signal.scala
index 5aa5fc86e..f8e3ed17d 100644
--- a/internal/util-collection/src/main/scala/sbt/Signal.scala
+++ b/internal/util-collection/src/main/scala/sbt/util/internal/Signal.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 
 object Signals {
   val CONT = "CONT"
diff --git a/internal/util-collection/src/main/scala/sbt/TypeFunctions.scala b/internal/util-collection/src/main/scala/sbt/util/internal/TypeFunctions.scala
similarity index 98%
rename from internal/util-collection/src/main/scala/sbt/TypeFunctions.scala
rename to internal/util-collection/src/main/scala/sbt/util/internal/TypeFunctions.scala
index 74f0a7d99..ed1669f35 100644
--- a/internal/util-collection/src/main/scala/sbt/TypeFunctions.scala
+++ b/internal/util-collection/src/main/scala/sbt/util/internal/TypeFunctions.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 trait TypeFunctions {
   type Id[X] = X
diff --git a/internal/util-collection/src/main/scala/sbt/Types.scala b/internal/util-collection/src/main/scala/sbt/util/internal/Types.scala
similarity index 88%
rename from internal/util-collection/src/main/scala/sbt/Types.scala
rename to internal/util-collection/src/main/scala/sbt/util/internal/Types.scala
index 29994f3d1..972f12769 100644
--- a/internal/util-collection/src/main/scala/sbt/Types.scala
+++ b/internal/util-collection/src/main/scala/sbt/util/internal/Types.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 object Types extends Types
 
diff --git a/internal/util-collection/src/main/scala/sbt/Util.scala b/internal/util-collection/src/main/scala/sbt/util/internal/Util.scala
similarity index 98%
rename from internal/util-collection/src/main/scala/sbt/Util.scala
rename to internal/util-collection/src/main/scala/sbt/util/internal/Util.scala
index befc7b5a9..ba158ae57 100644
--- a/internal/util-collection/src/main/scala/sbt/Util.scala
+++ b/internal/util-collection/src/main/scala/sbt/util/internal/Util.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2011 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 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 abf9ddf28..47c1b802b 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
+package sbt.util.internal
 
 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 f48e3742a..8bdcd76bf 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
+package sbt.util.internal
 
 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 35ef373ca..32da58a7b 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
+package sbt.util.internal
 
 import Types._
 
diff --git a/internal/util-collection/src/test/scala/PMapTest.scala b/internal/util-collection/src/test/scala/PMapTest.scala
index 6a6c558c1..e8aa2c6fa 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
+package sbt.util.internal
 
 import Types._
 
diff --git a/internal/util-collection/src/test/scala/SettingsExample.scala b/internal/util-collection/src/test/scala/SettingsExample.scala
index 3a6bc3853..96a8e01f6 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
+package sbt.util.internal
 
 /** 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 ab92332db..3321c644b 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
+package sbt.util.internal
 
 import org.scalacheck._
 import Prop._
diff --git a/internal/util-complete/src/main/scala/sbt/LineReader.scala b/internal/util-complete/src/main/scala/sbt/util/internal/LineReader.scala
similarity index 97%
rename from internal/util-complete/src/main/scala/sbt/LineReader.scala
rename to internal/util-complete/src/main/scala/sbt/util/internal/LineReader.scala
index 41679ab6e..c01986a0f 100644
--- a/internal/util-complete/src/main/scala/sbt/LineReader.scala
+++ b/internal/util-complete/src/main/scala/sbt/util/internal/LineReader.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009  Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 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.complete.JLineCompletion.installCustomCompletor(cr, complete)
+      sbt.util.internal.complete.JLineCompletion.installCustomCompletor(cr, complete)
       cr
     }
 }
diff --git a/internal/util-complete/src/main/scala/sbt/complete/Completions.scala b/internal/util-complete/src/main/scala/sbt/util/internal/complete/Completions.scala
similarity index 99%
rename from internal/util-complete/src/main/scala/sbt/complete/Completions.scala
rename to internal/util-complete/src/main/scala/sbt/util/internal/complete/Completions.scala
index 5237ad26d..b3a562dc7 100644
--- a/internal/util-complete/src/main/scala/sbt/complete/Completions.scala
+++ b/internal/util-complete/src/main/scala/sbt/util/internal/complete/Completions.scala
@@ -1,7 +1,8 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010  Mark Harrah
  */
-package sbt.complete
+package sbt.util.internal
+package complete
 
 /**
  * Represents a set of completions.
diff --git a/internal/util-complete/src/main/scala/sbt/complete/EditDistance.scala b/internal/util-complete/src/main/scala/sbt/util/internal/complete/EditDistance.scala
similarity index 96%
rename from internal/util-complete/src/main/scala/sbt/complete/EditDistance.scala
rename to internal/util-complete/src/main/scala/sbt/util/internal/complete/EditDistance.scala
index 95ed0c91f..873d9035c 100644
--- a/internal/util-complete/src/main/scala/sbt/complete/EditDistance.scala
+++ b/internal/util-complete/src/main/scala/sbt/util/internal/complete/EditDistance.scala
@@ -1,4 +1,5 @@
-package sbt.complete
+package sbt.util.internal
+package complete
 
 import java.lang.Character.{ toLowerCase => lower }
 
diff --git a/internal/util-complete/src/main/scala/sbt/complete/ExampleSource.scala b/internal/util-complete/src/main/scala/sbt/util/internal/complete/ExampleSource.scala
similarity index 98%
rename from internal/util-complete/src/main/scala/sbt/complete/ExampleSource.scala
rename to internal/util-complete/src/main/scala/sbt/util/internal/complete/ExampleSource.scala
index ab2d39b4c..932951e34 100644
--- a/internal/util-complete/src/main/scala/sbt/complete/ExampleSource.scala
+++ b/internal/util-complete/src/main/scala/sbt/util/internal/complete/ExampleSource.scala
@@ -1,4 +1,5 @@
-package sbt.complete
+package sbt.util.internal
+package complete
 
 import java.io.File
 import sbt.io.IO
diff --git a/internal/util-complete/src/main/scala/sbt/complete/History.scala b/internal/util-complete/src/main/scala/sbt/util/internal/complete/History.scala
similarity index 98%
rename from internal/util-complete/src/main/scala/sbt/complete/History.scala
rename to internal/util-complete/src/main/scala/sbt/util/internal/complete/History.scala
index 614244b9e..bd925cd17 100644
--- a/internal/util-complete/src/main/scala/sbt/complete/History.scala
+++ b/internal/util-complete/src/main/scala/sbt/util/internal/complete/History.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010  Mark Harrah
  */
-package sbt
+package sbt.util.internal
 package complete
 
 import History.number
diff --git a/internal/util-complete/src/main/scala/sbt/complete/HistoryCommands.scala b/internal/util-complete/src/main/scala/sbt/util/internal/complete/HistoryCommands.scala
similarity index 98%
rename from internal/util-complete/src/main/scala/sbt/complete/HistoryCommands.scala
rename to internal/util-complete/src/main/scala/sbt/util/internal/complete/HistoryCommands.scala
index b66d3272e..662b914c0 100644
--- a/internal/util-complete/src/main/scala/sbt/complete/HistoryCommands.scala
+++ b/internal/util-complete/src/main/scala/sbt/util/internal/complete/HistoryCommands.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010  Mark Harrah
  */
-package sbt
+package sbt.util.internal
 package complete
 
 import java.io.File
diff --git a/internal/util-complete/src/main/scala/sbt/complete/JLineCompletion.scala b/internal/util-complete/src/main/scala/sbt/util/internal/complete/JLineCompletion.scala
similarity index 99%
rename from internal/util-complete/src/main/scala/sbt/complete/JLineCompletion.scala
rename to internal/util-complete/src/main/scala/sbt/util/internal/complete/JLineCompletion.scala
index 2445fd111..c674e21db 100644
--- a/internal/util-complete/src/main/scala/sbt/complete/JLineCompletion.scala
+++ b/internal/util-complete/src/main/scala/sbt/util/internal/complete/JLineCompletion.scala
@@ -1,7 +1,8 @@
 /* sbt -- Simple Build Tool
  * Copyright 2011  Mark Harrah
  */
-package sbt.complete
+package sbt.util.internal
+package complete
 
 import jline.console.ConsoleReader
 import jline.console.completer.{ CandidateListCompletionHandler, Completer, CompletionHandler }
diff --git a/internal/util-complete/src/main/scala/sbt/complete/Parser.scala b/internal/util-complete/src/main/scala/sbt/util/internal/complete/Parser.scala
similarity index 99%
rename from internal/util-complete/src/main/scala/sbt/complete/Parser.scala
rename to internal/util-complete/src/main/scala/sbt/util/internal/complete/Parser.scala
index 7ae7ea0fd..659f20e7b 100644
--- a/internal/util-complete/src/main/scala/sbt/complete/Parser.scala
+++ b/internal/util-complete/src/main/scala/sbt/util/internal/complete/Parser.scala
@@ -1,11 +1,12 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2010, 2011  Mark Harrah
  */
-package sbt.complete
+package sbt.util.internal
+package complete
 
 import Parser._
-import sbt.Types.{ left, right, some }
-import sbt.Util.{ makeList, separate }
+import sbt.util.internal.Types.{ left, right, some }
+import sbt.util.internal.Util.{ makeList, separate }
 
 /**
  * A String parser that provides semi-automatic tab completion.
diff --git a/internal/util-complete/src/main/scala/sbt/complete/Parsers.scala b/internal/util-complete/src/main/scala/sbt/util/internal/complete/Parsers.scala
similarity index 99%
rename from internal/util-complete/src/main/scala/sbt/complete/Parsers.scala
rename to internal/util-complete/src/main/scala/sbt/util/internal/complete/Parsers.scala
index af5849870..e0b81884f 100644
--- a/internal/util-complete/src/main/scala/sbt/complete/Parsers.scala
+++ b/internal/util-complete/src/main/scala/sbt/util/internal/complete/Parsers.scala
@@ -1,7 +1,8 @@
 /* sbt -- Simple Build Tool
  * Copyright 2011  Mark Harrah
  */
-package sbt.complete
+package sbt.util.internal
+package complete
 
 import Parser._
 import java.io.File
diff --git a/internal/util-complete/src/main/scala/sbt/complete/ProcessError.scala b/internal/util-complete/src/main/scala/sbt/util/internal/complete/ProcessError.scala
similarity index 95%
rename from internal/util-complete/src/main/scala/sbt/complete/ProcessError.scala
rename to internal/util-complete/src/main/scala/sbt/util/internal/complete/ProcessError.scala
index d85e523c9..2faa17634 100644
--- a/internal/util-complete/src/main/scala/sbt/complete/ProcessError.scala
+++ b/internal/util-complete/src/main/scala/sbt/util/internal/complete/ProcessError.scala
@@ -1,4 +1,5 @@
-package sbt.complete
+package sbt.util.internal
+package complete
 
 object ProcessError {
   def apply(command: String, msgs: Seq[String], index: Int): String =
diff --git a/internal/util-complete/src/main/scala/sbt/complete/TokenCompletions.scala b/internal/util-complete/src/main/scala/sbt/util/internal/complete/TokenCompletions.scala
similarity index 97%
rename from internal/util-complete/src/main/scala/sbt/complete/TokenCompletions.scala
rename to internal/util-complete/src/main/scala/sbt/util/internal/complete/TokenCompletions.scala
index 1285507cc..6d3e5100f 100644
--- a/internal/util-complete/src/main/scala/sbt/complete/TokenCompletions.scala
+++ b/internal/util-complete/src/main/scala/sbt/util/internal/complete/TokenCompletions.scala
@@ -1,4 +1,5 @@
-package sbt.complete
+package sbt.util.internal
+package complete
 
 import Completion.{ token => ctoken, tokenDisplay }
 
diff --git a/internal/util-complete/src/main/scala/sbt/complete/TypeString.scala b/internal/util-complete/src/main/scala/sbt/util/internal/complete/TypeString.scala
similarity index 98%
rename from internal/util-complete/src/main/scala/sbt/complete/TypeString.scala
rename to internal/util-complete/src/main/scala/sbt/util/internal/complete/TypeString.scala
index bd5f84f43..1ac092023 100644
--- a/internal/util-complete/src/main/scala/sbt/complete/TypeString.scala
+++ b/internal/util-complete/src/main/scala/sbt/util/internal/complete/TypeString.scala
@@ -1,4 +1,5 @@
-package sbt.complete
+package sbt.util.internal
+package complete
 
 import DefaultParsers._
 import TypeString._
diff --git a/internal/util-complete/src/main/scala/sbt/complete/UpperBound.scala b/internal/util-complete/src/main/scala/sbt/util/internal/complete/UpperBound.scala
similarity index 97%
rename from internal/util-complete/src/main/scala/sbt/complete/UpperBound.scala
rename to internal/util-complete/src/main/scala/sbt/util/internal/complete/UpperBound.scala
index 2d954d4c5..cd42e688b 100644
--- a/internal/util-complete/src/main/scala/sbt/complete/UpperBound.scala
+++ b/internal/util-complete/src/main/scala/sbt/util/internal/complete/UpperBound.scala
@@ -1,7 +1,8 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008,2010  Mark Harrah
  */
-package sbt.complete
+package sbt.util.internal
+package complete
 
 sealed trait UpperBound {
   /** True if and only if the given value meets this bound.*/
diff --git a/internal/util-complete/src/test/scala/ParserTest.scala b/internal/util-complete/src/test/scala/ParserTest.scala
index c70c6207b..c1bd8c45c 100644
--- a/internal/util-complete/src/test/scala/ParserTest.scala
+++ b/internal/util-complete/src/test/scala/ParserTest.scala
@@ -1,4 +1,5 @@
-package sbt.complete
+package sbt.util.internal
+package complete
 
 object JLineTest {
   import DefaultParsers._
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 f9cc77038..a0db3d777 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,5 @@
-package sbt.complete
+package sbt.util.internal
+package complete
 
 import org.specs2.mutable.Specification
 import org.specs2.specification.Scope
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 b5aa14250..4323b8e24 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,5 @@
-package sbt.complete
+package sbt.util.internal
+package complete
 
 import org.specs2.mutable.Specification
 import org.specs2.specification.Scope
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 3bcc55dd2..854569e88 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,5 @@
-package sbt.complete
+package sbt.util.internal
+package complete
 
 import org.specs2.mutable.Specification
 import org.specs2.specification.Scope
diff --git a/internal/util-control/src/main/scala/sbt/ErrorHandling.scala b/internal/util-control/src/main/scala/sbt/util/internal/ErrorHandling.scala
similarity index 97%
rename from internal/util-control/src/main/scala/sbt/ErrorHandling.scala
rename to internal/util-control/src/main/scala/sbt/util/internal/ErrorHandling.scala
index 70eba7d2f..6a93451cf 100644
--- a/internal/util-control/src/main/scala/sbt/ErrorHandling.scala
+++ b/internal/util-control/src/main/scala/sbt/util/internal/ErrorHandling.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009  Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import java.io.IOException
 
diff --git a/internal/util-control/src/main/scala/sbt/ExitHook.scala b/internal/util-control/src/main/scala/sbt/util/internal/ExitHook.scala
similarity index 96%
rename from internal/util-control/src/main/scala/sbt/ExitHook.scala
rename to internal/util-control/src/main/scala/sbt/util/internal/ExitHook.scala
index 16f295c7c..80b2b9a75 100644
--- a/internal/util-control/src/main/scala/sbt/ExitHook.scala
+++ b/internal/util-control/src/main/scala/sbt/util/internal/ExitHook.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009, 2010  Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 /** Defines a function to call as sbt exits.*/
 trait ExitHook {
diff --git a/internal/util-control/src/main/scala/sbt/MessageOnlyException.scala b/internal/util-control/src/main/scala/sbt/util/internal/MessageOnlyException.scala
similarity index 97%
rename from internal/util-control/src/main/scala/sbt/MessageOnlyException.scala
rename to internal/util-control/src/main/scala/sbt/util/internal/MessageOnlyException.scala
index ab4727b95..425928a11 100644
--- a/internal/util-control/src/main/scala/sbt/MessageOnlyException.scala
+++ b/internal/util-control/src/main/scala/sbt/util/internal/MessageOnlyException.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2011 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 final class MessageOnlyException(override val toString: String) extends RuntimeException(toString)
 
diff --git a/internal/util-logging/src/main/scala/sbt/BasicLogger.scala b/internal/util-logging/src/main/scala/sbt/util/internal/BasicLogger.scala
similarity index 96%
rename from internal/util-logging/src/main/scala/sbt/BasicLogger.scala
rename to internal/util-logging/src/main/scala/sbt/util/internal/BasicLogger.scala
index 7fe59e8c0..b9a2913e2 100644
--- a/internal/util-logging/src/main/scala/sbt/BasicLogger.scala
+++ b/internal/util-logging/src/main/scala/sbt/util/internal/BasicLogger.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 /** Implements the level-setting methods of Logger.*/
 abstract class BasicLogger extends AbstractLogger {
diff --git a/internal/util-logging/src/main/scala/sbt/BufferedLogger.scala b/internal/util-logging/src/main/scala/sbt/util/internal/BufferedLogger.scala
similarity index 99%
rename from internal/util-logging/src/main/scala/sbt/BufferedLogger.scala
rename to internal/util-logging/src/main/scala/sbt/util/internal/BufferedLogger.scala
index 488de77bb..a1aaa002a 100644
--- a/internal/util-logging/src/main/scala/sbt/BufferedLogger.scala
+++ b/internal/util-logging/src/main/scala/sbt/util/internal/BufferedLogger.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import scala.collection.mutable.ListBuffer
 
diff --git a/internal/util-logging/src/main/scala/sbt/ConsoleLogger.scala b/internal/util-logging/src/main/scala/sbt/util/internal/ConsoleLogger.scala
similarity index 99%
rename from internal/util-logging/src/main/scala/sbt/ConsoleLogger.scala
rename to internal/util-logging/src/main/scala/sbt/util/internal/ConsoleLogger.scala
index 7ecb7d186..ae9e2c670 100644
--- a/internal/util-logging/src/main/scala/sbt/ConsoleLogger.scala
+++ b/internal/util-logging/src/main/scala/sbt/util/internal/ConsoleLogger.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010, 2011 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import java.io.{ BufferedWriter, PrintStream, PrintWriter }
 import java.util.Locale
diff --git a/internal/util-logging/src/main/scala/sbt/ConsoleOut.scala b/internal/util-logging/src/main/scala/sbt/util/internal/ConsoleOut.scala
similarity index 98%
rename from internal/util-logging/src/main/scala/sbt/ConsoleOut.scala
rename to internal/util-logging/src/main/scala/sbt/util/internal/ConsoleOut.scala
index 3d2c15abe..4c20ee329 100644
--- a/internal/util-logging/src/main/scala/sbt/ConsoleOut.scala
+++ b/internal/util-logging/src/main/scala/sbt/util/internal/ConsoleOut.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 
 import java.io.{ BufferedWriter, PrintStream, PrintWriter }
 
diff --git a/internal/util-logging/src/main/scala/sbt/FilterLogger.scala b/internal/util-logging/src/main/scala/sbt/util/internal/FilterLogger.scala
similarity index 97%
rename from internal/util-logging/src/main/scala/sbt/FilterLogger.scala
rename to internal/util-logging/src/main/scala/sbt/util/internal/FilterLogger.scala
index 5259a6e12..d0f503495 100644
--- a/internal/util-logging/src/main/scala/sbt/FilterLogger.scala
+++ b/internal/util-logging/src/main/scala/sbt/util/internal/FilterLogger.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 /**
  * 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/FullLogger.scala b/internal/util-logging/src/main/scala/sbt/util/internal/FullLogger.scala
similarity index 97%
rename from internal/util-logging/src/main/scala/sbt/FullLogger.scala
rename to internal/util-logging/src/main/scala/sbt/util/internal/FullLogger.scala
index 32873eff7..64066abdb 100644
--- a/internal/util-logging/src/main/scala/sbt/FullLogger.scala
+++ b/internal/util-logging/src/main/scala/sbt/util/internal/FullLogger.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 /** 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/GlobalLogging.scala b/internal/util-logging/src/main/scala/sbt/util/internal/GlobalLogging.scala
similarity index 98%
rename from internal/util-logging/src/main/scala/sbt/GlobalLogging.scala
rename to internal/util-logging/src/main/scala/sbt/util/internal/GlobalLogging.scala
index 1cd32653b..df9b5e0e3 100644
--- a/internal/util-logging/src/main/scala/sbt/GlobalLogging.scala
+++ b/internal/util-logging/src/main/scala/sbt/util/internal/GlobalLogging.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import java.io.{ File, PrintWriter }
 
diff --git a/internal/util-logging/src/main/scala/sbt/Level.scala b/internal/util-logging/src/main/scala/sbt/util/internal/Level.scala
similarity index 97%
rename from internal/util-logging/src/main/scala/sbt/Level.scala
rename to internal/util-logging/src/main/scala/sbt/util/internal/Level.scala
index 7744b9495..5a9d3e717 100644
--- a/internal/util-logging/src/main/scala/sbt/Level.scala
+++ b/internal/util-logging/src/main/scala/sbt/util/internal/Level.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 /**
  * 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/LogEvent.scala b/internal/util-logging/src/main/scala/sbt/util/internal/LogEvent.scala
similarity index 95%
rename from internal/util-logging/src/main/scala/sbt/LogEvent.scala
rename to internal/util-logging/src/main/scala/sbt/util/internal/LogEvent.scala
index d48957c75..a03c306b1 100644
--- a/internal/util-logging/src/main/scala/sbt/LogEvent.scala
+++ b/internal/util-logging/src/main/scala/sbt/util/internal/LogEvent.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 sealed trait LogEvent extends NotNull
 final class Success(val msg: String) extends LogEvent
diff --git a/internal/util-logging/src/main/scala/sbt/Logger.scala b/internal/util-logging/src/main/scala/sbt/util/internal/Logger.scala
similarity index 99%
rename from internal/util-logging/src/main/scala/sbt/Logger.scala
rename to internal/util-logging/src/main/scala/sbt/util/internal/Logger.scala
index ddba892d2..a3daea79a 100644
--- a/internal/util-logging/src/main/scala/sbt/Logger.scala
+++ b/internal/util-logging/src/main/scala/sbt/util/internal/Logger.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010  Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import xsbti.{ Logger => xLogger, F0 }
 import xsbti.{ Maybe, Position, Problem, Severity }
diff --git a/internal/util-logging/src/main/scala/sbt/LoggerWriter.scala b/internal/util-logging/src/main/scala/sbt/util/internal/LoggerWriter.scala
similarity index 98%
rename from internal/util-logging/src/main/scala/sbt/LoggerWriter.scala
rename to internal/util-logging/src/main/scala/sbt/util/internal/LoggerWriter.scala
index a106ff605..b616a045b 100644
--- a/internal/util-logging/src/main/scala/sbt/LoggerWriter.scala
+++ b/internal/util-logging/src/main/scala/sbt/util/internal/LoggerWriter.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 /**
  * 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/MainLogging.scala b/internal/util-logging/src/main/scala/sbt/util/internal/MainLogging.scala
similarity index 97%
rename from internal/util-logging/src/main/scala/sbt/MainLogging.scala
rename to internal/util-logging/src/main/scala/sbt/util/internal/MainLogging.scala
index 48015ad44..9a1240fc6 100644
--- a/internal/util-logging/src/main/scala/sbt/MainLogging.scala
+++ b/internal/util-logging/src/main/scala/sbt/util/internal/MainLogging.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 
 import java.io.PrintWriter
 
diff --git a/internal/util-logging/src/main/scala/sbt/MultiLogger.scala b/internal/util-logging/src/main/scala/sbt/util/internal/MultiLogger.scala
similarity index 98%
rename from internal/util-logging/src/main/scala/sbt/MultiLogger.scala
rename to internal/util-logging/src/main/scala/sbt/util/internal/MultiLogger.scala
index a6de160cd..add4a8761 100644
--- a/internal/util-logging/src/main/scala/sbt/MultiLogger.scala
+++ b/internal/util-logging/src/main/scala/sbt/util/internal/MultiLogger.scala
@@ -2,7 +2,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 // 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/StackTrace.scala b/internal/util-logging/src/main/scala/sbt/util/internal/StackTrace.scala
similarity index 98%
rename from internal/util-logging/src/main/scala/sbt/StackTrace.scala
rename to internal/util-logging/src/main/scala/sbt/util/internal/StackTrace.scala
index d6504cb10..595529d49 100644
--- a/internal/util-logging/src/main/scala/sbt/StackTrace.scala
+++ b/internal/util-logging/src/main/scala/sbt/util/internal/StackTrace.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Tony Sloane
  */
-package sbt
+package sbt.util.internal
 
 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 408ec5e23..bf2e0bdd3 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
+package sbt.util.internal
 
 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 7c0125fba..5f73cdd2d 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
+package sbt.util.internal
 
 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 e7b6bee49..c66f358ea 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
+package sbt.util.internal
 
 object TestLogger {
   def apply[T](f: Logger => T): T =
diff --git a/internal/util-logic/src/main/scala/sbt/logic/Logic.scala b/internal/util-logic/src/main/scala/sbt/util/internal/logic/Logic.scala
similarity index 99%
rename from internal/util-logic/src/main/scala/sbt/logic/Logic.scala
rename to internal/util-logic/src/main/scala/sbt/util/internal/logic/Logic.scala
index 0fbbe3f98..3e6f8ba8c 100644
--- a/internal/util-logic/src/main/scala/sbt/logic/Logic.scala
+++ b/internal/util-logic/src/main/scala/sbt/util/internal/logic/Logic.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 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 f9957414b..f6170f1e3 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
+package sbt.util.internal
 package logic
 
 import org.scalacheck._
diff --git a/internal/util-relation/src/main/scala/sbt/Relation.scala b/internal/util-relation/src/main/scala/sbt/util/internal/Relation.scala
similarity index 99%
rename from internal/util-relation/src/main/scala/sbt/Relation.scala
rename to internal/util-relation/src/main/scala/sbt/util/internal/Relation.scala
index 9a648ad64..74b24629d 100644
--- a/internal/util-relation/src/main/scala/sbt/Relation.scala
+++ b/internal/util-relation/src/main/scala/sbt/util/internal/Relation.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010  Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import Relation._
 
diff --git a/internal/util-relation/src/test/scala/RelationTest.scala b/internal/util-relation/src/test/scala/RelationTest.scala
index 558935bdb..071c79d52 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
+package sbt.util.internal
 
 import org.scalacheck._
 import Prop._
diff --git a/internal/util-tracking/src/main/scala/sbt/ChangeReport.scala b/internal/util-tracking/src/main/scala/sbt/util/internal/ChangeReport.scala
similarity index 99%
rename from internal/util-tracking/src/main/scala/sbt/ChangeReport.scala
rename to internal/util-tracking/src/main/scala/sbt/util/internal/ChangeReport.scala
index 18db36a43..a2561d723 100644
--- a/internal/util-tracking/src/main/scala/sbt/ChangeReport.scala
+++ b/internal/util-tracking/src/main/scala/sbt/util/internal/ChangeReport.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009, 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 object ChangeReport {
   def modified[T](files: Set[T]): ChangeReport[T] =
diff --git a/internal/util-tracking/src/main/scala/sbt/Tracked.scala b/internal/util-tracking/src/main/scala/sbt/util/internal/Tracked.scala
similarity index 99%
rename from internal/util-tracking/src/main/scala/sbt/Tracked.scala
rename to internal/util-tracking/src/main/scala/sbt/util/internal/Tracked.scala
index 5c6979718..58361e116 100644
--- a/internal/util-tracking/src/main/scala/sbt/Tracked.scala
+++ b/internal/util-tracking/src/main/scala/sbt/util/internal/Tracked.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009, 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import java.io.{ File, IOException }
 import CacheIO.{ fromFile, toFile }
diff --git a/project/Util.scala b/project/Util.scala
index 221a16000..406c62723 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"
+      val PackageName = "sbt.util.internal"
       val keywordsSrc =
         """package %s
 object %s {