diff --git a/cache/Cache.scala b/cache/src/main/scala/sbt/Cache.scala
similarity index 100%
rename from cache/Cache.scala
rename to cache/src/main/scala/sbt/Cache.scala
diff --git a/cache/CacheIO.scala b/cache/src/main/scala/sbt/CacheIO.scala
similarity index 100%
rename from cache/CacheIO.scala
rename to cache/src/main/scala/sbt/CacheIO.scala
diff --git a/cache/FileInfo.scala b/cache/src/main/scala/sbt/FileInfo.scala
similarity index 100%
rename from cache/FileInfo.scala
rename to cache/src/main/scala/sbt/FileInfo.scala
diff --git a/cache/SeparatedCache.scala b/cache/src/main/scala/sbt/SeparatedCache.scala
similarity index 100%
rename from cache/SeparatedCache.scala
rename to cache/src/main/scala/sbt/SeparatedCache.scala
diff --git a/cache/tracking/ChangeReport.scala b/cache/tracking/src/main/scala/sbt/ChangeReport.scala
similarity index 100%
rename from cache/tracking/ChangeReport.scala
rename to cache/tracking/src/main/scala/sbt/ChangeReport.scala
diff --git a/cache/tracking/Tracked.scala b/cache/tracking/src/main/scala/sbt/Tracked.scala
similarity index 100%
rename from cache/tracking/Tracked.scala
rename to cache/tracking/src/main/scala/sbt/Tracked.scala
diff --git a/util/appmacro/ContextUtil.scala b/util/appmacro/src/main/scala/sbt/appmacro/ContextUtil.scala
similarity index 100%
rename from util/appmacro/ContextUtil.scala
rename to util/appmacro/src/main/scala/sbt/appmacro/ContextUtil.scala
diff --git a/util/appmacro/Instance.scala b/util/appmacro/src/main/scala/sbt/appmacro/Instance.scala
similarity index 100%
rename from util/appmacro/Instance.scala
rename to util/appmacro/src/main/scala/sbt/appmacro/Instance.scala
diff --git a/util/appmacro/KListBuilder.scala b/util/appmacro/src/main/scala/sbt/appmacro/KListBuilder.scala
similarity index 100%
rename from util/appmacro/KListBuilder.scala
rename to util/appmacro/src/main/scala/sbt/appmacro/KListBuilder.scala
diff --git a/util/appmacro/MixedBuilder.scala b/util/appmacro/src/main/scala/sbt/appmacro/MixedBuilder.scala
similarity index 100%
rename from util/appmacro/MixedBuilder.scala
rename to util/appmacro/src/main/scala/sbt/appmacro/MixedBuilder.scala
diff --git a/util/appmacro/TupleBuilder.scala b/util/appmacro/src/main/scala/sbt/appmacro/TupleBuilder.scala
similarity index 100%
rename from util/appmacro/TupleBuilder.scala
rename to util/appmacro/src/main/scala/sbt/appmacro/TupleBuilder.scala
diff --git a/util/appmacro/TupleNBuilder.scala b/util/appmacro/src/main/scala/sbt/appmacro/TupleNBuilder.scala
similarity index 100%
rename from util/appmacro/TupleNBuilder.scala
rename to util/appmacro/src/main/scala/sbt/appmacro/TupleNBuilder.scala
diff --git a/util/collection/AList.scala b/util/collection/src/main/scala/sbt/AList.scala
similarity index 100%
rename from util/collection/AList.scala
rename to util/collection/src/main/scala/sbt/AList.scala
diff --git a/util/collection/Attributes.scala b/util/collection/src/main/scala/sbt/Attributes.scala
similarity index 100%
rename from util/collection/Attributes.scala
rename to util/collection/src/main/scala/sbt/Attributes.scala
diff --git a/util/collection/Classes.scala b/util/collection/src/main/scala/sbt/Classes.scala
similarity index 100%
rename from util/collection/Classes.scala
rename to util/collection/src/main/scala/sbt/Classes.scala
diff --git a/util/collection/Dag.scala b/util/collection/src/main/scala/sbt/Dag.scala
similarity index 100%
rename from util/collection/Dag.scala
rename to util/collection/src/main/scala/sbt/Dag.scala
diff --git a/util/collection/HList.scala b/util/collection/src/main/scala/sbt/HList.scala
similarity index 100%
rename from util/collection/HList.scala
rename to util/collection/src/main/scala/sbt/HList.scala
diff --git a/util/collection/IDSet.scala b/util/collection/src/main/scala/sbt/IDSet.scala
similarity index 100%
rename from util/collection/IDSet.scala
rename to util/collection/src/main/scala/sbt/IDSet.scala
diff --git a/util/collection/INode.scala b/util/collection/src/main/scala/sbt/INode.scala
similarity index 100%
rename from util/collection/INode.scala
rename to util/collection/src/main/scala/sbt/INode.scala
diff --git a/util/collection/KList.scala b/util/collection/src/main/scala/sbt/KList.scala
similarity index 100%
rename from util/collection/KList.scala
rename to util/collection/src/main/scala/sbt/KList.scala
diff --git a/util/collection/PMap.scala b/util/collection/src/main/scala/sbt/PMap.scala
similarity index 100%
rename from util/collection/PMap.scala
rename to util/collection/src/main/scala/sbt/PMap.scala
diff --git a/util/collection/Param.scala b/util/collection/src/main/scala/sbt/Param.scala
similarity index 100%
rename from util/collection/Param.scala
rename to util/collection/src/main/scala/sbt/Param.scala
diff --git a/util/collection/Positions.scala b/util/collection/src/main/scala/sbt/Positions.scala
similarity index 100%
rename from util/collection/Positions.scala
rename to util/collection/src/main/scala/sbt/Positions.scala
diff --git a/util/collection/Settings.scala b/util/collection/src/main/scala/sbt/Settings.scala
similarity index 100%
rename from util/collection/Settings.scala
rename to util/collection/src/main/scala/sbt/Settings.scala
diff --git a/util/collection/Show.scala b/util/collection/src/main/scala/sbt/Show.scala
similarity index 100%
rename from util/collection/Show.scala
rename to util/collection/src/main/scala/sbt/Show.scala
diff --git a/util/collection/Signal.scala b/util/collection/src/main/scala/sbt/Signal.scala
similarity index 100%
rename from util/collection/Signal.scala
rename to util/collection/src/main/scala/sbt/Signal.scala
diff --git a/util/collection/TypeFunctions.scala b/util/collection/src/main/scala/sbt/TypeFunctions.scala
similarity index 100%
rename from util/collection/TypeFunctions.scala
rename to util/collection/src/main/scala/sbt/TypeFunctions.scala
diff --git a/util/collection/Types.scala b/util/collection/src/main/scala/sbt/Types.scala
similarity index 100%
rename from util/collection/Types.scala
rename to util/collection/src/main/scala/sbt/Types.scala
diff --git a/util/collection/Util.scala b/util/collection/src/main/scala/sbt/Util.scala
similarity index 100%
rename from util/collection/Util.scala
rename to util/collection/src/main/scala/sbt/Util.scala
diff --git a/util/complete/LineReader.scala b/util/complete/src/main/scala/sbt/LineReader.scala
similarity index 100%
rename from util/complete/LineReader.scala
rename to util/complete/src/main/scala/sbt/LineReader.scala
diff --git a/util/complete/Completions.scala b/util/complete/src/main/scala/sbt/complete/Completions.scala
similarity index 100%
rename from util/complete/Completions.scala
rename to util/complete/src/main/scala/sbt/complete/Completions.scala
diff --git a/util/complete/EditDistance.scala b/util/complete/src/main/scala/sbt/complete/EditDistance.scala
similarity index 100%
rename from util/complete/EditDistance.scala
rename to util/complete/src/main/scala/sbt/complete/EditDistance.scala
diff --git a/util/complete/History.scala b/util/complete/src/main/scala/sbt/complete/History.scala
similarity index 100%
rename from util/complete/History.scala
rename to util/complete/src/main/scala/sbt/complete/History.scala
diff --git a/util/complete/HistoryCommands.scala b/util/complete/src/main/scala/sbt/complete/HistoryCommands.scala
similarity index 100%
rename from util/complete/HistoryCommands.scala
rename to util/complete/src/main/scala/sbt/complete/HistoryCommands.scala
diff --git a/util/complete/JLineCompletion.scala b/util/complete/src/main/scala/sbt/complete/JLineCompletion.scala
similarity index 100%
rename from util/complete/JLineCompletion.scala
rename to util/complete/src/main/scala/sbt/complete/JLineCompletion.scala
diff --git a/util/complete/Parser.scala b/util/complete/src/main/scala/sbt/complete/Parser.scala
similarity index 100%
rename from util/complete/Parser.scala
rename to util/complete/src/main/scala/sbt/complete/Parser.scala
diff --git a/util/complete/Parsers.scala b/util/complete/src/main/scala/sbt/complete/Parsers.scala
similarity index 100%
rename from util/complete/Parsers.scala
rename to util/complete/src/main/scala/sbt/complete/Parsers.scala
diff --git a/util/complete/ProcessError.scala b/util/complete/src/main/scala/sbt/complete/ProcessError.scala
similarity index 100%
rename from util/complete/ProcessError.scala
rename to util/complete/src/main/scala/sbt/complete/ProcessError.scala
diff --git a/util/complete/TokenCompletions.scala b/util/complete/src/main/scala/sbt/complete/TokenCompletions.scala
similarity index 100%
rename from util/complete/TokenCompletions.scala
rename to util/complete/src/main/scala/sbt/complete/TokenCompletions.scala
diff --git a/util/complete/TypeString.scala b/util/complete/src/main/scala/sbt/complete/TypeString.scala
similarity index 100%
rename from util/complete/TypeString.scala
rename to util/complete/src/main/scala/sbt/complete/TypeString.scala
diff --git a/util/complete/UpperBound.scala b/util/complete/src/main/scala/sbt/complete/UpperBound.scala
similarity index 100%
rename from util/complete/UpperBound.scala
rename to util/complete/src/main/scala/sbt/complete/UpperBound.scala
diff --git a/util/control/ErrorHandling.scala b/util/control/src/main/scala/sbt/ErrorHandling.scala
similarity index 100%
rename from util/control/ErrorHandling.scala
rename to util/control/src/main/scala/sbt/ErrorHandling.scala
diff --git a/util/control/ExitHook.scala b/util/control/src/main/scala/sbt/ExitHook.scala
similarity index 100%
rename from util/control/ExitHook.scala
rename to util/control/src/main/scala/sbt/ExitHook.scala
diff --git a/util/control/MessageOnlyException.scala b/util/control/src/main/scala/sbt/MessageOnlyException.scala
similarity index 100%
rename from util/control/MessageOnlyException.scala
rename to util/control/src/main/scala/sbt/MessageOnlyException.scala
diff --git a/util/log/BasicLogger.scala b/util/log/src/main/scala/sbt/BasicLogger.scala
similarity index 100%
rename from util/log/BasicLogger.scala
rename to util/log/src/main/scala/sbt/BasicLogger.scala
diff --git a/util/log/BufferedLogger.scala b/util/log/src/main/scala/sbt/BufferedLogger.scala
similarity index 100%
rename from util/log/BufferedLogger.scala
rename to util/log/src/main/scala/sbt/BufferedLogger.scala
diff --git a/util/log/ConsoleLogger.scala b/util/log/src/main/scala/sbt/ConsoleLogger.scala
similarity index 100%
rename from util/log/ConsoleLogger.scala
rename to util/log/src/main/scala/sbt/ConsoleLogger.scala
diff --git a/util/log/FilterLogger.scala b/util/log/src/main/scala/sbt/FilterLogger.scala
similarity index 100%
rename from util/log/FilterLogger.scala
rename to util/log/src/main/scala/sbt/FilterLogger.scala
diff --git a/util/log/FullLogger.scala b/util/log/src/main/scala/sbt/FullLogger.scala
similarity index 100%
rename from util/log/FullLogger.scala
rename to util/log/src/main/scala/sbt/FullLogger.scala
diff --git a/util/log/GlobalLogging.scala b/util/log/src/main/scala/sbt/GlobalLogging.scala
similarity index 100%
rename from util/log/GlobalLogging.scala
rename to util/log/src/main/scala/sbt/GlobalLogging.scala
diff --git a/util/log/Level.scala b/util/log/src/main/scala/sbt/Level.scala
similarity index 100%
rename from util/log/Level.scala
rename to util/log/src/main/scala/sbt/Level.scala
diff --git a/util/log/LogEvent.scala b/util/log/src/main/scala/sbt/LogEvent.scala
similarity index 100%
rename from util/log/LogEvent.scala
rename to util/log/src/main/scala/sbt/LogEvent.scala
diff --git a/util/log/Logger.scala b/util/log/src/main/scala/sbt/Logger.scala
similarity index 100%
rename from util/log/Logger.scala
rename to util/log/src/main/scala/sbt/Logger.scala
diff --git a/util/log/LoggerWriter.scala b/util/log/src/main/scala/sbt/LoggerWriter.scala
similarity index 100%
rename from util/log/LoggerWriter.scala
rename to util/log/src/main/scala/sbt/LoggerWriter.scala
diff --git a/util/log/MainLogging.scala b/util/log/src/main/scala/sbt/MainLogging.scala
similarity index 100%
rename from util/log/MainLogging.scala
rename to util/log/src/main/scala/sbt/MainLogging.scala
diff --git a/util/log/MultiLogger.scala b/util/log/src/main/scala/sbt/MultiLogger.scala
similarity index 100%
rename from util/log/MultiLogger.scala
rename to util/log/src/main/scala/sbt/MultiLogger.scala
diff --git a/util/log/StackTrace.scala b/util/log/src/main/scala/sbt/StackTrace.scala
similarity index 100%
rename from util/log/StackTrace.scala
rename to util/log/src/main/scala/sbt/StackTrace.scala
diff --git a/util/process/InheritInput.scala b/util/process/src/main/scala/sbt/InheritInput.scala
similarity index 100%
rename from util/process/InheritInput.scala
rename to util/process/src/main/scala/sbt/InheritInput.scala
diff --git a/util/process/Process.scala b/util/process/src/main/scala/sbt/Process.scala
similarity index 100%
rename from util/process/Process.scala
rename to util/process/src/main/scala/sbt/Process.scala
diff --git a/util/process/ProcessImpl.scala b/util/process/src/main/scala/sbt/ProcessImpl.scala
similarity index 100%
rename from util/process/ProcessImpl.scala
rename to util/process/src/main/scala/sbt/ProcessImpl.scala
diff --git a/util/relation/Relation.scala b/util/relation/src/main/scala/sbt/Relation.scala
similarity index 100%
rename from util/relation/Relation.scala
rename to util/relation/src/main/scala/sbt/Relation.scala