Follow source layout convention supported by Eclipse.

Moved source files so directory structure follow package structure. That makes it possible to use Scala Eclipse plugin with sbt's source code.
harrah · Dec 7, 2012 · ef39aeb · ef39aeb
1 parent 56dff48
commit ef39aeb
Show file tree

Hide file tree

Showing 293 changed files with 0 additions and 0 deletions.
diff --git a/cache/Cache.scala → cache/src/main/scala/sbt/Cache.scala b/cache/Cache.scala → cache/src/main/scala/sbt/Cache.scala
diff --git a/cache/CacheIO.scala → cache/src/main/scala/sbt/CacheIO.scala b/cache/CacheIO.scala → cache/src/main/scala/sbt/CacheIO.scala
diff --git a/cache/FileInfo.scala → cache/src/main/scala/sbt/FileInfo.scala b/cache/FileInfo.scala → cache/src/main/scala/sbt/FileInfo.scala
diff --git a/cache/SeparatedCache.scala → ...e/src/main/scala/sbt/SeparatedCache.scala b/cache/SeparatedCache.scala → ...e/src/main/scala/sbt/SeparatedCache.scala
diff --git a/cache/tracking/ChangeReport.scala → ...ing/src/main/scala/sbt/ChangeReport.scala b/cache/tracking/ChangeReport.scala → ...ing/src/main/scala/sbt/ChangeReport.scala
diff --git a/cache/tracking/Tracked.scala → ...tracking/src/main/scala/sbt/Tracked.scala b/cache/tracking/Tracked.scala → ...tracking/src/main/scala/sbt/Tracked.scala
diff --git a/compile/api/ClassToAPI.scala → ...e/api/src/main/scala/sbt/ClassToAPI.scala b/compile/api/ClassToAPI.scala → ...e/api/src/main/scala/sbt/ClassToAPI.scala
diff --git a/compile/api/APIUtil.scala → ...api/src/main/scala/xsbt/api/APIUtil.scala b/compile/api/APIUtil.scala → ...api/src/main/scala/xsbt/api/APIUtil.scala
diff --git a/compile/api/Discovered.scala → .../src/main/scala/xsbt/api/Discovered.scala b/compile/api/Discovered.scala → .../src/main/scala/xsbt/api/Discovered.scala
diff --git a/compile/api/Discovery.scala → ...i/src/main/scala/xsbt/api/Discovery.scala b/compile/api/Discovery.scala → ...i/src/main/scala/xsbt/api/Discovery.scala
diff --git a/compile/api/HashAPI.scala → ...api/src/main/scala/xsbt/api/HashAPI.scala b/compile/api/HashAPI.scala → ...api/src/main/scala/xsbt/api/HashAPI.scala
diff --git a/compile/api/ParseType.scala → ...i/src/main/scala/xsbt/api/ParseType.scala b/compile/api/ParseType.scala → ...i/src/main/scala/xsbt/api/ParseType.scala
diff --git a/compile/api/SameAPI.scala → ...api/src/main/scala/xsbt/api/SameAPI.scala b/compile/api/SameAPI.scala → ...api/src/main/scala/xsbt/api/SameAPI.scala
diff --git a/compile/api/ShowAPI.scala → ...api/src/main/scala/xsbt/api/ShowAPI.scala b/compile/api/ShowAPI.scala → ...api/src/main/scala/xsbt/api/ShowAPI.scala
diff --git a/compile/api/Visit.scala → ...e/api/src/main/scala/xsbt/api/Visit.scala b/compile/api/Visit.scala → ...e/api/src/main/scala/xsbt/api/Visit.scala
diff --git a/compile/api/SafeLazy.scala → ...e/api/src/main/scala/xsbti/SafeLazy.scala b/compile/api/SafeLazy.scala → ...e/api/src/main/scala/xsbti/SafeLazy.scala
diff --git a/compile/inc/CompileSetup.scala → ...inc/src/main/scala/sbt/CompileSetup.scala b/compile/inc/CompileSetup.scala → ...inc/src/main/scala/sbt/CompileSetup.scala
diff --git a/compile/inc/APIs.scala → ...ile/inc/src/main/scala/sbt/inc/APIs.scala b/compile/inc/APIs.scala → ...ile/inc/src/main/scala/sbt/inc/APIs.scala
diff --git a/compile/inc/Analysis.scala → ...inc/src/main/scala/sbt/inc/Analysis.scala b/compile/inc/Analysis.scala → ...inc/src/main/scala/sbt/inc/Analysis.scala
diff --git a/compile/inc/AnalysisStore.scala → ...rc/main/scala/sbt/inc/AnalysisStore.scala b/compile/inc/AnalysisStore.scala → ...rc/main/scala/sbt/inc/AnalysisStore.scala
diff --git a/compile/inc/Changes.scala → .../inc/src/main/scala/sbt/inc/Changes.scala b/compile/inc/Changes.scala → .../inc/src/main/scala/sbt/inc/Changes.scala
diff --git a/compile/inc/Compile.scala → .../inc/src/main/scala/sbt/inc/Compile.scala b/compile/inc/Compile.scala → .../inc/src/main/scala/sbt/inc/Compile.scala
diff --git a/compile/inc/FileValueCache.scala → ...c/main/scala/sbt/inc/FileValueCache.scala b/compile/inc/FileValueCache.scala → ...c/main/scala/sbt/inc/FileValueCache.scala
diff --git a/compile/inc/Incremental.scala → .../src/main/scala/sbt/inc/Incremental.scala b/compile/inc/Incremental.scala → .../src/main/scala/sbt/inc/Incremental.scala
diff --git a/compile/inc/Locate.scala → ...e/inc/src/main/scala/sbt/inc/Locate.scala b/compile/inc/Locate.scala → ...e/inc/src/main/scala/sbt/inc/Locate.scala
diff --git a/compile/inc/Relations.scala → ...nc/src/main/scala/sbt/inc/Relations.scala b/compile/inc/Relations.scala → ...nc/src/main/scala/sbt/inc/Relations.scala
diff --git a/compile/inc/SourceInfo.scala → ...c/src/main/scala/sbt/inc/SourceInfo.scala b/compile/inc/SourceInfo.scala → ...c/src/main/scala/sbt/inc/SourceInfo.scala
diff --git a/compile/inc/Stamp.scala → ...le/inc/src/main/scala/sbt/inc/Stamp.scala b/compile/inc/Stamp.scala → ...le/inc/src/main/scala/sbt/inc/Stamp.scala
diff --git a/compile/inc/StronglyConnected.scala → ...ain/scala/sbt/inc/StronglyConnected.scala b/compile/inc/StronglyConnected.scala → ...ain/scala/sbt/inc/StronglyConnected.scala
diff --git a/compile/integration/AggressiveCompile.scala → ...cala/sbt/compiler/AggressiveCompile.scala b/compile/integration/AggressiveCompile.scala → ...cala/sbt/compiler/AggressiveCompile.scala
diff --git a/...ile/integration/IncrementalCompiler.scala → ...la/sbt/compiler/IncrementalCompiler.scala b/...ile/integration/IncrementalCompiler.scala → ...la/sbt/compiler/IncrementalCompiler.scala
diff --git a/compile/interface/API.scala → ...e/interface/src/main/scala/xsbt/API.scala b/compile/interface/API.scala → ...e/interface/src/main/scala/xsbt/API.scala
diff --git a/compile/interface/Analyzer.scala → ...erface/src/main/scala/xsbt/Analyzer.scala b/compile/interface/Analyzer.scala → ...erface/src/main/scala/xsbt/Analyzer.scala
diff --git a/compile/interface/Command.scala → ...terface/src/main/scala/xsbt/Command.scala b/compile/interface/Command.scala → ...terface/src/main/scala/xsbt/Command.scala
diff --git a/compile/interface/CompilerInterface.scala → ...c/main/scala/xsbt/CompilerInterface.scala b/compile/interface/CompilerInterface.scala → ...c/main/scala/xsbt/CompilerInterface.scala
diff --git a/compile/interface/ConsoleInterface.scala → ...rc/main/scala/xsbt/ConsoleInterface.scala b/compile/interface/ConsoleInterface.scala → ...rc/main/scala/xsbt/ConsoleInterface.scala
diff --git a/compile/interface/DelegatingReporter.scala → .../main/scala/xsbt/DelegatingReporter.scala b/compile/interface/DelegatingReporter.scala → .../main/scala/xsbt/DelegatingReporter.scala
diff --git a/compile/interface/Log.scala → ...e/interface/src/main/scala/xsbt/Log.scala b/compile/interface/Log.scala → ...e/interface/src/main/scala/xsbt/Log.scala
diff --git a/compile/interface/Message.scala → ...terface/src/main/scala/xsbt/Message.scala b/compile/interface/Message.scala → ...terface/src/main/scala/xsbt/Message.scala
diff --git a/compile/interface/ScaladocInterface.scala → ...c/main/scala/xsbt/ScaladocInterface.scala b/compile/interface/ScaladocInterface.scala → ...c/main/scala/xsbt/ScaladocInterface.scala
diff --git a/compile/ivy/ComponentCompiler.scala → ...cala/sbt/compiler/ComponentCompiler.scala b/compile/ivy/ComponentCompiler.scala → ...cala/sbt/compiler/ComponentCompiler.scala
diff --git a/compile/persist/AnalysisFormats.scala → .../main/scala/sbt/inc/AnalysisFormats.scala b/compile/persist/AnalysisFormats.scala → .../main/scala/sbt/inc/AnalysisFormats.scala
diff --git a/compile/persist/FileBasedStore.scala → ...c/main/scala/sbt/inc/FileBasedStore.scala b/compile/persist/FileBasedStore.scala → ...c/main/scala/sbt/inc/FileBasedStore.scala
diff --git a/compile/persist/APIFormats.scala → .../src/main/scala/xsbt/api/APIFormats.scala b/compile/persist/APIFormats.scala → .../src/main/scala/xsbt/api/APIFormats.scala
diff --git a/compile/persist/SourceFormat.scala → ...rc/main/scala/xsbt/api/SourceFormat.scala b/compile/persist/SourceFormat.scala → ...rc/main/scala/xsbt/api/SourceFormat.scala
diff --git a/compile/ClasspathOptions.scala → ...src/main/scala/sbt/ClasspathOptions.scala b/compile/ClasspathOptions.scala → ...src/main/scala/sbt/ClasspathOptions.scala
diff --git a/compile/LoggerReporter.scala → ...e/src/main/scala/sbt/LoggerReporter.scala b/compile/LoggerReporter.scala → ...e/src/main/scala/sbt/LoggerReporter.scala
diff --git a/compile/AnalyzingCompiler.scala → ...cala/sbt/compiler/AnalyzingCompiler.scala b/compile/AnalyzingCompiler.scala → ...cala/sbt/compiler/AnalyzingCompiler.scala
diff --git a/compile/CompilerArguments.scala → ...cala/sbt/compiler/CompilerArguments.scala b/compile/CompilerArguments.scala → ...cala/sbt/compiler/CompilerArguments.scala
diff --git a/compile/CompilerCache.scala → ...in/scala/sbt/compiler/CompilerCache.scala b/compile/CompilerCache.scala → ...in/scala/sbt/compiler/CompilerCache.scala
diff --git a/compile/CompilerInterfaceProvider.scala → .../compiler/CompilerInterfaceProvider.scala b/compile/CompilerInterfaceProvider.scala → .../compiler/CompilerInterfaceProvider.scala
diff --git a/compile/CompilerOutput.scala → ...n/scala/sbt/compiler/CompilerOutput.scala b/compile/CompilerOutput.scala → ...n/scala/sbt/compiler/CompilerOutput.scala
diff --git a/compile/Eval.scala → ...le/src/main/scala/sbt/compiler/Eval.scala b/compile/Eval.scala → ...le/src/main/scala/sbt/compiler/Eval.scala
diff --git a/compile/JavaCompiler.scala → ...ain/scala/sbt/compiler/JavaCompiler.scala b/compile/JavaCompiler.scala → ...ain/scala/sbt/compiler/JavaCompiler.scala
diff --git a/compile/RawCompiler.scala → ...main/scala/sbt/compiler/RawCompiler.scala b/compile/RawCompiler.scala → ...main/scala/sbt/compiler/RawCompiler.scala
diff --git a/ivy/src/main/java/ResolverAdapter.java → ivy/src/main/java/sbt/ResolverAdapter.java b/ivy/src/main/java/ResolverAdapter.java → ivy/src/main/java/sbt/ResolverAdapter.java
diff --git a/ivy/ComponentManager.scala → ...src/main/scala/sbt/ComponentManager.scala b/ivy/ComponentManager.scala → ...src/main/scala/sbt/ComponentManager.scala
diff --git a/ivy/ConflictWarning.scala → ivy/src/main/scala/sbt/ConflictWarning.scala b/ivy/ConflictWarning.scala → ivy/src/main/scala/sbt/ConflictWarning.scala
diff --git a/ivy/ConvertResolver.scala → ivy/src/main/scala/sbt/ConvertResolver.scala b/ivy/ConvertResolver.scala → ivy/src/main/scala/sbt/ConvertResolver.scala
diff --git a/ivy/Credentials.scala → ivy/src/main/scala/sbt/Credentials.scala b/ivy/Credentials.scala → ivy/src/main/scala/sbt/Credentials.scala
diff --git a/ivy/CrossVersion.scala → ivy/src/main/scala/sbt/CrossVersion.scala b/ivy/CrossVersion.scala → ivy/src/main/scala/sbt/CrossVersion.scala
diff --git a/ivy/CustomPomParser.scala → ivy/src/main/scala/sbt/CustomPomParser.scala b/ivy/CustomPomParser.scala → ivy/src/main/scala/sbt/CustomPomParser.scala
diff --git a/ivy/CustomXmlParser.scala → ivy/src/main/scala/sbt/CustomXmlParser.scala b/ivy/CustomXmlParser.scala → ivy/src/main/scala/sbt/CustomXmlParser.scala
diff --git a/ivy/DependencyFilter.scala → ...src/main/scala/sbt/DependencyFilter.scala b/ivy/DependencyFilter.scala → ...src/main/scala/sbt/DependencyFilter.scala
diff --git a/ivy/Ivy.scala → ivy/src/main/scala/sbt/Ivy.scala b/ivy/Ivy.scala → ivy/src/main/scala/sbt/Ivy.scala
diff --git a/ivy/IvyActions.scala → ivy/src/main/scala/sbt/IvyActions.scala b/ivy/IvyActions.scala → ivy/src/main/scala/sbt/IvyActions.scala
diff --git a/ivy/IvyCache.scala → ivy/src/main/scala/sbt/IvyCache.scala b/ivy/IvyCache.scala → ivy/src/main/scala/sbt/IvyCache.scala
diff --git a/ivy/IvyConfigurations.scala → ...rc/main/scala/sbt/IvyConfigurations.scala b/ivy/IvyConfigurations.scala → ...rc/main/scala/sbt/IvyConfigurations.scala
diff --git a/ivy/IvyInterface.scala → ivy/src/main/scala/sbt/IvyInterface.scala b/ivy/IvyInterface.scala → ivy/src/main/scala/sbt/IvyInterface.scala
diff --git a/ivy/IvyLogger.scala → ivy/src/main/scala/sbt/IvyLogger.scala b/ivy/IvyLogger.scala → ivy/src/main/scala/sbt/IvyLogger.scala
diff --git a/ivy/IvyRetrieve.scala → ivy/src/main/scala/sbt/IvyRetrieve.scala b/ivy/IvyRetrieve.scala → ivy/src/main/scala/sbt/IvyRetrieve.scala
diff --git a/ivy/IvyScala.scala → ivy/src/main/scala/sbt/IvyScala.scala b/ivy/IvyScala.scala → ivy/src/main/scala/sbt/IvyScala.scala
diff --git a/ivy/IvyUtil.scala → ivy/src/main/scala/sbt/IvyUtil.scala b/ivy/IvyUtil.scala → ivy/src/main/scala/sbt/IvyUtil.scala
diff --git a/ivy/MakePom.scala → ivy/src/main/scala/sbt/MakePom.scala b/ivy/MakePom.scala → ivy/src/main/scala/sbt/MakePom.scala
diff --git a/ivy/ProjectResolver.scala → ivy/src/main/scala/sbt/ProjectResolver.scala b/ivy/ProjectResolver.scala → ivy/src/main/scala/sbt/ProjectResolver.scala
diff --git a/ivy/ResolutionCache.scala → ivy/src/main/scala/sbt/ResolutionCache.scala b/ivy/ResolutionCache.scala → ivy/src/main/scala/sbt/ResolutionCache.scala
diff --git a/ivy/StringUtilities.scala → ivy/src/main/scala/sbt/StringUtilities.scala b/ivy/StringUtilities.scala → ivy/src/main/scala/sbt/StringUtilities.scala
diff --git a/ivy/UpdateReport.scala → ivy/src/main/scala/sbt/UpdateReport.scala b/ivy/UpdateReport.scala → ivy/src/main/scala/sbt/UpdateReport.scala
diff --git a/ivy/DependencyBuilders.scala → ...n/scala/sbt/impl/DependencyBuilders.scala b/ivy/DependencyBuilders.scala → ...n/scala/sbt/impl/DependencyBuilders.scala
diff --git a/ivy/MergeDescriptors.scala → ...n/scala/sbt/ivyint/MergeDescriptors.scala b/ivy/MergeDescriptors.scala → ...n/scala/sbt/ivyint/MergeDescriptors.scala
diff --git a/launch/Boot.scala → launch/src/main/scala/xsbt/boot/Boot.scala b/launch/Boot.scala → launch/src/main/scala/xsbt/boot/Boot.scala
diff --git a/launch/BootConfiguration.scala → ...n/scala/xsbt/boot/BootConfiguration.scala b/launch/BootConfiguration.scala → ...n/scala/xsbt/boot/BootConfiguration.scala
diff --git a/launch/Cache.scala → launch/src/main/scala/xsbt/boot/Cache.scala b/launch/Cache.scala → launch/src/main/scala/xsbt/boot/Cache.scala
diff --git a/launch/CheckProxy.scala → ...src/main/scala/xsbt/boot/CheckProxy.scala b/launch/CheckProxy.scala → ...src/main/scala/xsbt/boot/CheckProxy.scala
diff --git a/launch/Configuration.scala → .../main/scala/xsbt/boot/Configuration.scala b/launch/Configuration.scala → .../main/scala/xsbt/boot/Configuration.scala
diff --git a/launch/ConfigurationParser.scala → ...scala/xsbt/boot/ConfigurationParser.scala b/launch/ConfigurationParser.scala → ...scala/xsbt/boot/ConfigurationParser.scala
diff --git a/launch/Create.scala → launch/src/main/scala/xsbt/boot/Create.scala b/launch/Create.scala → launch/src/main/scala/xsbt/boot/Create.scala
diff --git a/launch/Enumeration.scala → ...rc/main/scala/xsbt/boot/Enumeration.scala b/launch/Enumeration.scala → ...rc/main/scala/xsbt/boot/Enumeration.scala
diff --git a/launch/Exceptions.scala → ...src/main/scala/xsbt/boot/Exceptions.scala b/launch/Exceptions.scala → ...src/main/scala/xsbt/boot/Exceptions.scala
diff --git a/launch/FilteredLoader.scala → ...main/scala/xsbt/boot/FilteredLoader.scala b/launch/FilteredLoader.scala → ...main/scala/xsbt/boot/FilteredLoader.scala
diff --git a/launch/Find.scala → launch/src/main/scala/xsbt/boot/Find.scala b/launch/Find.scala → launch/src/main/scala/xsbt/boot/Find.scala
diff --git a/launch/Launch.scala → launch/src/main/scala/xsbt/boot/Launch.scala b/launch/Launch.scala → launch/src/main/scala/xsbt/boot/Launch.scala
diff --git a/launch/LaunchConfiguration.scala → ...scala/xsbt/boot/LaunchConfiguration.scala b/launch/LaunchConfiguration.scala → ...scala/xsbt/boot/LaunchConfiguration.scala
diff --git a/launch/ListMap.scala → ...ch/src/main/scala/xsbt/boot/ListMap.scala b/launch/ListMap.scala → ...ch/src/main/scala/xsbt/boot/ListMap.scala
diff --git a/launch/Locks.scala → launch/src/main/scala/xsbt/boot/Locks.scala b/launch/Locks.scala → launch/src/main/scala/xsbt/boot/Locks.scala
diff --git a/launch/ModuleDefinition.scala → ...in/scala/xsbt/boot/ModuleDefinition.scala b/launch/ModuleDefinition.scala → ...in/scala/xsbt/boot/ModuleDefinition.scala
diff --git a/launch/Pre.scala → launch/src/main/scala/xsbt/boot/Pre.scala b/launch/Pre.scala → launch/src/main/scala/xsbt/boot/Pre.scala
diff --git a/launch/ResolveValues.scala → .../main/scala/xsbt/boot/ResolveValues.scala b/launch/ResolveValues.scala → .../main/scala/xsbt/boot/ResolveValues.scala
diff --git a/launch/SimpleReader.scala → ...c/main/scala/xsbt/boot/SimpleReader.scala b/launch/SimpleReader.scala → ...c/main/scala/xsbt/boot/SimpleReader.scala
diff --git a/launch/Update.scala → launch/src/main/scala/xsbt/boot/Update.scala b/launch/Update.scala → launch/src/main/scala/xsbt/boot/Update.scala
diff --git a/launch/Using.scala → launch/src/main/scala/xsbt/boot/Using.scala b/launch/Using.scala → launch/src/main/scala/xsbt/boot/Using.scala
diff --git a/launch/test-sample/Apps.scala → .../src/main/scala/xsbt/boot/test/Apps.scala b/launch/test-sample/Apps.scala → .../src/main/scala/xsbt/boot/test/Apps.scala
diff --git a/main/actions/CacheIvy.scala → ...actions/src/main/scala/sbt/CacheIvy.scala b/main/actions/CacheIvy.scala → ...actions/src/main/scala/sbt/CacheIvy.scala
diff --git a/main/actions/Compiler.scala → ...actions/src/main/scala/sbt/Compiler.scala b/main/actions/Compiler.scala → ...actions/src/main/scala/sbt/Compiler.scala
diff --git a/main/actions/Console.scala → .../actions/src/main/scala/sbt/Console.scala b/main/actions/Console.scala → .../actions/src/main/scala/sbt/Console.scala
diff --git a/main/actions/Doc.scala → main/actions/src/main/scala/sbt/Doc.scala b/main/actions/Doc.scala → main/actions/src/main/scala/sbt/Doc.scala
diff --git a/main/actions/DotGraph.scala → ...actions/src/main/scala/sbt/DotGraph.scala b/main/actions/DotGraph.scala → ...actions/src/main/scala/sbt/DotGraph.scala
diff --git a/main/actions/ForkTests.scala → ...ctions/src/main/scala/sbt/ForkTests.scala b/main/actions/ForkTests.scala → ...ctions/src/main/scala/sbt/ForkTests.scala
diff --git a/main/actions/Package.scala → .../actions/src/main/scala/sbt/Package.scala b/main/actions/Package.scala → .../actions/src/main/scala/sbt/Package.scala
diff --git a/main/actions/RawCompileLike.scala → ...s/src/main/scala/sbt/RawCompileLike.scala b/main/actions/RawCompileLike.scala → ...s/src/main/scala/sbt/RawCompileLike.scala
diff --git a/main/actions/Sync.scala → main/actions/src/main/scala/sbt/Sync.scala b/main/actions/Sync.scala → main/actions/src/main/scala/sbt/Sync.scala
diff --git a/main/actions/Tests.scala → main/actions/src/main/scala/sbt/Tests.scala b/main/actions/Tests.scala → main/actions/src/main/scala/sbt/Tests.scala
diff --git a/main/command/BasicCommandStrings.scala → .../main/scala/sbt/BasicCommandStrings.scala b/main/command/BasicCommandStrings.scala → .../main/scala/sbt/BasicCommandStrings.scala
diff --git a/main/command/BasicCommands.scala → ...nd/src/main/scala/sbt/BasicCommands.scala b/main/command/BasicCommands.scala → ...nd/src/main/scala/sbt/BasicCommands.scala
diff --git a/main/command/BasicKeys.scala → ...ommand/src/main/scala/sbt/BasicKeys.scala b/main/command/BasicKeys.scala → ...ommand/src/main/scala/sbt/BasicKeys.scala
diff --git a/main/command/Command.scala → .../command/src/main/scala/sbt/Command.scala b/main/command/Command.scala → .../command/src/main/scala/sbt/Command.scala
diff --git a/main/command/CommandUtil.scala → ...mand/src/main/scala/sbt/CommandUtil.scala b/main/command/CommandUtil.scala → ...mand/src/main/scala/sbt/CommandUtil.scala
diff --git a/main/command/ExceptionCategory.scala → ...rc/main/scala/sbt/ExceptionCategory.scala b/main/command/ExceptionCategory.scala → ...rc/main/scala/sbt/ExceptionCategory.scala
diff --git a/main/command/Highlight.scala → ...ommand/src/main/scala/sbt/Highlight.scala b/main/command/Highlight.scala → ...ommand/src/main/scala/sbt/Highlight.scala
diff --git a/main/command/MainControl.scala → ...mand/src/main/scala/sbt/MainControl.scala b/main/command/MainControl.scala → ...mand/src/main/scala/sbt/MainControl.scala
diff --git a/main/command/MainLoop.scala → ...command/src/main/scala/sbt/MainLoop.scala b/main/command/MainLoop.scala → ...command/src/main/scala/sbt/MainLoop.scala
diff --git a/main/command/State.scala → main/command/src/main/scala/sbt/State.scala b/main/command/State.scala → main/command/src/main/scala/sbt/State.scala
diff --git a/main/command/Watched.scala → .../command/src/main/scala/sbt/Watched.scala b/main/command/Watched.scala → .../command/src/main/scala/sbt/Watched.scala
diff --git a/main/settings/Append.scala → .../settings/src/main/scala/sbt/Append.scala b/main/settings/Append.scala → .../settings/src/main/scala/sbt/Append.scala
diff --git a/main/settings/ConfigKey.scala → ...ttings/src/main/scala/sbt/ConfigKey.scala b/main/settings/ConfigKey.scala → ...ttings/src/main/scala/sbt/ConfigKey.scala
diff --git a/main/settings/Def.scala → main/settings/src/main/scala/sbt/Def.scala b/main/settings/Def.scala → main/settings/src/main/scala/sbt/Def.scala
diff --git a/main/settings/DelegateIndex.scala → ...gs/src/main/scala/sbt/DelegateIndex.scala b/main/settings/DelegateIndex.scala → ...gs/src/main/scala/sbt/DelegateIndex.scala
diff --git a/main/settings/InputTask.scala → ...ttings/src/main/scala/sbt/InputTask.scala b/main/settings/InputTask.scala → ...ttings/src/main/scala/sbt/InputTask.scala
diff --git a/main/settings/KeyRanks.scala → ...ettings/src/main/scala/sbt/KeyRanks.scala b/main/settings/KeyRanks.scala → ...ettings/src/main/scala/sbt/KeyRanks.scala
diff --git a/main/settings/Reference.scala → ...ttings/src/main/scala/sbt/Reference.scala b/main/settings/Reference.scala → ...ttings/src/main/scala/sbt/Reference.scala
diff --git a/main/settings/Scope.scala → main/settings/src/main/scala/sbt/Scope.scala b/main/settings/Scope.scala → main/settings/src/main/scala/sbt/Scope.scala
diff --git a/main/settings/ScopeAxis.scala → ...ttings/src/main/scala/sbt/ScopeAxis.scala b/main/settings/ScopeAxis.scala → ...ttings/src/main/scala/sbt/ScopeAxis.scala
diff --git a/main/settings/ScopeMask.scala → ...ttings/src/main/scala/sbt/ScopeMask.scala b/main/settings/ScopeMask.scala → ...ttings/src/main/scala/sbt/ScopeMask.scala
diff --git a/main/settings/Structure.scala → ...ttings/src/main/scala/sbt/Structure.scala b/main/settings/Structure.scala → ...ttings/src/main/scala/sbt/Structure.scala
diff --git a/main/settings/KeyMacro.scala → ...ngs/src/main/scala/sbt/std/KeyMacro.scala b/main/settings/KeyMacro.scala → ...ngs/src/main/scala/sbt/std/KeyMacro.scala
diff --git a/main/settings/SettingMacro.scala → ...src/main/scala/sbt/std/SettingMacro.scala b/main/settings/SettingMacro.scala → ...src/main/scala/sbt/std/SettingMacro.scala
diff --git a/main/settings/TaskMacro.scala → ...gs/src/main/scala/sbt/std/TaskMacro.scala b/main/settings/TaskMacro.scala → ...gs/src/main/scala/sbt/std/TaskMacro.scala
diff --git a/main/Act.scala → main/src/main/scala/sbt/Act.scala b/main/Act.scala → main/src/main/scala/sbt/Act.scala
diff --git a/main/AddSettings.scala → main/src/main/scala/sbt/AddSettings.scala b/main/AddSettings.scala → main/src/main/scala/sbt/AddSettings.scala
diff --git a/main/Aggregation.scala → main/src/main/scala/sbt/Aggregation.scala b/main/Aggregation.scala → main/src/main/scala/sbt/Aggregation.scala
diff --git a/main/Build.scala → main/src/main/scala/sbt/Build.scala b/main/Build.scala → main/src/main/scala/sbt/Build.scala
diff --git a/main/BuildDependencies.scala → ...rc/main/scala/sbt/BuildDependencies.scala b/main/BuildDependencies.scala → ...rc/main/scala/sbt/BuildDependencies.scala
diff --git a/main/BuildLoader.scala → main/src/main/scala/sbt/BuildLoader.scala b/main/BuildLoader.scala → main/src/main/scala/sbt/BuildLoader.scala
diff --git a/main/BuildPaths.scala → main/src/main/scala/sbt/BuildPaths.scala b/main/BuildPaths.scala → main/src/main/scala/sbt/BuildPaths.scala
diff --git a/main/BuildStructure.scala → main/src/main/scala/sbt/BuildStructure.scala b/main/BuildStructure.scala → main/src/main/scala/sbt/BuildStructure.scala
diff --git a/main/BuildUtil.scala → main/src/main/scala/sbt/BuildUtil.scala b/main/BuildUtil.scala → main/src/main/scala/sbt/BuildUtil.scala
diff --git a/main/CommandStrings.scala → main/src/main/scala/sbt/CommandStrings.scala b/main/CommandStrings.scala → main/src/main/scala/sbt/CommandStrings.scala
diff --git a/main/ConsoleProject.scala → main/src/main/scala/sbt/ConsoleProject.scala b/main/ConsoleProject.scala → main/src/main/scala/sbt/ConsoleProject.scala
diff --git a/main/Cross.scala → main/src/main/scala/sbt/Cross.scala b/main/Cross.scala → main/src/main/scala/sbt/Cross.scala
diff --git a/main/Defaults.scala → main/src/main/scala/sbt/Defaults.scala b/main/Defaults.scala → main/src/main/scala/sbt/Defaults.scala
diff --git a/main/EvaluateConfigurations.scala → ...in/scala/sbt/EvaluateConfigurations.scala b/main/EvaluateConfigurations.scala → ...in/scala/sbt/EvaluateConfigurations.scala
diff --git a/main/EvaluateTask.scala → main/src/main/scala/sbt/EvaluateTask.scala b/main/EvaluateTask.scala → main/src/main/scala/sbt/EvaluateTask.scala
diff --git a/main/Extracted.scala → main/src/main/scala/sbt/Extracted.scala b/main/Extracted.scala → main/src/main/scala/sbt/Extracted.scala
diff --git a/main/GlobalPlugin.scala → main/src/main/scala/sbt/GlobalPlugin.scala b/main/GlobalPlugin.scala → main/src/main/scala/sbt/GlobalPlugin.scala
diff --git a/main/IvyConsole.scala → main/src/main/scala/sbt/IvyConsole.scala b/main/IvyConsole.scala → main/src/main/scala/sbt/IvyConsole.scala
diff --git a/main/KeyIndex.scala → main/src/main/scala/sbt/KeyIndex.scala b/main/KeyIndex.scala → main/src/main/scala/sbt/KeyIndex.scala
diff --git a/main/Keys.scala → main/src/main/scala/sbt/Keys.scala b/main/Keys.scala → main/src/main/scala/sbt/Keys.scala
diff --git a/main/Load.scala → main/src/main/scala/sbt/Load.scala b/main/Load.scala → main/src/main/scala/sbt/Load.scala
diff --git a/main/LogManager.scala → main/src/main/scala/sbt/LogManager.scala b/main/LogManager.scala → main/src/main/scala/sbt/LogManager.scala
diff --git a/main/Main.scala → main/src/main/scala/sbt/Main.scala b/main/Main.scala → main/src/main/scala/sbt/Main.scala
diff --git a/main/Opts.scala → main/src/main/scala/sbt/Opts.scala b/main/Opts.scala → main/src/main/scala/sbt/Opts.scala
diff --git a/main/Output.scala → main/src/main/scala/sbt/Output.scala b/main/Output.scala → main/src/main/scala/sbt/Output.scala
diff --git a/main/PluginManagement.scala → ...src/main/scala/sbt/PluginManagement.scala b/main/PluginManagement.scala → ...src/main/scala/sbt/PluginManagement.scala
diff --git a/main/Project.scala → main/src/main/scala/sbt/Project.scala b/main/Project.scala → main/src/main/scala/sbt/Project.scala
diff --git a/main/ProjectNavigation.scala → ...rc/main/scala/sbt/ProjectNavigation.scala b/main/ProjectNavigation.scala → ...rc/main/scala/sbt/ProjectNavigation.scala
diff --git a/main/Resolve.scala → main/src/main/scala/sbt/Resolve.scala b/main/Resolve.scala → main/src/main/scala/sbt/Resolve.scala
diff --git a/main/Resolvers.scala → main/src/main/scala/sbt/Resolvers.scala b/main/Resolvers.scala → main/src/main/scala/sbt/Resolvers.scala
diff --git a/main/RetrieveUnit.scala → main/src/main/scala/sbt/RetrieveUnit.scala b/main/RetrieveUnit.scala → main/src/main/scala/sbt/RetrieveUnit.scala
diff --git a/main/ScopedKeyData.scala → main/src/main/scala/sbt/ScopedKeyData.scala b/main/ScopedKeyData.scala → main/src/main/scala/sbt/ScopedKeyData.scala
diff --git a/main/Script.scala → main/src/main/scala/sbt/Script.scala b/main/Script.scala → main/src/main/scala/sbt/Script.scala
diff --git a/main/SessionSettings.scala → .../src/main/scala/sbt/SessionSettings.scala b/main/SessionSettings.scala → .../src/main/scala/sbt/SessionSettings.scala
diff --git a/main/SessionVar.scala → main/src/main/scala/sbt/SessionVar.scala b/main/SessionVar.scala → main/src/main/scala/sbt/SessionVar.scala
diff --git a/main/SettingCompletions.scala → ...c/main/scala/sbt/SettingCompletions.scala b/main/SettingCompletions.scala → ...c/main/scala/sbt/SettingCompletions.scala
diff --git a/main/SettingGraph.scala → main/src/main/scala/sbt/SettingGraph.scala b/main/SettingGraph.scala → main/src/main/scala/sbt/SettingGraph.scala
diff --git a/main/Tags.scala → main/src/main/scala/sbt/Tags.scala b/main/Tags.scala → main/src/main/scala/sbt/Tags.scala
diff --git a/run/Fork.scala → run/src/main/scala/sbt/Fork.scala b/run/Fork.scala → run/src/main/scala/sbt/Fork.scala
diff --git a/run/Run.scala → run/src/main/scala/sbt/Run.scala b/run/Run.scala → run/src/main/scala/sbt/Run.scala
diff --git a/run/SelectMainClass.scala → run/src/main/scala/sbt/SelectMainClass.scala b/run/SelectMainClass.scala → run/src/main/scala/sbt/SelectMainClass.scala
diff --git a/run/TrapExit.scala → run/src/main/scala/sbt/TrapExit.scala b/run/TrapExit.scala → run/src/main/scala/sbt/TrapExit.scala
diff --git a/sbt/package.scala → sbt/src/main/scala/object/package.scala b/sbt/package.scala → sbt/src/main/scala/object/package.scala
diff --git a/scripted/base/CommentHandler.scala → ...main/scala/xsbt/test/CommentHandler.scala b/scripted/base/CommentHandler.scala → ...main/scala/xsbt/test/CommentHandler.scala
diff --git a/scripted/base/FileCommands.scala → ...c/main/scala/xsbt/test/FileCommands.scala b/scripted/base/FileCommands.scala → ...c/main/scala/xsbt/test/FileCommands.scala
diff --git a/scripted/base/FilteredLoader.scala → ...main/scala/xsbt/test/FilteredLoader.scala b/scripted/base/FilteredLoader.scala → ...main/scala/xsbt/test/FilteredLoader.scala
diff --git a/scripted/base/ScriptRunner.scala → ...c/main/scala/xsbt/test/ScriptRunner.scala b/scripted/base/ScriptRunner.scala → ...c/main/scala/xsbt/test/ScriptRunner.scala
diff --git a/scripted/base/StatementHandler.scala → ...in/scala/xsbt/test/StatementHandler.scala b/scripted/base/StatementHandler.scala → ...in/scala/xsbt/test/StatementHandler.scala
diff --git a/scripted/base/TestScriptParser.scala → ...in/scala/xsbt/test/TestScriptParser.scala b/scripted/base/TestScriptParser.scala → ...in/scala/xsbt/test/TestScriptParser.scala
diff --git a/scripted/plugin/ScriptedPlugin.scala → ...n/src/main/scala/sbt/ScriptedPlugin.scala b/scripted/plugin/ScriptedPlugin.scala → ...n/src/main/scala/sbt/ScriptedPlugin.scala
diff --git a/scripted/sbt/SbtHandler.scala → .../src/main/scala/sbt/test/SbtHandler.scala b/scripted/sbt/SbtHandler.scala → .../src/main/scala/sbt/test/SbtHandler.scala
diff --git a/scripted/sbt/ScriptedTests.scala → ...c/main/scala/sbt/test/ScriptedTests.scala b/scripted/sbt/ScriptedTests.scala → ...c/main/scala/sbt/test/ScriptedTests.scala
diff --git a/tasks/CompletionService.scala → ...rc/main/scala/sbt/CompletionService.scala b/tasks/CompletionService.scala → ...rc/main/scala/sbt/CompletionService.scala
diff --git a/tasks/ConcurrentRestrictions.scala → ...in/scala/sbt/ConcurrentRestrictions.scala b/tasks/ConcurrentRestrictions.scala → ...in/scala/sbt/ConcurrentRestrictions.scala
diff --git a/tasks/Execute.scala → tasks/src/main/scala/sbt/Execute.scala b/tasks/Execute.scala → tasks/src/main/scala/sbt/Execute.scala
diff --git a/tasks/Incomplete.scala → tasks/src/main/scala/sbt/Incomplete.scala b/tasks/Incomplete.scala → tasks/src/main/scala/sbt/Incomplete.scala
diff --git a/tasks/Node.scala → tasks/src/main/scala/sbt/Node.scala b/tasks/Node.scala → tasks/src/main/scala/sbt/Node.scala
diff --git a/tasks/Result.scala → tasks/src/main/scala/sbt/Result.scala b/tasks/Result.scala → tasks/src/main/scala/sbt/Result.scala
diff --git a/tasks/standard/Action.scala → .../standard/src/main/scala/sbt/Action.scala b/tasks/standard/Action.scala → .../standard/src/main/scala/sbt/Action.scala
diff --git a/tasks/standard/Streams.scala → ...dard/src/main/scala/sbt/std/Streams.scala b/tasks/standard/Streams.scala → ...dard/src/main/scala/sbt/std/Streams.scala
diff --git a/tasks/standard/System.scala → ...ndard/src/main/scala/sbt/std/System.scala b/tasks/standard/System.scala → ...ndard/src/main/scala/sbt/std/System.scala
diff --git a/tasks/standard/TaskExtra.scala → ...rd/src/main/scala/sbt/std/TaskExtra.scala b/tasks/standard/TaskExtra.scala → ...rd/src/main/scala/sbt/std/TaskExtra.scala
diff --git a/testing/impl/TestParser.scala → .../impl/src/main/scala/sbt/TestParser.scala b/testing/impl/TestParser.scala → .../impl/src/main/scala/sbt/TestParser.scala
diff --git a/testing/TestFramework.scala → ...ng/src/main/scala/sbt/TestFramework.scala b/testing/TestFramework.scala → ...ng/src/main/scala/sbt/TestFramework.scala
diff --git a/testing/TestReportListener.scala → ...c/main/scala/sbt/TestReportListener.scala b/testing/TestReportListener.scala → ...c/main/scala/sbt/TestReportListener.scala
diff --git a/testing/TestStatusReporter.scala → ...c/main/scala/sbt/TestStatusReporter.scala b/testing/TestStatusReporter.scala → ...c/main/scala/sbt/TestStatusReporter.scala
diff --git a/util/appmacro/ContextUtil.scala → ...main/scala/sbt/appmacro/ContextUtil.scala b/util/appmacro/ContextUtil.scala → ...main/scala/sbt/appmacro/ContextUtil.scala
diff --git a/util/appmacro/Instance.scala → ...rc/main/scala/sbt/appmacro/Instance.scala b/util/appmacro/Instance.scala → ...rc/main/scala/sbt/appmacro/Instance.scala
diff --git a/util/appmacro/KListBuilder.scala → ...ain/scala/sbt/appmacro/KListBuilder.scala b/util/appmacro/KListBuilder.scala → ...ain/scala/sbt/appmacro/KListBuilder.scala
diff --git a/util/appmacro/MixedBuilder.scala → ...ain/scala/sbt/appmacro/MixedBuilder.scala b/util/appmacro/MixedBuilder.scala → ...ain/scala/sbt/appmacro/MixedBuilder.scala
diff --git a/util/appmacro/TupleBuilder.scala → ...ain/scala/sbt/appmacro/TupleBuilder.scala b/util/appmacro/TupleBuilder.scala → ...ain/scala/sbt/appmacro/TupleBuilder.scala
diff --git a/util/appmacro/TupleNBuilder.scala → ...in/scala/sbt/appmacro/TupleNBuilder.scala b/util/appmacro/TupleNBuilder.scala → ...in/scala/sbt/appmacro/TupleNBuilder.scala
diff --git a/util/classfile/Analyze.scala → ...rc/main/scala/sbt/classfile/Analyze.scala b/util/classfile/Analyze.scala → ...rc/main/scala/sbt/classfile/Analyze.scala
diff --git a/util/classfile/ClassFile.scala → .../main/scala/sbt/classfile/ClassFile.scala b/util/classfile/ClassFile.scala → .../main/scala/sbt/classfile/ClassFile.scala
diff --git a/util/classfile/Parser.scala → ...src/main/scala/sbt/classfile/Parser.scala b/util/classfile/Parser.scala → ...src/main/scala/sbt/classfile/Parser.scala
diff --git a/util/classpath/ModuleUtilities.scala → .../src/main/scala/sbt/ModuleUtilities.scala b/util/classpath/ModuleUtilities.scala → .../src/main/scala/sbt/ModuleUtilities.scala
diff --git a/util/classpath/ReflectUtilities.scala → ...src/main/scala/sbt/ReflectUtilities.scala b/util/classpath/ReflectUtilities.scala → ...src/main/scala/sbt/ReflectUtilities.scala
diff --git a/util/classpath/ScalaInstance.scala → ...th/src/main/scala/sbt/ScalaInstance.scala b/util/classpath/ScalaInstance.scala → ...th/src/main/scala/sbt/ScalaInstance.scala
diff --git a/util/classpath/ClassLoaderCache.scala → ...cala/sbt/classpath/ClassLoaderCache.scala b/util/classpath/ClassLoaderCache.scala → ...cala/sbt/classpath/ClassLoaderCache.scala
diff --git a/util/classpath/ClassLoaders.scala → ...in/scala/sbt/classpath/ClassLoaders.scala b/util/classpath/ClassLoaders.scala → ...in/scala/sbt/classpath/ClassLoaders.scala
diff --git a/util/classpath/ClasspathUtilities.scala → ...la/sbt/classpath/ClasspathUtilities.scala b/util/classpath/ClasspathUtilities.scala → ...la/sbt/classpath/ClasspathUtilities.scala
diff --git a/util/classpath/DualLoader.scala → ...main/scala/sbt/classpath/DualLoader.scala b/util/classpath/DualLoader.scala → ...main/scala/sbt/classpath/DualLoader.scala
diff --git a/util/classpath/RawURL.scala → ...src/main/scala/sbt/classpath/RawURL.scala b/util/classpath/RawURL.scala → ...src/main/scala/sbt/classpath/RawURL.scala
diff --git a/util/collection/AList.scala → ...collection/src/main/scala/sbt/AList.scala b/util/collection/AList.scala → ...collection/src/main/scala/sbt/AList.scala
diff --git a/util/collection/Attributes.scala → ...ction/src/main/scala/sbt/Attributes.scala b/util/collection/Attributes.scala → ...ction/src/main/scala/sbt/Attributes.scala
diff --git a/util/collection/Classes.scala → ...llection/src/main/scala/sbt/Classes.scala b/util/collection/Classes.scala → ...llection/src/main/scala/sbt/Classes.scala
diff --git a/util/collection/Dag.scala → util/collection/src/main/scala/sbt/Dag.scala b/util/collection/Dag.scala → util/collection/src/main/scala/sbt/Dag.scala
diff --git a/util/collection/HList.scala → ...collection/src/main/scala/sbt/HList.scala b/util/collection/HList.scala → ...collection/src/main/scala/sbt/HList.scala
diff --git a/util/collection/IDSet.scala → ...collection/src/main/scala/sbt/IDSet.scala b/util/collection/IDSet.scala → ...collection/src/main/scala/sbt/IDSet.scala
diff --git a/util/collection/INode.scala → ...collection/src/main/scala/sbt/INode.scala b/util/collection/INode.scala → ...collection/src/main/scala/sbt/INode.scala
diff --git a/util/collection/KList.scala → ...collection/src/main/scala/sbt/KList.scala b/util/collection/KList.scala → ...collection/src/main/scala/sbt/KList.scala
diff --git a/util/collection/PMap.scala → .../collection/src/main/scala/sbt/PMap.scala b/util/collection/PMap.scala → .../collection/src/main/scala/sbt/PMap.scala
diff --git a/util/collection/Param.scala → ...collection/src/main/scala/sbt/Param.scala b/util/collection/Param.scala → ...collection/src/main/scala/sbt/Param.scala
diff --git a/util/collection/Positions.scala → ...ection/src/main/scala/sbt/Positions.scala b/util/collection/Positions.scala → ...ection/src/main/scala/sbt/Positions.scala
diff --git a/util/collection/Settings.scala → ...lection/src/main/scala/sbt/Settings.scala b/util/collection/Settings.scala → ...lection/src/main/scala/sbt/Settings.scala
diff --git a/util/collection/Show.scala → .../collection/src/main/scala/sbt/Show.scala b/util/collection/Show.scala → .../collection/src/main/scala/sbt/Show.scala
diff --git a/util/collection/Signal.scala → ...ollection/src/main/scala/sbt/Signal.scala b/util/collection/Signal.scala → ...ollection/src/main/scala/sbt/Signal.scala
diff --git a/util/collection/TypeFunctions.scala → ...on/src/main/scala/sbt/TypeFunctions.scala b/util/collection/TypeFunctions.scala → ...on/src/main/scala/sbt/TypeFunctions.scala
diff --git a/util/collection/Types.scala → ...collection/src/main/scala/sbt/Types.scala b/util/collection/Types.scala → ...collection/src/main/scala/sbt/Types.scala
diff --git a/util/collection/Util.scala → .../collection/src/main/scala/sbt/Util.scala b/util/collection/Util.scala → .../collection/src/main/scala/sbt/Util.scala
diff --git a/util/complete/LineReader.scala → ...plete/src/main/scala/sbt/LineReader.scala b/util/complete/LineReader.scala → ...plete/src/main/scala/sbt/LineReader.scala
diff --git a/util/complete/Completions.scala → ...main/scala/sbt/complete/Completions.scala b/util/complete/Completions.scala → ...main/scala/sbt/complete/Completions.scala
diff --git a/util/complete/EditDistance.scala → ...ain/scala/sbt/complete/EditDistance.scala b/util/complete/EditDistance.scala → ...ain/scala/sbt/complete/EditDistance.scala
diff --git a/util/complete/History.scala → ...src/main/scala/sbt/complete/History.scala b/util/complete/History.scala → ...src/main/scala/sbt/complete/History.scala
diff --git a/util/complete/HistoryCommands.scala → .../scala/sbt/complete/HistoryCommands.scala b/util/complete/HistoryCommands.scala → .../scala/sbt/complete/HistoryCommands.scala
diff --git a/util/complete/JLineCompletion.scala → .../scala/sbt/complete/JLineCompletion.scala b/util/complete/JLineCompletion.scala → .../scala/sbt/complete/JLineCompletion.scala
diff --git a/util/complete/Parser.scala → .../src/main/scala/sbt/complete/Parser.scala b/util/complete/Parser.scala → .../src/main/scala/sbt/complete/Parser.scala
diff --git a/util/complete/Parsers.scala → ...src/main/scala/sbt/complete/Parsers.scala b/util/complete/Parsers.scala → ...src/main/scala/sbt/complete/Parsers.scala
diff --git a/util/complete/ProcessError.scala → ...ain/scala/sbt/complete/ProcessError.scala b/util/complete/ProcessError.scala → ...ain/scala/sbt/complete/ProcessError.scala
diff --git a/util/complete/TokenCompletions.scala → ...scala/sbt/complete/TokenCompletions.scala b/util/complete/TokenCompletions.scala → ...scala/sbt/complete/TokenCompletions.scala
diff --git a/util/complete/TypeString.scala → .../main/scala/sbt/complete/TypeString.scala b/util/complete/TypeString.scala → .../main/scala/sbt/complete/TypeString.scala
diff --git a/util/complete/UpperBound.scala → .../main/scala/sbt/complete/UpperBound.scala b/util/complete/UpperBound.scala → .../main/scala/sbt/complete/UpperBound.scala
diff --git a/util/control/ErrorHandling.scala → ...ol/src/main/scala/sbt/ErrorHandling.scala b/util/control/ErrorHandling.scala → ...ol/src/main/scala/sbt/ErrorHandling.scala
diff --git a/util/control/ExitHook.scala → ...control/src/main/scala/sbt/ExitHook.scala b/util/control/ExitHook.scala → ...control/src/main/scala/sbt/ExitHook.scala
diff --git a/util/control/MessageOnlyException.scala → ...main/scala/sbt/MessageOnlyException.scala b/util/control/MessageOnlyException.scala → ...main/scala/sbt/MessageOnlyException.scala
diff --git a/util/datatype/DatatypeParser.scala → .../scala/xsbt/datatype/DatatypeParser.scala b/util/datatype/DatatypeParser.scala → .../scala/xsbt/datatype/DatatypeParser.scala
diff --git a/util/datatype/Definition.scala → ...main/scala/xsbt/datatype/Definition.scala b/util/datatype/Definition.scala → ...main/scala/xsbt/datatype/Definition.scala
diff --git a/util/datatype/GenerateDatatypes.scala → ...ala/xsbt/datatype/GenerateDatatypes.scala b/util/datatype/GenerateDatatypes.scala → ...ala/xsbt/datatype/GenerateDatatypes.scala
diff --git a/util/datatype/Generator.scala → .../main/scala/xsbt/datatype/Generator.scala b/util/datatype/Generator.scala → .../main/scala/xsbt/datatype/Generator.scala
diff --git a/util/datatype/Line.scala → ...e/src/main/scala/xsbt/datatype/Line.scala b/util/datatype/Line.scala → ...e/src/main/scala/xsbt/datatype/Line.scala
diff --git a/util/env/BasicEnvironment.scala → ...src/main/scala/sbt/BasicEnvironment.scala b/util/env/BasicEnvironment.scala → ...src/main/scala/sbt/BasicEnvironment.scala
diff --git a/util/env/Environment.scala → .../env/src/main/scala/sbt/Environment.scala b/util/env/Environment.scala → .../env/src/main/scala/sbt/Environment.scala
diff --git a/util/env/Format.scala → util/env/src/main/scala/sbt/Format.scala b/util/env/Format.scala → util/env/src/main/scala/sbt/Format.scala
diff --git a/util/env/LazyVar.scala → util/env/src/main/scala/sbt/LazyVar.scala b/util/env/LazyVar.scala → util/env/src/main/scala/sbt/LazyVar.scala
diff --git a/util/env/MapIO.scala → util/env/src/main/scala/sbt/MapIO.scala b/util/env/MapIO.scala → util/env/src/main/scala/sbt/MapIO.scala
diff --git a/util/env/PropertyResolution.scala → ...c/main/scala/sbt/PropertyResolution.scala b/util/env/PropertyResolution.scala → ...c/main/scala/sbt/PropertyResolution.scala
diff --git a/util/env/Version.scala → util/env/src/main/scala/sbt/Version.scala b/util/env/Version.scala → util/env/src/main/scala/sbt/Version.scala
diff --git a/util/io/DeferredWriter.scala → ...o/src/main/scala/sbt/DeferredWriter.scala b/util/io/DeferredWriter.scala → ...o/src/main/scala/sbt/DeferredWriter.scala
diff --git a/util/io/Hash.scala → util/io/src/main/scala/sbt/Hash.scala b/util/io/Hash.scala → util/io/src/main/scala/sbt/Hash.scala
diff --git a/util/io/IO.scala → util/io/src/main/scala/sbt/IO.scala b/util/io/IO.scala → util/io/src/main/scala/sbt/IO.scala
diff --git a/util/io/NameFilter.scala → util/io/src/main/scala/sbt/NameFilter.scala b/util/io/NameFilter.scala → util/io/src/main/scala/sbt/NameFilter.scala
diff --git a/util/io/Pack.scala → util/io/src/main/scala/sbt/Pack.scala b/util/io/Pack.scala → util/io/src/main/scala/sbt/Pack.scala
diff --git a/util/io/Path.scala → util/io/src/main/scala/sbt/Path.scala b/util/io/Path.scala → util/io/src/main/scala/sbt/Path.scala
diff --git a/util/io/PathMapper.scala → util/io/src/main/scala/sbt/PathMapper.scala b/util/io/PathMapper.scala → util/io/src/main/scala/sbt/PathMapper.scala
diff --git a/util/io/Resources.scala → util/io/src/main/scala/sbt/Resources.scala b/util/io/Resources.scala → util/io/src/main/scala/sbt/Resources.scala
diff --git a/util/io/RichURI.scala → util/io/src/main/scala/sbt/RichURI.scala b/util/io/RichURI.scala → util/io/src/main/scala/sbt/RichURI.scala
diff --git a/util/io/SourceModificationWatch.scala → ...n/scala/sbt/SourceModificationWatch.scala b/util/io/SourceModificationWatch.scala → ...n/scala/sbt/SourceModificationWatch.scala
diff --git a/util/io/Using.scala → util/io/src/main/scala/sbt/Using.scala b/util/io/Using.scala → util/io/src/main/scala/sbt/Using.scala
diff --git a/util/io/IPC.scala → util/io/src/main/scala/xsbt/IPC.scala b/util/io/IPC.scala → util/io/src/main/scala/xsbt/IPC.scala
diff --git a/util/log/BasicLogger.scala → .../log/src/main/scala/sbt/BasicLogger.scala b/util/log/BasicLogger.scala → .../log/src/main/scala/sbt/BasicLogger.scala
diff --git a/util/log/BufferedLogger.scala → ...g/src/main/scala/sbt/BufferedLogger.scala b/util/log/BufferedLogger.scala → ...g/src/main/scala/sbt/BufferedLogger.scala
diff --git a/util/log/ConsoleLogger.scala → ...og/src/main/scala/sbt/ConsoleLogger.scala b/util/log/ConsoleLogger.scala → ...og/src/main/scala/sbt/ConsoleLogger.scala
diff --git a/util/log/FilterLogger.scala → ...log/src/main/scala/sbt/FilterLogger.scala b/util/log/FilterLogger.scala → ...log/src/main/scala/sbt/FilterLogger.scala
diff --git a/util/log/FullLogger.scala → util/log/src/main/scala/sbt/FullLogger.scala b/util/log/FullLogger.scala → util/log/src/main/scala/sbt/FullLogger.scala
diff --git a/util/log/GlobalLogging.scala → ...og/src/main/scala/sbt/GlobalLogging.scala b/util/log/GlobalLogging.scala → ...og/src/main/scala/sbt/GlobalLogging.scala
diff --git a/util/log/Level.scala → util/log/src/main/scala/sbt/Level.scala b/util/log/Level.scala → util/log/src/main/scala/sbt/Level.scala
diff --git a/util/log/LogEvent.scala → util/log/src/main/scala/sbt/LogEvent.scala b/util/log/LogEvent.scala → util/log/src/main/scala/sbt/LogEvent.scala
diff --git a/util/log/Logger.scala → util/log/src/main/scala/sbt/Logger.scala b/util/log/Logger.scala → util/log/src/main/scala/sbt/Logger.scala
diff --git a/util/log/LoggerWriter.scala → ...log/src/main/scala/sbt/LoggerWriter.scala b/util/log/LoggerWriter.scala → ...log/src/main/scala/sbt/LoggerWriter.scala
diff --git a/util/log/MainLogging.scala → .../log/src/main/scala/sbt/MainLogging.scala b/util/log/MainLogging.scala → .../log/src/main/scala/sbt/MainLogging.scala
diff --git a/util/log/MultiLogger.scala → .../log/src/main/scala/sbt/MultiLogger.scala b/util/log/MultiLogger.scala → .../log/src/main/scala/sbt/MultiLogger.scala
diff --git a/util/log/StackTrace.scala → util/log/src/main/scala/sbt/StackTrace.scala b/util/log/StackTrace.scala → util/log/src/main/scala/sbt/StackTrace.scala
diff --git a/util/process/InheritInput.scala → ...ess/src/main/scala/sbt/InheritInput.scala b/util/process/InheritInput.scala → ...ess/src/main/scala/sbt/InheritInput.scala
diff --git a/util/process/Process.scala → .../process/src/main/scala/sbt/Process.scala b/util/process/Process.scala → .../process/src/main/scala/sbt/Process.scala
diff --git a/util/process/ProcessImpl.scala → ...cess/src/main/scala/sbt/ProcessImpl.scala b/util/process/ProcessImpl.scala → ...cess/src/main/scala/sbt/ProcessImpl.scala
diff --git a/util/relation/Relation.scala → ...elation/src/main/scala/sbt/Relation.scala b/util/relation/Relation.scala → ...elation/src/main/scala/sbt/Relation.scala