diff --git a/util/collection/NOTICE b/internal/util-collection/NOTICE
similarity index 100%
rename from util/collection/NOTICE
rename to internal/util-collection/NOTICE
diff --git a/util/collection/src/main/scala/sbt/AList.scala b/internal/util-collection/src/main/scala/sbt/AList.scala
similarity index 100%
rename from util/collection/src/main/scala/sbt/AList.scala
rename to internal/util-collection/src/main/scala/sbt/AList.scala
diff --git a/util/collection/src/main/scala/sbt/Attributes.scala b/internal/util-collection/src/main/scala/sbt/Attributes.scala
similarity index 100%
rename from util/collection/src/main/scala/sbt/Attributes.scala
rename to internal/util-collection/src/main/scala/sbt/Attributes.scala
diff --git a/util/collection/src/main/scala/sbt/Classes.scala b/internal/util-collection/src/main/scala/sbt/Classes.scala
similarity index 100%
rename from util/collection/src/main/scala/sbt/Classes.scala
rename to internal/util-collection/src/main/scala/sbt/Classes.scala
diff --git a/util/collection/src/main/scala/sbt/Dag.scala b/internal/util-collection/src/main/scala/sbt/Dag.scala
similarity index 100%
rename from util/collection/src/main/scala/sbt/Dag.scala
rename to internal/util-collection/src/main/scala/sbt/Dag.scala
diff --git a/util/collection/src/main/scala/sbt/HList.scala b/internal/util-collection/src/main/scala/sbt/HList.scala
similarity index 100%
rename from util/collection/src/main/scala/sbt/HList.scala
rename to internal/util-collection/src/main/scala/sbt/HList.scala
diff --git a/util/collection/src/main/scala/sbt/IDSet.scala b/internal/util-collection/src/main/scala/sbt/IDSet.scala
similarity index 100%
rename from util/collection/src/main/scala/sbt/IDSet.scala
rename to internal/util-collection/src/main/scala/sbt/IDSet.scala
diff --git a/util/collection/src/main/scala/sbt/INode.scala b/internal/util-collection/src/main/scala/sbt/INode.scala
similarity index 100%
rename from util/collection/src/main/scala/sbt/INode.scala
rename to internal/util-collection/src/main/scala/sbt/INode.scala
diff --git a/util/collection/src/main/scala/sbt/KList.scala b/internal/util-collection/src/main/scala/sbt/KList.scala
similarity index 100%
rename from util/collection/src/main/scala/sbt/KList.scala
rename to internal/util-collection/src/main/scala/sbt/KList.scala
diff --git a/util/collection/src/main/scala/sbt/PMap.scala b/internal/util-collection/src/main/scala/sbt/PMap.scala
similarity index 100%
rename from util/collection/src/main/scala/sbt/PMap.scala
rename to internal/util-collection/src/main/scala/sbt/PMap.scala
diff --git a/util/collection/src/main/scala/sbt/Param.scala b/internal/util-collection/src/main/scala/sbt/Param.scala
similarity index 100%
rename from util/collection/src/main/scala/sbt/Param.scala
rename to internal/util-collection/src/main/scala/sbt/Param.scala
diff --git a/util/collection/src/main/scala/sbt/Positions.scala b/internal/util-collection/src/main/scala/sbt/Positions.scala
similarity index 100%
rename from util/collection/src/main/scala/sbt/Positions.scala
rename to internal/util-collection/src/main/scala/sbt/Positions.scala
diff --git a/util/collection/src/main/scala/sbt/Settings.scala b/internal/util-collection/src/main/scala/sbt/Settings.scala
similarity index 100%
rename from util/collection/src/main/scala/sbt/Settings.scala
rename to internal/util-collection/src/main/scala/sbt/Settings.scala
diff --git a/util/collection/src/main/scala/sbt/Show.scala b/internal/util-collection/src/main/scala/sbt/Show.scala
similarity index 100%
rename from util/collection/src/main/scala/sbt/Show.scala
rename to internal/util-collection/src/main/scala/sbt/Show.scala
diff --git a/util/collection/src/main/scala/sbt/ShowLines.scala b/internal/util-collection/src/main/scala/sbt/ShowLines.scala
similarity index 100%
rename from util/collection/src/main/scala/sbt/ShowLines.scala
rename to internal/util-collection/src/main/scala/sbt/ShowLines.scala
diff --git a/util/collection/src/main/scala/sbt/Signal.scala b/internal/util-collection/src/main/scala/sbt/Signal.scala
similarity index 100%
rename from util/collection/src/main/scala/sbt/Signal.scala
rename to internal/util-collection/src/main/scala/sbt/Signal.scala
diff --git a/util/collection/src/main/scala/sbt/TypeFunctions.scala b/internal/util-collection/src/main/scala/sbt/TypeFunctions.scala
similarity index 100%
rename from util/collection/src/main/scala/sbt/TypeFunctions.scala
rename to internal/util-collection/src/main/scala/sbt/TypeFunctions.scala
diff --git a/util/collection/src/main/scala/sbt/Types.scala b/internal/util-collection/src/main/scala/sbt/Types.scala
similarity index 100%
rename from util/collection/src/main/scala/sbt/Types.scala
rename to internal/util-collection/src/main/scala/sbt/Types.scala
diff --git a/util/collection/src/main/scala/sbt/Util.scala b/internal/util-collection/src/main/scala/sbt/Util.scala
similarity index 100%
rename from util/collection/src/main/scala/sbt/Util.scala
rename to internal/util-collection/src/main/scala/sbt/Util.scala
diff --git a/util/collection/src/test/scala/DagSpecification.scala b/internal/util-collection/src/test/scala/DagSpecification.scala
similarity index 100%
rename from util/collection/src/test/scala/DagSpecification.scala
rename to internal/util-collection/src/test/scala/DagSpecification.scala
diff --git a/util/collection/src/test/scala/KeyTest.scala b/internal/util-collection/src/test/scala/KeyTest.scala
similarity index 100%
rename from util/collection/src/test/scala/KeyTest.scala
rename to internal/util-collection/src/test/scala/KeyTest.scala
diff --git a/util/collection/src/test/scala/LiteralTest.scala b/internal/util-collection/src/test/scala/LiteralTest.scala
similarity index 100%
rename from util/collection/src/test/scala/LiteralTest.scala
rename to internal/util-collection/src/test/scala/LiteralTest.scala
diff --git a/util/collection/src/test/scala/PMapTest.scala b/internal/util-collection/src/test/scala/PMapTest.scala
similarity index 100%
rename from util/collection/src/test/scala/PMapTest.scala
rename to internal/util-collection/src/test/scala/PMapTest.scala
diff --git a/util/collection/src/test/scala/SettingsExample.scala b/internal/util-collection/src/test/scala/SettingsExample.scala
similarity index 100%
rename from util/collection/src/test/scala/SettingsExample.scala
rename to internal/util-collection/src/test/scala/SettingsExample.scala
diff --git a/util/collection/src/test/scala/SettingsTest.scala b/internal/util-collection/src/test/scala/SettingsTest.scala
similarity index 100%
rename from util/collection/src/test/scala/SettingsTest.scala
rename to internal/util-collection/src/test/scala/SettingsTest.scala
diff --git a/util/complete/NOTICE b/internal/util-complete/NOTICE
similarity index 100%
rename from util/complete/NOTICE
rename to internal/util-complete/NOTICE
diff --git a/util/complete/src/main/scala/sbt/LineReader.scala b/internal/util-complete/src/main/scala/sbt/LineReader.scala
similarity index 100%
rename from util/complete/src/main/scala/sbt/LineReader.scala
rename to internal/util-complete/src/main/scala/sbt/LineReader.scala
diff --git a/util/complete/src/main/scala/sbt/complete/Completions.scala b/internal/util-complete/src/main/scala/sbt/complete/Completions.scala
similarity index 100%
rename from util/complete/src/main/scala/sbt/complete/Completions.scala
rename to internal/util-complete/src/main/scala/sbt/complete/Completions.scala
diff --git a/util/complete/src/main/scala/sbt/complete/EditDistance.scala b/internal/util-complete/src/main/scala/sbt/complete/EditDistance.scala
similarity index 100%
rename from util/complete/src/main/scala/sbt/complete/EditDistance.scala
rename to internal/util-complete/src/main/scala/sbt/complete/EditDistance.scala
diff --git a/util/complete/src/main/scala/sbt/complete/ExampleSource.scala b/internal/util-complete/src/main/scala/sbt/complete/ExampleSource.scala
similarity index 100%
rename from util/complete/src/main/scala/sbt/complete/ExampleSource.scala
rename to internal/util-complete/src/main/scala/sbt/complete/ExampleSource.scala
diff --git a/util/complete/src/main/scala/sbt/complete/History.scala b/internal/util-complete/src/main/scala/sbt/complete/History.scala
similarity index 100%
rename from util/complete/src/main/scala/sbt/complete/History.scala
rename to internal/util-complete/src/main/scala/sbt/complete/History.scala
diff --git a/util/complete/src/main/scala/sbt/complete/HistoryCommands.scala b/internal/util-complete/src/main/scala/sbt/complete/HistoryCommands.scala
similarity index 100%
rename from util/complete/src/main/scala/sbt/complete/HistoryCommands.scala
rename to internal/util-complete/src/main/scala/sbt/complete/HistoryCommands.scala
diff --git a/util/complete/src/main/scala/sbt/complete/JLineCompletion.scala b/internal/util-complete/src/main/scala/sbt/complete/JLineCompletion.scala
similarity index 100%
rename from util/complete/src/main/scala/sbt/complete/JLineCompletion.scala
rename to internal/util-complete/src/main/scala/sbt/complete/JLineCompletion.scala
diff --git a/util/complete/src/main/scala/sbt/complete/Parser.scala b/internal/util-complete/src/main/scala/sbt/complete/Parser.scala
similarity index 100%
rename from util/complete/src/main/scala/sbt/complete/Parser.scala
rename to internal/util-complete/src/main/scala/sbt/complete/Parser.scala
diff --git a/util/complete/src/main/scala/sbt/complete/Parsers.scala b/internal/util-complete/src/main/scala/sbt/complete/Parsers.scala
similarity index 100%
rename from util/complete/src/main/scala/sbt/complete/Parsers.scala
rename to internal/util-complete/src/main/scala/sbt/complete/Parsers.scala
diff --git a/util/complete/src/main/scala/sbt/complete/ProcessError.scala b/internal/util-complete/src/main/scala/sbt/complete/ProcessError.scala
similarity index 100%
rename from util/complete/src/main/scala/sbt/complete/ProcessError.scala
rename to internal/util-complete/src/main/scala/sbt/complete/ProcessError.scala
diff --git a/util/complete/src/main/scala/sbt/complete/TokenCompletions.scala b/internal/util-complete/src/main/scala/sbt/complete/TokenCompletions.scala
similarity index 100%
rename from util/complete/src/main/scala/sbt/complete/TokenCompletions.scala
rename to internal/util-complete/src/main/scala/sbt/complete/TokenCompletions.scala
diff --git a/util/complete/src/main/scala/sbt/complete/TypeString.scala b/internal/util-complete/src/main/scala/sbt/complete/TypeString.scala
similarity index 100%
rename from util/complete/src/main/scala/sbt/complete/TypeString.scala
rename to internal/util-complete/src/main/scala/sbt/complete/TypeString.scala
diff --git a/util/complete/src/main/scala/sbt/complete/UpperBound.scala b/internal/util-complete/src/main/scala/sbt/complete/UpperBound.scala
similarity index 100%
rename from util/complete/src/main/scala/sbt/complete/UpperBound.scala
rename to internal/util-complete/src/main/scala/sbt/complete/UpperBound.scala
diff --git a/util/complete/src/test/scala/ParserTest.scala b/internal/util-complete/src/test/scala/ParserTest.scala
similarity index 100%
rename from util/complete/src/test/scala/ParserTest.scala
rename to internal/util-complete/src/test/scala/ParserTest.scala
diff --git a/util/complete/src/test/scala/sbt/complete/FileExamplesTest.scala b/internal/util-complete/src/test/scala/sbt/complete/FileExamplesTest.scala
similarity index 100%
rename from util/complete/src/test/scala/sbt/complete/FileExamplesTest.scala
rename to internal/util-complete/src/test/scala/sbt/complete/FileExamplesTest.scala
diff --git a/util/complete/src/test/scala/sbt/complete/FixedSetExamplesTest.scala b/internal/util-complete/src/test/scala/sbt/complete/FixedSetExamplesTest.scala
similarity index 100%
rename from util/complete/src/test/scala/sbt/complete/FixedSetExamplesTest.scala
rename to internal/util-complete/src/test/scala/sbt/complete/FixedSetExamplesTest.scala
diff --git a/util/complete/src/test/scala/sbt/complete/ParserWithExamplesTest.scala b/internal/util-complete/src/test/scala/sbt/complete/ParserWithExamplesTest.scala
similarity index 100%
rename from util/complete/src/test/scala/sbt/complete/ParserWithExamplesTest.scala
rename to internal/util-complete/src/test/scala/sbt/complete/ParserWithExamplesTest.scala
diff --git a/util/logic/src/main/scala/sbt/logic/Logic.scala b/internal/util-logic/src/main/scala/sbt/logic/Logic.scala
similarity index 100%
rename from util/logic/src/main/scala/sbt/logic/Logic.scala
rename to internal/util-logic/src/main/scala/sbt/logic/Logic.scala
diff --git a/util/logic/src/test/scala/sbt/logic/Test.scala b/internal/util-logic/src/test/scala/sbt/logic/Test.scala
similarity index 100%
rename from util/logic/src/test/scala/sbt/logic/Test.scala
rename to internal/util-logic/src/test/scala/sbt/logic/Test.scala