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/compile/api/ClassToAPI.scala b/compile/api/src/main/scala/sbt/ClassToAPI.scala
similarity index 100%
rename from compile/api/ClassToAPI.scala
rename to compile/api/src/main/scala/sbt/ClassToAPI.scala
diff --git a/compile/api/APIUtil.scala b/compile/api/src/main/scala/xsbt/api/APIUtil.scala
similarity index 100%
rename from compile/api/APIUtil.scala
rename to compile/api/src/main/scala/xsbt/api/APIUtil.scala
diff --git a/compile/api/Discovered.scala b/compile/api/src/main/scala/xsbt/api/Discovered.scala
similarity index 100%
rename from compile/api/Discovered.scala
rename to compile/api/src/main/scala/xsbt/api/Discovered.scala
diff --git a/compile/api/Discovery.scala b/compile/api/src/main/scala/xsbt/api/Discovery.scala
similarity index 100%
rename from compile/api/Discovery.scala
rename to compile/api/src/main/scala/xsbt/api/Discovery.scala
diff --git a/compile/api/HashAPI.scala b/compile/api/src/main/scala/xsbt/api/HashAPI.scala
similarity index 100%
rename from compile/api/HashAPI.scala
rename to compile/api/src/main/scala/xsbt/api/HashAPI.scala
diff --git a/compile/api/ParseType.scala b/compile/api/src/main/scala/xsbt/api/ParseType.scala
similarity index 100%
rename from compile/api/ParseType.scala
rename to compile/api/src/main/scala/xsbt/api/ParseType.scala
diff --git a/compile/api/SameAPI.scala b/compile/api/src/main/scala/xsbt/api/SameAPI.scala
similarity index 100%
rename from compile/api/SameAPI.scala
rename to compile/api/src/main/scala/xsbt/api/SameAPI.scala
diff --git a/compile/api/ShowAPI.scala b/compile/api/src/main/scala/xsbt/api/ShowAPI.scala
similarity index 100%
rename from compile/api/ShowAPI.scala
rename to compile/api/src/main/scala/xsbt/api/ShowAPI.scala
diff --git a/compile/api/Visit.scala b/compile/api/src/main/scala/xsbt/api/Visit.scala
similarity index 100%
rename from compile/api/Visit.scala
rename to compile/api/src/main/scala/xsbt/api/Visit.scala
diff --git a/compile/api/SafeLazy.scala b/compile/api/src/main/scala/xsbti/SafeLazy.scala
similarity index 100%
rename from compile/api/SafeLazy.scala
rename to compile/api/src/main/scala/xsbti/SafeLazy.scala
diff --git a/compile/inc/CompileSetup.scala b/compile/inc/src/main/scala/sbt/CompileSetup.scala
similarity index 100%
rename from compile/inc/CompileSetup.scala
rename to compile/inc/src/main/scala/sbt/CompileSetup.scala
diff --git a/compile/inc/APIs.scala b/compile/inc/src/main/scala/sbt/inc/APIs.scala
similarity index 100%
rename from compile/inc/APIs.scala
rename to compile/inc/src/main/scala/sbt/inc/APIs.scala
diff --git a/compile/inc/Analysis.scala b/compile/inc/src/main/scala/sbt/inc/Analysis.scala
similarity index 100%
rename from compile/inc/Analysis.scala
rename to compile/inc/src/main/scala/sbt/inc/Analysis.scala
diff --git a/compile/inc/AnalysisStore.scala b/compile/inc/src/main/scala/sbt/inc/AnalysisStore.scala
similarity index 100%
rename from compile/inc/AnalysisStore.scala
rename to compile/inc/src/main/scala/sbt/inc/AnalysisStore.scala
diff --git a/compile/inc/Changes.scala b/compile/inc/src/main/scala/sbt/inc/Changes.scala
similarity index 100%
rename from compile/inc/Changes.scala
rename to compile/inc/src/main/scala/sbt/inc/Changes.scala
diff --git a/compile/inc/Compile.scala b/compile/inc/src/main/scala/sbt/inc/Compile.scala
similarity index 100%
rename from compile/inc/Compile.scala
rename to compile/inc/src/main/scala/sbt/inc/Compile.scala
diff --git a/compile/inc/FileValueCache.scala b/compile/inc/src/main/scala/sbt/inc/FileValueCache.scala
similarity index 100%
rename from compile/inc/FileValueCache.scala
rename to compile/inc/src/main/scala/sbt/inc/FileValueCache.scala
diff --git a/compile/inc/Incremental.scala b/compile/inc/src/main/scala/sbt/inc/Incremental.scala
similarity index 100%
rename from compile/inc/Incremental.scala
rename to compile/inc/src/main/scala/sbt/inc/Incremental.scala
diff --git a/compile/inc/Locate.scala b/compile/inc/src/main/scala/sbt/inc/Locate.scala
similarity index 100%
rename from compile/inc/Locate.scala
rename to compile/inc/src/main/scala/sbt/inc/Locate.scala
diff --git a/compile/inc/Relations.scala b/compile/inc/src/main/scala/sbt/inc/Relations.scala
similarity index 100%
rename from compile/inc/Relations.scala
rename to compile/inc/src/main/scala/sbt/inc/Relations.scala
diff --git a/compile/inc/SourceInfo.scala b/compile/inc/src/main/scala/sbt/inc/SourceInfo.scala
similarity index 100%
rename from compile/inc/SourceInfo.scala
rename to compile/inc/src/main/scala/sbt/inc/SourceInfo.scala
diff --git a/compile/inc/Stamp.scala b/compile/inc/src/main/scala/sbt/inc/Stamp.scala
similarity index 100%
rename from compile/inc/Stamp.scala
rename to compile/inc/src/main/scala/sbt/inc/Stamp.scala
diff --git a/compile/inc/StronglyConnected.scala b/compile/inc/src/main/scala/sbt/inc/StronglyConnected.scala
similarity index 100%
rename from compile/inc/StronglyConnected.scala
rename to compile/inc/src/main/scala/sbt/inc/StronglyConnected.scala
diff --git a/compile/integration/AggressiveCompile.scala b/compile/integration/src/main/scala/sbt/compiler/AggressiveCompile.scala
similarity index 100%
rename from compile/integration/AggressiveCompile.scala
rename to compile/integration/src/main/scala/sbt/compiler/AggressiveCompile.scala
diff --git a/compile/integration/IncrementalCompiler.scala b/compile/integration/src/main/scala/sbt/compiler/IncrementalCompiler.scala
similarity index 100%
rename from compile/integration/IncrementalCompiler.scala
rename to compile/integration/src/main/scala/sbt/compiler/IncrementalCompiler.scala
diff --git a/compile/interface/API.scala b/compile/interface/src/main/scala/xsbt/API.scala
similarity index 100%
rename from compile/interface/API.scala
rename to compile/interface/src/main/scala/xsbt/API.scala
diff --git a/compile/interface/Analyzer.scala b/compile/interface/src/main/scala/xsbt/Analyzer.scala
similarity index 100%
rename from compile/interface/Analyzer.scala
rename to compile/interface/src/main/scala/xsbt/Analyzer.scala
diff --git a/compile/interface/Command.scala b/compile/interface/src/main/scala/xsbt/Command.scala
similarity index 100%
rename from compile/interface/Command.scala
rename to compile/interface/src/main/scala/xsbt/Command.scala
diff --git a/compile/interface/CompilerInterface.scala b/compile/interface/src/main/scala/xsbt/CompilerInterface.scala
similarity index 100%
rename from compile/interface/CompilerInterface.scala
rename to compile/interface/src/main/scala/xsbt/CompilerInterface.scala
diff --git a/compile/interface/ConsoleInterface.scala b/compile/interface/src/main/scala/xsbt/ConsoleInterface.scala
similarity index 100%
rename from compile/interface/ConsoleInterface.scala
rename to compile/interface/src/main/scala/xsbt/ConsoleInterface.scala
diff --git a/compile/interface/DelegatingReporter.scala b/compile/interface/src/main/scala/xsbt/DelegatingReporter.scala
similarity index 100%
rename from compile/interface/DelegatingReporter.scala
rename to compile/interface/src/main/scala/xsbt/DelegatingReporter.scala
diff --git a/compile/interface/Log.scala b/compile/interface/src/main/scala/xsbt/Log.scala
similarity index 100%
rename from compile/interface/Log.scala
rename to compile/interface/src/main/scala/xsbt/Log.scala
diff --git a/compile/interface/Message.scala b/compile/interface/src/main/scala/xsbt/Message.scala
similarity index 100%
rename from compile/interface/Message.scala
rename to compile/interface/src/main/scala/xsbt/Message.scala
diff --git a/compile/interface/ScaladocInterface.scala b/compile/interface/src/main/scala/xsbt/ScaladocInterface.scala
similarity index 100%
rename from compile/interface/ScaladocInterface.scala
rename to compile/interface/src/main/scala/xsbt/ScaladocInterface.scala
diff --git a/compile/ivy/ComponentCompiler.scala b/compile/ivy/src/main/scala/sbt/compiler/ComponentCompiler.scala
similarity index 100%
rename from compile/ivy/ComponentCompiler.scala
rename to compile/ivy/src/main/scala/sbt/compiler/ComponentCompiler.scala
diff --git a/compile/persist/AnalysisFormats.scala b/compile/persist/src/main/scala/sbt/inc/AnalysisFormats.scala
similarity index 100%
rename from compile/persist/AnalysisFormats.scala
rename to compile/persist/src/main/scala/sbt/inc/AnalysisFormats.scala
diff --git a/compile/persist/FileBasedStore.scala b/compile/persist/src/main/scala/sbt/inc/FileBasedStore.scala
similarity index 100%
rename from compile/persist/FileBasedStore.scala
rename to compile/persist/src/main/scala/sbt/inc/FileBasedStore.scala
diff --git a/compile/persist/APIFormats.scala b/compile/persist/src/main/scala/xsbt/api/APIFormats.scala
similarity index 100%
rename from compile/persist/APIFormats.scala
rename to compile/persist/src/main/scala/xsbt/api/APIFormats.scala
diff --git a/compile/persist/SourceFormat.scala b/compile/persist/src/main/scala/xsbt/api/SourceFormat.scala
similarity index 100%
rename from compile/persist/SourceFormat.scala
rename to compile/persist/src/main/scala/xsbt/api/SourceFormat.scala
diff --git a/compile/ClasspathOptions.scala b/compile/src/main/scala/sbt/ClasspathOptions.scala
similarity index 100%
rename from compile/ClasspathOptions.scala
rename to compile/src/main/scala/sbt/ClasspathOptions.scala
diff --git a/compile/LoggerReporter.scala b/compile/src/main/scala/sbt/LoggerReporter.scala
similarity index 100%
rename from compile/LoggerReporter.scala
rename to compile/src/main/scala/sbt/LoggerReporter.scala
diff --git a/compile/AnalyzingCompiler.scala b/compile/src/main/scala/sbt/compiler/AnalyzingCompiler.scala
similarity index 100%
rename from compile/AnalyzingCompiler.scala
rename to compile/src/main/scala/sbt/compiler/AnalyzingCompiler.scala
diff --git a/compile/CompilerArguments.scala b/compile/src/main/scala/sbt/compiler/CompilerArguments.scala
similarity index 100%
rename from compile/CompilerArguments.scala
rename to compile/src/main/scala/sbt/compiler/CompilerArguments.scala
diff --git a/compile/CompilerCache.scala b/compile/src/main/scala/sbt/compiler/CompilerCache.scala
similarity index 100%
rename from compile/CompilerCache.scala
rename to compile/src/main/scala/sbt/compiler/CompilerCache.scala
diff --git a/compile/CompilerInterfaceProvider.scala b/compile/src/main/scala/sbt/compiler/CompilerInterfaceProvider.scala
similarity index 100%
rename from compile/CompilerInterfaceProvider.scala
rename to compile/src/main/scala/sbt/compiler/CompilerInterfaceProvider.scala
diff --git a/compile/CompilerOutput.scala b/compile/src/main/scala/sbt/compiler/CompilerOutput.scala
similarity index 100%
rename from compile/CompilerOutput.scala
rename to compile/src/main/scala/sbt/compiler/CompilerOutput.scala
diff --git a/compile/Eval.scala b/compile/src/main/scala/sbt/compiler/Eval.scala
similarity index 100%
rename from compile/Eval.scala
rename to compile/src/main/scala/sbt/compiler/Eval.scala
diff --git a/compile/JavaCompiler.scala b/compile/src/main/scala/sbt/compiler/JavaCompiler.scala
similarity index 100%
rename from compile/JavaCompiler.scala
rename to compile/src/main/scala/sbt/compiler/JavaCompiler.scala
diff --git a/compile/RawCompiler.scala b/compile/src/main/scala/sbt/compiler/RawCompiler.scala
similarity index 100%
rename from compile/RawCompiler.scala
rename to compile/src/main/scala/sbt/compiler/RawCompiler.scala
diff --git a/ivy/src/main/java/ResolverAdapter.java b/ivy/src/main/java/sbt/ResolverAdapter.java
similarity index 100%
rename from ivy/src/main/java/ResolverAdapter.java
rename to ivy/src/main/java/sbt/ResolverAdapter.java
diff --git a/ivy/ComponentManager.scala b/ivy/src/main/scala/sbt/ComponentManager.scala
similarity index 100%
rename from ivy/ComponentManager.scala
rename to ivy/src/main/scala/sbt/ComponentManager.scala
diff --git a/ivy/ConflictWarning.scala b/ivy/src/main/scala/sbt/ConflictWarning.scala
similarity index 100%
rename from ivy/ConflictWarning.scala
rename to ivy/src/main/scala/sbt/ConflictWarning.scala
diff --git a/ivy/ConvertResolver.scala b/ivy/src/main/scala/sbt/ConvertResolver.scala
similarity index 100%
rename from ivy/ConvertResolver.scala
rename to ivy/src/main/scala/sbt/ConvertResolver.scala
diff --git a/ivy/Credentials.scala b/ivy/src/main/scala/sbt/Credentials.scala
similarity index 100%
rename from ivy/Credentials.scala
rename to ivy/src/main/scala/sbt/Credentials.scala
diff --git a/ivy/CrossVersion.scala b/ivy/src/main/scala/sbt/CrossVersion.scala
similarity index 100%
rename from ivy/CrossVersion.scala
rename to ivy/src/main/scala/sbt/CrossVersion.scala
diff --git a/ivy/CustomPomParser.scala b/ivy/src/main/scala/sbt/CustomPomParser.scala
similarity index 100%
rename from ivy/CustomPomParser.scala
rename to ivy/src/main/scala/sbt/CustomPomParser.scala
diff --git a/ivy/CustomXmlParser.scala b/ivy/src/main/scala/sbt/CustomXmlParser.scala
similarity index 100%
rename from ivy/CustomXmlParser.scala
rename to ivy/src/main/scala/sbt/CustomXmlParser.scala
diff --git a/ivy/DependencyFilter.scala b/ivy/src/main/scala/sbt/DependencyFilter.scala
similarity index 100%
rename from ivy/DependencyFilter.scala
rename to ivy/src/main/scala/sbt/DependencyFilter.scala
diff --git a/ivy/Ivy.scala b/ivy/src/main/scala/sbt/Ivy.scala
similarity index 100%
rename from ivy/Ivy.scala
rename to ivy/src/main/scala/sbt/Ivy.scala
diff --git a/ivy/IvyActions.scala b/ivy/src/main/scala/sbt/IvyActions.scala
similarity index 100%
rename from ivy/IvyActions.scala
rename to ivy/src/main/scala/sbt/IvyActions.scala
diff --git a/ivy/IvyCache.scala b/ivy/src/main/scala/sbt/IvyCache.scala
similarity index 100%
rename from ivy/IvyCache.scala
rename to ivy/src/main/scala/sbt/IvyCache.scala
diff --git a/ivy/IvyConfigurations.scala b/ivy/src/main/scala/sbt/IvyConfigurations.scala
similarity index 100%
rename from ivy/IvyConfigurations.scala
rename to ivy/src/main/scala/sbt/IvyConfigurations.scala
diff --git a/ivy/IvyInterface.scala b/ivy/src/main/scala/sbt/IvyInterface.scala
similarity index 100%
rename from ivy/IvyInterface.scala
rename to ivy/src/main/scala/sbt/IvyInterface.scala
diff --git a/ivy/IvyLogger.scala b/ivy/src/main/scala/sbt/IvyLogger.scala
similarity index 100%
rename from ivy/IvyLogger.scala
rename to ivy/src/main/scala/sbt/IvyLogger.scala
diff --git a/ivy/IvyRetrieve.scala b/ivy/src/main/scala/sbt/IvyRetrieve.scala
similarity index 100%
rename from ivy/IvyRetrieve.scala
rename to ivy/src/main/scala/sbt/IvyRetrieve.scala
diff --git a/ivy/IvyScala.scala b/ivy/src/main/scala/sbt/IvyScala.scala
similarity index 100%
rename from ivy/IvyScala.scala
rename to ivy/src/main/scala/sbt/IvyScala.scala
diff --git a/ivy/IvyUtil.scala b/ivy/src/main/scala/sbt/IvyUtil.scala
similarity index 100%
rename from ivy/IvyUtil.scala
rename to ivy/src/main/scala/sbt/IvyUtil.scala
diff --git a/ivy/MakePom.scala b/ivy/src/main/scala/sbt/MakePom.scala
similarity index 100%
rename from ivy/MakePom.scala
rename to ivy/src/main/scala/sbt/MakePom.scala
diff --git a/ivy/ProjectResolver.scala b/ivy/src/main/scala/sbt/ProjectResolver.scala
similarity index 100%
rename from ivy/ProjectResolver.scala
rename to ivy/src/main/scala/sbt/ProjectResolver.scala
diff --git a/ivy/ResolutionCache.scala b/ivy/src/main/scala/sbt/ResolutionCache.scala
similarity index 100%
rename from ivy/ResolutionCache.scala
rename to ivy/src/main/scala/sbt/ResolutionCache.scala
diff --git a/ivy/StringUtilities.scala b/ivy/src/main/scala/sbt/StringUtilities.scala
similarity index 100%
rename from ivy/StringUtilities.scala
rename to ivy/src/main/scala/sbt/StringUtilities.scala
diff --git a/ivy/UpdateReport.scala b/ivy/src/main/scala/sbt/UpdateReport.scala
similarity index 100%
rename from ivy/UpdateReport.scala
rename to ivy/src/main/scala/sbt/UpdateReport.scala
diff --git a/ivy/DependencyBuilders.scala b/ivy/src/main/scala/sbt/impl/DependencyBuilders.scala
similarity index 100%
rename from ivy/DependencyBuilders.scala
rename to ivy/src/main/scala/sbt/impl/DependencyBuilders.scala
diff --git a/ivy/MergeDescriptors.scala b/ivy/src/main/scala/sbt/ivyint/MergeDescriptors.scala
similarity index 100%
rename from ivy/MergeDescriptors.scala
rename to ivy/src/main/scala/sbt/ivyint/MergeDescriptors.scala
diff --git a/launch/Boot.scala b/launch/src/main/scala/xsbt/boot/Boot.scala
similarity index 100%
rename from launch/Boot.scala
rename to launch/src/main/scala/xsbt/boot/Boot.scala
diff --git a/launch/BootConfiguration.scala b/launch/src/main/scala/xsbt/boot/BootConfiguration.scala
similarity index 100%
rename from launch/BootConfiguration.scala
rename to launch/src/main/scala/xsbt/boot/BootConfiguration.scala
diff --git a/launch/Cache.scala b/launch/src/main/scala/xsbt/boot/Cache.scala
similarity index 100%
rename from launch/Cache.scala
rename to launch/src/main/scala/xsbt/boot/Cache.scala
diff --git a/launch/CheckProxy.scala b/launch/src/main/scala/xsbt/boot/CheckProxy.scala
similarity index 100%
rename from launch/CheckProxy.scala
rename to launch/src/main/scala/xsbt/boot/CheckProxy.scala
diff --git a/launch/Configuration.scala b/launch/src/main/scala/xsbt/boot/Configuration.scala
similarity index 100%
rename from launch/Configuration.scala
rename to launch/src/main/scala/xsbt/boot/Configuration.scala
diff --git a/launch/ConfigurationParser.scala b/launch/src/main/scala/xsbt/boot/ConfigurationParser.scala
similarity index 100%
rename from launch/ConfigurationParser.scala
rename to launch/src/main/scala/xsbt/boot/ConfigurationParser.scala
diff --git a/launch/Create.scala b/launch/src/main/scala/xsbt/boot/Create.scala
similarity index 100%
rename from launch/Create.scala
rename to launch/src/main/scala/xsbt/boot/Create.scala
diff --git a/launch/Enumeration.scala b/launch/src/main/scala/xsbt/boot/Enumeration.scala
similarity index 100%
rename from launch/Enumeration.scala
rename to launch/src/main/scala/xsbt/boot/Enumeration.scala
diff --git a/launch/Exceptions.scala b/launch/src/main/scala/xsbt/boot/Exceptions.scala
similarity index 100%
rename from launch/Exceptions.scala
rename to launch/src/main/scala/xsbt/boot/Exceptions.scala
diff --git a/launch/FilteredLoader.scala b/launch/src/main/scala/xsbt/boot/FilteredLoader.scala
similarity index 100%
rename from launch/FilteredLoader.scala
rename to launch/src/main/scala/xsbt/boot/FilteredLoader.scala
diff --git a/launch/Find.scala b/launch/src/main/scala/xsbt/boot/Find.scala
similarity index 100%
rename from launch/Find.scala
rename to launch/src/main/scala/xsbt/boot/Find.scala
diff --git a/launch/Launch.scala b/launch/src/main/scala/xsbt/boot/Launch.scala
similarity index 100%
rename from launch/Launch.scala
rename to launch/src/main/scala/xsbt/boot/Launch.scala
diff --git a/launch/LaunchConfiguration.scala b/launch/src/main/scala/xsbt/boot/LaunchConfiguration.scala
similarity index 100%
rename from launch/LaunchConfiguration.scala
rename to launch/src/main/scala/xsbt/boot/LaunchConfiguration.scala
diff --git a/launch/ListMap.scala b/launch/src/main/scala/xsbt/boot/ListMap.scala
similarity index 100%
rename from launch/ListMap.scala
rename to launch/src/main/scala/xsbt/boot/ListMap.scala
diff --git a/launch/Locks.scala b/launch/src/main/scala/xsbt/boot/Locks.scala
similarity index 100%
rename from launch/Locks.scala
rename to launch/src/main/scala/xsbt/boot/Locks.scala
diff --git a/launch/ModuleDefinition.scala b/launch/src/main/scala/xsbt/boot/ModuleDefinition.scala
similarity index 100%
rename from launch/ModuleDefinition.scala
rename to launch/src/main/scala/xsbt/boot/ModuleDefinition.scala
diff --git a/launch/Pre.scala b/launch/src/main/scala/xsbt/boot/Pre.scala
similarity index 100%
rename from launch/Pre.scala
rename to launch/src/main/scala/xsbt/boot/Pre.scala
diff --git a/launch/ResolveValues.scala b/launch/src/main/scala/xsbt/boot/ResolveValues.scala
similarity index 100%
rename from launch/ResolveValues.scala
rename to launch/src/main/scala/xsbt/boot/ResolveValues.scala
diff --git a/launch/SimpleReader.scala b/launch/src/main/scala/xsbt/boot/SimpleReader.scala
similarity index 100%
rename from launch/SimpleReader.scala
rename to launch/src/main/scala/xsbt/boot/SimpleReader.scala
diff --git a/launch/Update.scala b/launch/src/main/scala/xsbt/boot/Update.scala
similarity index 100%
rename from launch/Update.scala
rename to launch/src/main/scala/xsbt/boot/Update.scala
diff --git a/launch/Using.scala b/launch/src/main/scala/xsbt/boot/Using.scala
similarity index 100%
rename from launch/Using.scala
rename to launch/src/main/scala/xsbt/boot/Using.scala
diff --git a/launch/test-sample/Apps.scala b/launch/test-sample/src/main/scala/xsbt/boot/test/Apps.scala
similarity index 100%
rename from launch/test-sample/Apps.scala
rename to launch/test-sample/src/main/scala/xsbt/boot/test/Apps.scala
diff --git a/main/actions/CacheIvy.scala b/main/actions/src/main/scala/sbt/CacheIvy.scala
similarity index 100%
rename from main/actions/CacheIvy.scala
rename to main/actions/src/main/scala/sbt/CacheIvy.scala
diff --git a/main/actions/Compiler.scala b/main/actions/src/main/scala/sbt/Compiler.scala
similarity index 100%
rename from main/actions/Compiler.scala
rename to main/actions/src/main/scala/sbt/Compiler.scala
diff --git a/main/actions/Console.scala b/main/actions/src/main/scala/sbt/Console.scala
similarity index 100%
rename from main/actions/Console.scala
rename to main/actions/src/main/scala/sbt/Console.scala
diff --git a/main/actions/Doc.scala b/main/actions/src/main/scala/sbt/Doc.scala
similarity index 100%
rename from main/actions/Doc.scala
rename to main/actions/src/main/scala/sbt/Doc.scala
diff --git a/main/actions/DotGraph.scala b/main/actions/src/main/scala/sbt/DotGraph.scala
similarity index 100%
rename from main/actions/DotGraph.scala
rename to main/actions/src/main/scala/sbt/DotGraph.scala
diff --git a/main/actions/ForkTests.scala b/main/actions/src/main/scala/sbt/ForkTests.scala
similarity index 100%
rename from main/actions/ForkTests.scala
rename to main/actions/src/main/scala/sbt/ForkTests.scala
diff --git a/main/actions/Package.scala b/main/actions/src/main/scala/sbt/Package.scala
similarity index 100%
rename from main/actions/Package.scala
rename to main/actions/src/main/scala/sbt/Package.scala
diff --git a/main/actions/RawCompileLike.scala b/main/actions/src/main/scala/sbt/RawCompileLike.scala
similarity index 100%
rename from main/actions/RawCompileLike.scala
rename to main/actions/src/main/scala/sbt/RawCompileLike.scala
diff --git a/main/actions/Sync.scala b/main/actions/src/main/scala/sbt/Sync.scala
similarity index 100%
rename from main/actions/Sync.scala
rename to main/actions/src/main/scala/sbt/Sync.scala
diff --git a/main/actions/Tests.scala b/main/actions/src/main/scala/sbt/Tests.scala
similarity index 100%
rename from main/actions/Tests.scala
rename to main/actions/src/main/scala/sbt/Tests.scala
diff --git a/main/command/BasicCommandStrings.scala b/main/command/src/main/scala/sbt/BasicCommandStrings.scala
similarity index 100%
rename from main/command/BasicCommandStrings.scala
rename to main/command/src/main/scala/sbt/BasicCommandStrings.scala
diff --git a/main/command/BasicCommands.scala b/main/command/src/main/scala/sbt/BasicCommands.scala
similarity index 100%
rename from main/command/BasicCommands.scala
rename to main/command/src/main/scala/sbt/BasicCommands.scala
diff --git a/main/command/BasicKeys.scala b/main/command/src/main/scala/sbt/BasicKeys.scala
similarity index 100%
rename from main/command/BasicKeys.scala
rename to main/command/src/main/scala/sbt/BasicKeys.scala
diff --git a/main/command/Command.scala b/main/command/src/main/scala/sbt/Command.scala
similarity index 100%
rename from main/command/Command.scala
rename to main/command/src/main/scala/sbt/Command.scala
diff --git a/main/command/CommandUtil.scala b/main/command/src/main/scala/sbt/CommandUtil.scala
similarity index 100%
rename from main/command/CommandUtil.scala
rename to main/command/src/main/scala/sbt/CommandUtil.scala
diff --git a/main/command/ExceptionCategory.scala b/main/command/src/main/scala/sbt/ExceptionCategory.scala
similarity index 100%
rename from main/command/ExceptionCategory.scala
rename to main/command/src/main/scala/sbt/ExceptionCategory.scala
diff --git a/main/command/Highlight.scala b/main/command/src/main/scala/sbt/Highlight.scala
similarity index 100%
rename from main/command/Highlight.scala
rename to main/command/src/main/scala/sbt/Highlight.scala
diff --git a/main/command/MainControl.scala b/main/command/src/main/scala/sbt/MainControl.scala
similarity index 100%
rename from main/command/MainControl.scala
rename to main/command/src/main/scala/sbt/MainControl.scala
diff --git a/main/command/MainLoop.scala b/main/command/src/main/scala/sbt/MainLoop.scala
similarity index 100%
rename from main/command/MainLoop.scala
rename to main/command/src/main/scala/sbt/MainLoop.scala
diff --git a/main/command/State.scala b/main/command/src/main/scala/sbt/State.scala
similarity index 100%
rename from main/command/State.scala
rename to main/command/src/main/scala/sbt/State.scala
diff --git a/main/command/Watched.scala b/main/command/src/main/scala/sbt/Watched.scala
similarity index 100%
rename from main/command/Watched.scala
rename to main/command/src/main/scala/sbt/Watched.scala
diff --git a/main/settings/Append.scala b/main/settings/src/main/scala/sbt/Append.scala
similarity index 100%
rename from main/settings/Append.scala
rename to main/settings/src/main/scala/sbt/Append.scala
diff --git a/main/settings/ConfigKey.scala b/main/settings/src/main/scala/sbt/ConfigKey.scala
similarity index 100%
rename from main/settings/ConfigKey.scala
rename to main/settings/src/main/scala/sbt/ConfigKey.scala
diff --git a/main/settings/Def.scala b/main/settings/src/main/scala/sbt/Def.scala
similarity index 100%
rename from main/settings/Def.scala
rename to main/settings/src/main/scala/sbt/Def.scala
diff --git a/main/settings/DelegateIndex.scala b/main/settings/src/main/scala/sbt/DelegateIndex.scala
similarity index 100%
rename from main/settings/DelegateIndex.scala
rename to main/settings/src/main/scala/sbt/DelegateIndex.scala
diff --git a/main/settings/InputTask.scala b/main/settings/src/main/scala/sbt/InputTask.scala
similarity index 100%
rename from main/settings/InputTask.scala
rename to main/settings/src/main/scala/sbt/InputTask.scala
diff --git a/main/settings/KeyRanks.scala b/main/settings/src/main/scala/sbt/KeyRanks.scala
similarity index 100%
rename from main/settings/KeyRanks.scala
rename to main/settings/src/main/scala/sbt/KeyRanks.scala
diff --git a/main/settings/Reference.scala b/main/settings/src/main/scala/sbt/Reference.scala
similarity index 100%
rename from main/settings/Reference.scala
rename to main/settings/src/main/scala/sbt/Reference.scala
diff --git a/main/settings/Scope.scala b/main/settings/src/main/scala/sbt/Scope.scala
similarity index 100%
rename from main/settings/Scope.scala
rename to main/settings/src/main/scala/sbt/Scope.scala
diff --git a/main/settings/ScopeAxis.scala b/main/settings/src/main/scala/sbt/ScopeAxis.scala
similarity index 100%
rename from main/settings/ScopeAxis.scala
rename to main/settings/src/main/scala/sbt/ScopeAxis.scala
diff --git a/main/settings/ScopeMask.scala b/main/settings/src/main/scala/sbt/ScopeMask.scala
similarity index 100%
rename from main/settings/ScopeMask.scala
rename to main/settings/src/main/scala/sbt/ScopeMask.scala
diff --git a/main/settings/Structure.scala b/main/settings/src/main/scala/sbt/Structure.scala
similarity index 100%
rename from main/settings/Structure.scala
rename to main/settings/src/main/scala/sbt/Structure.scala
diff --git a/main/settings/KeyMacro.scala b/main/settings/src/main/scala/sbt/std/KeyMacro.scala
similarity index 100%
rename from main/settings/KeyMacro.scala
rename to main/settings/src/main/scala/sbt/std/KeyMacro.scala
diff --git a/main/settings/SettingMacro.scala b/main/settings/src/main/scala/sbt/std/SettingMacro.scala
similarity index 100%
rename from main/settings/SettingMacro.scala
rename to main/settings/src/main/scala/sbt/std/SettingMacro.scala
diff --git a/main/settings/TaskMacro.scala b/main/settings/src/main/scala/sbt/std/TaskMacro.scala
similarity index 100%
rename from main/settings/TaskMacro.scala
rename to main/settings/src/main/scala/sbt/std/TaskMacro.scala
diff --git a/main/Act.scala b/main/src/main/scala/sbt/Act.scala
similarity index 100%
rename from main/Act.scala
rename to main/src/main/scala/sbt/Act.scala
diff --git a/main/AddSettings.scala b/main/src/main/scala/sbt/AddSettings.scala
similarity index 100%
rename from main/AddSettings.scala
rename to main/src/main/scala/sbt/AddSettings.scala
diff --git a/main/Aggregation.scala b/main/src/main/scala/sbt/Aggregation.scala
similarity index 100%
rename from main/Aggregation.scala
rename to main/src/main/scala/sbt/Aggregation.scala
diff --git a/main/Build.scala b/main/src/main/scala/sbt/Build.scala
similarity index 100%
rename from main/Build.scala
rename to main/src/main/scala/sbt/Build.scala
diff --git a/main/BuildDependencies.scala b/main/src/main/scala/sbt/BuildDependencies.scala
similarity index 100%
rename from main/BuildDependencies.scala
rename to main/src/main/scala/sbt/BuildDependencies.scala
diff --git a/main/BuildLoader.scala b/main/src/main/scala/sbt/BuildLoader.scala
similarity index 100%
rename from main/BuildLoader.scala
rename to main/src/main/scala/sbt/BuildLoader.scala
diff --git a/main/BuildPaths.scala b/main/src/main/scala/sbt/BuildPaths.scala
similarity index 100%
rename from main/BuildPaths.scala
rename to main/src/main/scala/sbt/BuildPaths.scala
diff --git a/main/BuildStructure.scala b/main/src/main/scala/sbt/BuildStructure.scala
similarity index 100%
rename from main/BuildStructure.scala
rename to main/src/main/scala/sbt/BuildStructure.scala
diff --git a/main/BuildUtil.scala b/main/src/main/scala/sbt/BuildUtil.scala
similarity index 100%
rename from main/BuildUtil.scala
rename to main/src/main/scala/sbt/BuildUtil.scala
diff --git a/main/CommandStrings.scala b/main/src/main/scala/sbt/CommandStrings.scala
similarity index 100%
rename from main/CommandStrings.scala
rename to main/src/main/scala/sbt/CommandStrings.scala
diff --git a/main/ConsoleProject.scala b/main/src/main/scala/sbt/ConsoleProject.scala
similarity index 100%
rename from main/ConsoleProject.scala
rename to main/src/main/scala/sbt/ConsoleProject.scala
diff --git a/main/Cross.scala b/main/src/main/scala/sbt/Cross.scala
similarity index 100%
rename from main/Cross.scala
rename to main/src/main/scala/sbt/Cross.scala
diff --git a/main/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
similarity index 100%
rename from main/Defaults.scala
rename to main/src/main/scala/sbt/Defaults.scala
diff --git a/main/EvaluateConfigurations.scala b/main/src/main/scala/sbt/EvaluateConfigurations.scala
similarity index 100%
rename from main/EvaluateConfigurations.scala
rename to main/src/main/scala/sbt/EvaluateConfigurations.scala
diff --git a/main/EvaluateTask.scala b/main/src/main/scala/sbt/EvaluateTask.scala
similarity index 100%
rename from main/EvaluateTask.scala
rename to main/src/main/scala/sbt/EvaluateTask.scala
diff --git a/main/Extracted.scala b/main/src/main/scala/sbt/Extracted.scala
similarity index 100%
rename from main/Extracted.scala
rename to main/src/main/scala/sbt/Extracted.scala
diff --git a/main/GlobalPlugin.scala b/main/src/main/scala/sbt/GlobalPlugin.scala
similarity index 100%
rename from main/GlobalPlugin.scala
rename to main/src/main/scala/sbt/GlobalPlugin.scala
diff --git a/main/IvyConsole.scala b/main/src/main/scala/sbt/IvyConsole.scala
similarity index 100%
rename from main/IvyConsole.scala
rename to main/src/main/scala/sbt/IvyConsole.scala
diff --git a/main/KeyIndex.scala b/main/src/main/scala/sbt/KeyIndex.scala
similarity index 100%
rename from main/KeyIndex.scala
rename to main/src/main/scala/sbt/KeyIndex.scala
diff --git a/main/Keys.scala b/main/src/main/scala/sbt/Keys.scala
similarity index 100%
rename from main/Keys.scala
rename to main/src/main/scala/sbt/Keys.scala
diff --git a/main/Load.scala b/main/src/main/scala/sbt/Load.scala
similarity index 100%
rename from main/Load.scala
rename to main/src/main/scala/sbt/Load.scala
diff --git a/main/LogManager.scala b/main/src/main/scala/sbt/LogManager.scala
similarity index 100%
rename from main/LogManager.scala
rename to main/src/main/scala/sbt/LogManager.scala
diff --git a/main/Main.scala b/main/src/main/scala/sbt/Main.scala
similarity index 100%
rename from main/Main.scala
rename to main/src/main/scala/sbt/Main.scala
diff --git a/main/Opts.scala b/main/src/main/scala/sbt/Opts.scala
similarity index 100%
rename from main/Opts.scala
rename to main/src/main/scala/sbt/Opts.scala
diff --git a/main/Output.scala b/main/src/main/scala/sbt/Output.scala
similarity index 100%
rename from main/Output.scala
rename to main/src/main/scala/sbt/Output.scala
diff --git a/main/PluginManagement.scala b/main/src/main/scala/sbt/PluginManagement.scala
similarity index 100%
rename from main/PluginManagement.scala
rename to main/src/main/scala/sbt/PluginManagement.scala
diff --git a/main/Project.scala b/main/src/main/scala/sbt/Project.scala
similarity index 100%
rename from main/Project.scala
rename to main/src/main/scala/sbt/Project.scala
diff --git a/main/ProjectNavigation.scala b/main/src/main/scala/sbt/ProjectNavigation.scala
similarity index 100%
rename from main/ProjectNavigation.scala
rename to main/src/main/scala/sbt/ProjectNavigation.scala
diff --git a/main/Resolve.scala b/main/src/main/scala/sbt/Resolve.scala
similarity index 100%
rename from main/Resolve.scala
rename to main/src/main/scala/sbt/Resolve.scala
diff --git a/main/Resolvers.scala b/main/src/main/scala/sbt/Resolvers.scala
similarity index 100%
rename from main/Resolvers.scala
rename to main/src/main/scala/sbt/Resolvers.scala
diff --git a/main/RetrieveUnit.scala b/main/src/main/scala/sbt/RetrieveUnit.scala
similarity index 100%
rename from main/RetrieveUnit.scala
rename to main/src/main/scala/sbt/RetrieveUnit.scala
diff --git a/main/ScopedKeyData.scala b/main/src/main/scala/sbt/ScopedKeyData.scala
similarity index 100%
rename from main/ScopedKeyData.scala
rename to main/src/main/scala/sbt/ScopedKeyData.scala
diff --git a/main/Script.scala b/main/src/main/scala/sbt/Script.scala
similarity index 100%
rename from main/Script.scala
rename to main/src/main/scala/sbt/Script.scala
diff --git a/main/SessionSettings.scala b/main/src/main/scala/sbt/SessionSettings.scala
similarity index 100%
rename from main/SessionSettings.scala
rename to main/src/main/scala/sbt/SessionSettings.scala
diff --git a/main/SessionVar.scala b/main/src/main/scala/sbt/SessionVar.scala
similarity index 100%
rename from main/SessionVar.scala
rename to main/src/main/scala/sbt/SessionVar.scala
diff --git a/main/SettingCompletions.scala b/main/src/main/scala/sbt/SettingCompletions.scala
similarity index 100%
rename from main/SettingCompletions.scala
rename to main/src/main/scala/sbt/SettingCompletions.scala
diff --git a/main/SettingGraph.scala b/main/src/main/scala/sbt/SettingGraph.scala
similarity index 100%
rename from main/SettingGraph.scala
rename to main/src/main/scala/sbt/SettingGraph.scala
diff --git a/main/Tags.scala b/main/src/main/scala/sbt/Tags.scala
similarity index 100%
rename from main/Tags.scala
rename to main/src/main/scala/sbt/Tags.scala
diff --git a/run/Fork.scala b/run/src/main/scala/sbt/Fork.scala
similarity index 100%
rename from run/Fork.scala
rename to run/src/main/scala/sbt/Fork.scala
diff --git a/run/Run.scala b/run/src/main/scala/sbt/Run.scala
similarity index 100%
rename from run/Run.scala
rename to run/src/main/scala/sbt/Run.scala
diff --git a/run/SelectMainClass.scala b/run/src/main/scala/sbt/SelectMainClass.scala
similarity index 100%
rename from run/SelectMainClass.scala
rename to run/src/main/scala/sbt/SelectMainClass.scala
diff --git a/run/TrapExit.scala b/run/src/main/scala/sbt/TrapExit.scala
similarity index 100%
rename from run/TrapExit.scala
rename to run/src/main/scala/sbt/TrapExit.scala
diff --git a/sbt/package.scala b/sbt/src/main/scala/object/package.scala
similarity index 100%
rename from sbt/package.scala
rename to sbt/src/main/scala/object/package.scala
diff --git a/scripted/base/CommentHandler.scala b/scripted/base/src/main/scala/xsbt/test/CommentHandler.scala
similarity index 100%
rename from scripted/base/CommentHandler.scala
rename to scripted/base/src/main/scala/xsbt/test/CommentHandler.scala
diff --git a/scripted/base/FileCommands.scala b/scripted/base/src/main/scala/xsbt/test/FileCommands.scala
similarity index 100%
rename from scripted/base/FileCommands.scala
rename to scripted/base/src/main/scala/xsbt/test/FileCommands.scala
diff --git a/scripted/base/FilteredLoader.scala b/scripted/base/src/main/scala/xsbt/test/FilteredLoader.scala
similarity index 100%
rename from scripted/base/FilteredLoader.scala
rename to scripted/base/src/main/scala/xsbt/test/FilteredLoader.scala
diff --git a/scripted/base/ScriptRunner.scala b/scripted/base/src/main/scala/xsbt/test/ScriptRunner.scala
similarity index 100%
rename from scripted/base/ScriptRunner.scala
rename to scripted/base/src/main/scala/xsbt/test/ScriptRunner.scala
diff --git a/scripted/base/StatementHandler.scala b/scripted/base/src/main/scala/xsbt/test/StatementHandler.scala
similarity index 100%
rename from scripted/base/StatementHandler.scala
rename to scripted/base/src/main/scala/xsbt/test/StatementHandler.scala
diff --git a/scripted/base/TestScriptParser.scala b/scripted/base/src/main/scala/xsbt/test/TestScriptParser.scala
similarity index 100%
rename from scripted/base/TestScriptParser.scala
rename to scripted/base/src/main/scala/xsbt/test/TestScriptParser.scala
diff --git a/scripted/plugin/ScriptedPlugin.scala b/scripted/plugin/src/main/scala/sbt/ScriptedPlugin.scala
similarity index 100%
rename from scripted/plugin/ScriptedPlugin.scala
rename to scripted/plugin/src/main/scala/sbt/ScriptedPlugin.scala
diff --git a/scripted/sbt/SbtHandler.scala b/scripted/sbt/src/main/scala/sbt/test/SbtHandler.scala
similarity index 100%
rename from scripted/sbt/SbtHandler.scala
rename to scripted/sbt/src/main/scala/sbt/test/SbtHandler.scala
diff --git a/scripted/sbt/ScriptedTests.scala b/scripted/sbt/src/main/scala/sbt/test/ScriptedTests.scala
similarity index 100%
rename from scripted/sbt/ScriptedTests.scala
rename to scripted/sbt/src/main/scala/sbt/test/ScriptedTests.scala
diff --git a/tasks/CompletionService.scala b/tasks/src/main/scala/sbt/CompletionService.scala
similarity index 100%
rename from tasks/CompletionService.scala
rename to tasks/src/main/scala/sbt/CompletionService.scala
diff --git a/tasks/ConcurrentRestrictions.scala b/tasks/src/main/scala/sbt/ConcurrentRestrictions.scala
similarity index 100%
rename from tasks/ConcurrentRestrictions.scala
rename to tasks/src/main/scala/sbt/ConcurrentRestrictions.scala
diff --git a/tasks/Execute.scala b/tasks/src/main/scala/sbt/Execute.scala
similarity index 100%
rename from tasks/Execute.scala
rename to tasks/src/main/scala/sbt/Execute.scala
diff --git a/tasks/Incomplete.scala b/tasks/src/main/scala/sbt/Incomplete.scala
similarity index 100%
rename from tasks/Incomplete.scala
rename to tasks/src/main/scala/sbt/Incomplete.scala
diff --git a/tasks/Node.scala b/tasks/src/main/scala/sbt/Node.scala
similarity index 100%
rename from tasks/Node.scala
rename to tasks/src/main/scala/sbt/Node.scala
diff --git a/tasks/Result.scala b/tasks/src/main/scala/sbt/Result.scala
similarity index 100%
rename from tasks/Result.scala
rename to tasks/src/main/scala/sbt/Result.scala
diff --git a/tasks/standard/Action.scala b/tasks/standard/src/main/scala/sbt/Action.scala
similarity index 100%
rename from tasks/standard/Action.scala
rename to tasks/standard/src/main/scala/sbt/Action.scala
diff --git a/tasks/standard/Streams.scala b/tasks/standard/src/main/scala/sbt/std/Streams.scala
similarity index 100%
rename from tasks/standard/Streams.scala
rename to tasks/standard/src/main/scala/sbt/std/Streams.scala
diff --git a/tasks/standard/System.scala b/tasks/standard/src/main/scala/sbt/std/System.scala
similarity index 100%
rename from tasks/standard/System.scala
rename to tasks/standard/src/main/scala/sbt/std/System.scala
diff --git a/tasks/standard/TaskExtra.scala b/tasks/standard/src/main/scala/sbt/std/TaskExtra.scala
similarity index 100%
rename from tasks/standard/TaskExtra.scala
rename to tasks/standard/src/main/scala/sbt/std/TaskExtra.scala
diff --git a/testing/impl/TestParser.scala b/testing/impl/src/main/scala/sbt/TestParser.scala
similarity index 100%
rename from testing/impl/TestParser.scala
rename to testing/impl/src/main/scala/sbt/TestParser.scala
diff --git a/testing/TestFramework.scala b/testing/src/main/scala/sbt/TestFramework.scala
similarity index 100%
rename from testing/TestFramework.scala
rename to testing/src/main/scala/sbt/TestFramework.scala
diff --git a/testing/TestReportListener.scala b/testing/src/main/scala/sbt/TestReportListener.scala
similarity index 100%
rename from testing/TestReportListener.scala
rename to testing/src/main/scala/sbt/TestReportListener.scala
diff --git a/testing/TestStatusReporter.scala b/testing/src/main/scala/sbt/TestStatusReporter.scala
similarity index 100%
rename from testing/TestStatusReporter.scala
rename to testing/src/main/scala/sbt/TestStatusReporter.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/classfile/Analyze.scala b/util/classfile/src/main/scala/sbt/classfile/Analyze.scala
similarity index 100%
rename from util/classfile/Analyze.scala
rename to util/classfile/src/main/scala/sbt/classfile/Analyze.scala
diff --git a/util/classfile/ClassFile.scala b/util/classfile/src/main/scala/sbt/classfile/ClassFile.scala
similarity index 100%
rename from util/classfile/ClassFile.scala
rename to util/classfile/src/main/scala/sbt/classfile/ClassFile.scala
diff --git a/util/classfile/Parser.scala b/util/classfile/src/main/scala/sbt/classfile/Parser.scala
similarity index 100%
rename from util/classfile/Parser.scala
rename to util/classfile/src/main/scala/sbt/classfile/Parser.scala
diff --git a/util/classpath/ModuleUtilities.scala b/util/classpath/src/main/scala/sbt/ModuleUtilities.scala
similarity index 100%
rename from util/classpath/ModuleUtilities.scala
rename to util/classpath/src/main/scala/sbt/ModuleUtilities.scala
diff --git a/util/classpath/ReflectUtilities.scala b/util/classpath/src/main/scala/sbt/ReflectUtilities.scala
similarity index 100%
rename from util/classpath/ReflectUtilities.scala
rename to util/classpath/src/main/scala/sbt/ReflectUtilities.scala
diff --git a/util/classpath/ScalaInstance.scala b/util/classpath/src/main/scala/sbt/ScalaInstance.scala
similarity index 100%
rename from util/classpath/ScalaInstance.scala
rename to util/classpath/src/main/scala/sbt/ScalaInstance.scala
diff --git a/util/classpath/ClassLoaderCache.scala b/util/classpath/src/main/scala/sbt/classpath/ClassLoaderCache.scala
similarity index 100%
rename from util/classpath/ClassLoaderCache.scala
rename to util/classpath/src/main/scala/sbt/classpath/ClassLoaderCache.scala
diff --git a/util/classpath/ClassLoaders.scala b/util/classpath/src/main/scala/sbt/classpath/ClassLoaders.scala
similarity index 100%
rename from util/classpath/ClassLoaders.scala
rename to util/classpath/src/main/scala/sbt/classpath/ClassLoaders.scala
diff --git a/util/classpath/ClasspathUtilities.scala b/util/classpath/src/main/scala/sbt/classpath/ClasspathUtilities.scala
similarity index 100%
rename from util/classpath/ClasspathUtilities.scala
rename to util/classpath/src/main/scala/sbt/classpath/ClasspathUtilities.scala
diff --git a/util/classpath/DualLoader.scala b/util/classpath/src/main/scala/sbt/classpath/DualLoader.scala
similarity index 100%
rename from util/classpath/DualLoader.scala
rename to util/classpath/src/main/scala/sbt/classpath/DualLoader.scala
diff --git a/util/classpath/RawURL.scala b/util/classpath/src/main/scala/sbt/classpath/RawURL.scala
similarity index 100%
rename from util/classpath/RawURL.scala
rename to util/classpath/src/main/scala/sbt/classpath/RawURL.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/datatype/DatatypeParser.scala b/util/datatype/src/main/scala/xsbt/datatype/DatatypeParser.scala
similarity index 100%
rename from util/datatype/DatatypeParser.scala
rename to util/datatype/src/main/scala/xsbt/datatype/DatatypeParser.scala
diff --git a/util/datatype/Definition.scala b/util/datatype/src/main/scala/xsbt/datatype/Definition.scala
similarity index 100%
rename from util/datatype/Definition.scala
rename to util/datatype/src/main/scala/xsbt/datatype/Definition.scala
diff --git a/util/datatype/GenerateDatatypes.scala b/util/datatype/src/main/scala/xsbt/datatype/GenerateDatatypes.scala
similarity index 100%
rename from util/datatype/GenerateDatatypes.scala
rename to util/datatype/src/main/scala/xsbt/datatype/GenerateDatatypes.scala
diff --git a/util/datatype/Generator.scala b/util/datatype/src/main/scala/xsbt/datatype/Generator.scala
similarity index 100%
rename from util/datatype/Generator.scala
rename to util/datatype/src/main/scala/xsbt/datatype/Generator.scala
diff --git a/util/datatype/Line.scala b/util/datatype/src/main/scala/xsbt/datatype/Line.scala
similarity index 100%
rename from util/datatype/Line.scala
rename to util/datatype/src/main/scala/xsbt/datatype/Line.scala
diff --git a/util/env/BasicEnvironment.scala b/util/env/src/main/scala/sbt/BasicEnvironment.scala
similarity index 100%
rename from util/env/BasicEnvironment.scala
rename to util/env/src/main/scala/sbt/BasicEnvironment.scala
diff --git a/util/env/Environment.scala b/util/env/src/main/scala/sbt/Environment.scala
similarity index 100%
rename from util/env/Environment.scala
rename to util/env/src/main/scala/sbt/Environment.scala
diff --git a/util/env/Format.scala b/util/env/src/main/scala/sbt/Format.scala
similarity index 100%
rename from util/env/Format.scala
rename to util/env/src/main/scala/sbt/Format.scala
diff --git a/util/env/LazyVar.scala b/util/env/src/main/scala/sbt/LazyVar.scala
similarity index 100%
rename from util/env/LazyVar.scala
rename to util/env/src/main/scala/sbt/LazyVar.scala
diff --git a/util/env/MapIO.scala b/util/env/src/main/scala/sbt/MapIO.scala
similarity index 100%
rename from util/env/MapIO.scala
rename to util/env/src/main/scala/sbt/MapIO.scala
diff --git a/util/env/PropertyResolution.scala b/util/env/src/main/scala/sbt/PropertyResolution.scala
similarity index 100%
rename from util/env/PropertyResolution.scala
rename to util/env/src/main/scala/sbt/PropertyResolution.scala
diff --git a/util/env/Version.scala b/util/env/src/main/scala/sbt/Version.scala
similarity index 100%
rename from util/env/Version.scala
rename to util/env/src/main/scala/sbt/Version.scala
diff --git a/util/io/DeferredWriter.scala b/util/io/src/main/scala/sbt/DeferredWriter.scala
similarity index 100%
rename from util/io/DeferredWriter.scala
rename to util/io/src/main/scala/sbt/DeferredWriter.scala
diff --git a/util/io/Hash.scala b/util/io/src/main/scala/sbt/Hash.scala
similarity index 100%
rename from util/io/Hash.scala
rename to util/io/src/main/scala/sbt/Hash.scala
diff --git a/util/io/IO.scala b/util/io/src/main/scala/sbt/IO.scala
similarity index 100%
rename from util/io/IO.scala
rename to util/io/src/main/scala/sbt/IO.scala
diff --git a/util/io/NameFilter.scala b/util/io/src/main/scala/sbt/NameFilter.scala
similarity index 100%
rename from util/io/NameFilter.scala
rename to util/io/src/main/scala/sbt/NameFilter.scala
diff --git a/util/io/Pack.scala b/util/io/src/main/scala/sbt/Pack.scala
similarity index 100%
rename from util/io/Pack.scala
rename to util/io/src/main/scala/sbt/Pack.scala
diff --git a/util/io/Path.scala b/util/io/src/main/scala/sbt/Path.scala
similarity index 100%
rename from util/io/Path.scala
rename to util/io/src/main/scala/sbt/Path.scala
diff --git a/util/io/PathMapper.scala b/util/io/src/main/scala/sbt/PathMapper.scala
similarity index 100%
rename from util/io/PathMapper.scala
rename to util/io/src/main/scala/sbt/PathMapper.scala
diff --git a/util/io/Resources.scala b/util/io/src/main/scala/sbt/Resources.scala
similarity index 100%
rename from util/io/Resources.scala
rename to util/io/src/main/scala/sbt/Resources.scala
diff --git a/util/io/RichURI.scala b/util/io/src/main/scala/sbt/RichURI.scala
similarity index 100%
rename from util/io/RichURI.scala
rename to util/io/src/main/scala/sbt/RichURI.scala
diff --git a/util/io/SourceModificationWatch.scala b/util/io/src/main/scala/sbt/SourceModificationWatch.scala
similarity index 100%
rename from util/io/SourceModificationWatch.scala
rename to util/io/src/main/scala/sbt/SourceModificationWatch.scala
diff --git a/util/io/Using.scala b/util/io/src/main/scala/sbt/Using.scala
similarity index 100%
rename from util/io/Using.scala
rename to util/io/src/main/scala/sbt/Using.scala
diff --git a/util/io/IPC.scala b/util/io/src/main/scala/xsbt/IPC.scala
similarity index 100%
rename from util/io/IPC.scala
rename to util/io/src/main/scala/xsbt/IPC.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