diff --git a/librarymanagement/src/main/java/sbt/ResolverAdapter.java b/librarymanagement/src/main/java/sbt/internal/librarymanagement/ResolverAdapter.java
similarity index 90%
rename from librarymanagement/src/main/java/sbt/ResolverAdapter.java
rename to librarymanagement/src/main/java/sbt/internal/librarymanagement/ResolverAdapter.java
index 4247c97e7..86894b0bb 100644
--- a/librarymanagement/src/main/java/sbt/ResolverAdapter.java
+++ b/librarymanagement/src/main/java/sbt/internal/librarymanagement/ResolverAdapter.java
@@ -1,4 +1,4 @@
-package sbt;
+package sbt.internal.librarymanagement;
 
 	import java.util.Map;
 	import org.apache.ivy.plugins.resolver.DependencyResolver;
diff --git a/librarymanagement/src/main/java/sbt/mavenint/SbtPomExtraProperties.java b/librarymanagement/src/main/java/sbt/internal/librarymanagement/mavenint/SbtPomExtraProperties.java
similarity index 94%
rename from librarymanagement/src/main/java/sbt/mavenint/SbtPomExtraProperties.java
rename to librarymanagement/src/main/java/sbt/internal/librarymanagement/mavenint/SbtPomExtraProperties.java
index fde6af15b..83addbc46 100644
--- a/librarymanagement/src/main/java/sbt/mavenint/SbtPomExtraProperties.java
+++ b/librarymanagement/src/main/java/sbt/internal/librarymanagement/mavenint/SbtPomExtraProperties.java
@@ -1,4 +1,4 @@
-package sbt.mavenint;
+package sbt.internal.librarymanagement.mavenint;
 
 /**
  * Extra properties we dump from Aether into the properties list.
diff --git a/librarymanagement/src/main/scala/sbt/ComponentManager.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ComponentManager.scala
similarity index 98%
rename from librarymanagement/src/main/scala/sbt/ComponentManager.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/ComponentManager.scala
index 3dd08c928..ba27eb76c 100644
--- a/librarymanagement/src/main/scala/sbt/ComponentManager.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ComponentManager.scala
@@ -1,11 +1,12 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 Mark Harrah
  */
-package sbt
+package sbt.internal.librarymanagement
 
 import java.io.{ File, FileOutputStream }
 import java.util.concurrent.Callable
 import sbt.util.Logger
+import sbt.librarymanagement._
 
 /**
  * A component manager provides access to the pieces of xsbt that are distributed as components.
diff --git a/librarymanagement/src/main/scala/sbt/ConvertResolver.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ConvertResolver.scala
similarity index 99%
rename from librarymanagement/src/main/scala/sbt/ConvertResolver.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/ConvertResolver.scala
index 5234ca506..7029f19e0 100644
--- a/librarymanagement/src/main/scala/sbt/ConvertResolver.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ConvertResolver.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 Mark Harrah
  */
-package sbt
+package sbt.internal.librarymanagement
 
 import java.net.URL
 import java.util.Collections
@@ -19,6 +19,7 @@ import org.apache.ivy.util.{ FileUtil, ChecksumHelper }
 import org.apache.ivy.core.module.descriptor.{ Artifact => IArtifact }
 import sbt.io.IO
 import sbt.util.Logger
+import sbt.librarymanagement._
 
 private[sbt] object ConvertResolver {
   import UpdateOptions.ResolverConverter
diff --git a/librarymanagement/src/main/scala/sbt/CustomPomParser.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/CustomPomParser.scala
similarity index 98%
rename from librarymanagement/src/main/scala/sbt/CustomPomParser.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/CustomPomParser.scala
index 8cf372af0..c75565daf 100644
--- a/librarymanagement/src/main/scala/sbt/CustomPomParser.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/CustomPomParser.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.internal.librarymanagement
 
 import org.apache.ivy.core.module.id.ModuleRevisionId
 import org.apache.ivy.core.module.descriptor.{ DefaultArtifact, DefaultExtendsDescriptor, DefaultModuleDescriptor, ModuleDescriptor }
@@ -12,8 +12,9 @@ import org.apache.ivy.util.extendable.ExtendableItem
 import java.io.{ File, InputStream }
 import java.net.URL
 import java.util.regex.Pattern
-import sbt.mavenint.{ PomExtraDependencyAttributes, SbtPomExtraProperties }
+import sbt.internal.librarymanagement.mavenint.{ PomExtraDependencyAttributes, SbtPomExtraProperties }
 import sbt.io.Hash
+import sbt.librarymanagement._
 
 @deprecated("We now use an Aether-based pom parser.", "0.13.8")
 final class CustomPomParser(delegate: ModuleDescriptorParser, transform: (ModuleDescriptorParser, ModuleDescriptor) => ModuleDescriptor) extends ModuleDescriptorParser {
diff --git a/librarymanagement/src/main/scala/sbt/CustomXmlParser.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/CustomXmlParser.scala
similarity index 95%
rename from librarymanagement/src/main/scala/sbt/CustomXmlParser.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/CustomXmlParser.scala
index bc8d7544b..cad47b173 100644
--- a/librarymanagement/src/main/scala/sbt/CustomXmlParser.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/CustomXmlParser.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010  Mark Harrah
  */
-package sbt
+package sbt.internal.librarymanagement
 
 import java.io.ByteArrayInputStream
 import java.net.URL
@@ -11,6 +11,7 @@ import org.apache.ivy.core.settings.IvySettings
 import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParser
 import org.apache.ivy.plugins.repository.Resource
 import org.apache.ivy.plugins.repository.url.URLResource
+import sbt.librarymanagement._
 
 /** Subclasses the default Ivy file parser in order to provide access to protected methods.*/
 private[sbt] object CustomXmlParser extends XmlModuleDescriptorParser {
diff --git a/librarymanagement/src/main/scala/sbt/DependencyFilter.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/DependencyFilter.scala
similarity index 98%
rename from librarymanagement/src/main/scala/sbt/DependencyFilter.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/DependencyFilter.scala
index 701d179aa..3b0cc28ef 100644
--- a/librarymanagement/src/main/scala/sbt/DependencyFilter.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/DependencyFilter.scala
@@ -1,9 +1,10 @@
 /* sbt -- Simple Build Tool
  * Copyright 2011  Mark Harrah
  */
-package sbt
+package sbt.internal.librarymanagement
 
 import sbt.io.{ AllPassFilter, NameFilter }
+import sbt.librarymanagement._
 
 trait DependencyFilterExtra {
   def moduleFilter(organization: NameFilter = AllPassFilter, name: NameFilter = AllPassFilter, revision: NameFilter = AllPassFilter): ModuleFilter =
diff --git a/librarymanagement/src/main/scala/sbt/Ivy.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/Ivy.scala
similarity index 99%
rename from librarymanagement/src/main/scala/sbt/Ivy.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/Ivy.scala
index 92079f6e8..a2709140a 100644
--- a/librarymanagement/src/main/scala/sbt/Ivy.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/Ivy.scala
@@ -1,10 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 Mark Harrah
  */
-package sbt
-
-import Resolver.PluginPattern
-import ivyint.{ CachedResolutionResolveEngine, CachedResolutionResolveCache, SbtDefaultDependencyDescriptor }
+package sbt.internal.librarymanagement
 
 import java.io.File
 import java.net.URI
@@ -40,6 +37,9 @@ import scala.xml.{ NodeSeq, Text }
 import scala.collection.mutable
 
 import sbt.util.Logger
+import sbt.librarymanagement._
+import Resolver.PluginPattern
+import ivyint.{ CachedResolutionResolveEngine, CachedResolutionResolveCache, SbtDefaultDependencyDescriptor }
 
 final class IvySbt(val configuration: IvyConfiguration) {
   import configuration.baseDirectory
diff --git a/librarymanagement/src/main/scala/sbt/IvyActions.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala
similarity index 99%
rename from librarymanagement/src/main/scala/sbt/IvyActions.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala
index 2480b92b1..d5cc59781 100644
--- a/librarymanagement/src/main/scala/sbt/IvyActions.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 Mark Harrah
  */
-package sbt
+package sbt.internal.librarymanagement
 
 import java.io.File
 import scala.xml.{ Node => XNode, NodeSeq }
@@ -19,6 +19,7 @@ import org.apache.ivy.plugins.resolver.{ BasicResolver, DependencyResolver }
 import sbt.io.{ IO, PathFinder }
 import sbt.util.Logger
 import sbt.internal.util.{ ShowLines, SourcePosition, LinePosition, RangePosition, LineRange }
+import sbt.librarymanagement._
 
 final class DeliverConfiguration(val deliverIvyPattern: String, val status: String, val configurations: Option[Seq[Configuration]], val logging: UpdateLogging.Value)
 final class PublishConfiguration(val ivyFile: Option[File], val resolverName: String, val artifacts: Map[Artifact, File], val checksums: Seq[String], val logging: UpdateLogging.Value,
diff --git a/librarymanagement/src/main/scala/sbt/IvyCache.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyCache.scala
similarity index 98%
rename from librarymanagement/src/main/scala/sbt/IvyCache.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyCache.scala
index 52f6ed50e..aee827923 100644
--- a/librarymanagement/src/main/scala/sbt/IvyCache.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyCache.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010  Mark Harrah
  */
-package sbt
+package sbt.internal.librarymanagement
 
 import java.io.File
 import java.net.URL
@@ -14,6 +14,7 @@ import org.apache.ivy.plugins.resolver.util.ResolvedResource
 import org.apache.ivy.util.FileUtil
 import sbt.io.Path
 import sbt.util.Logger
+import sbt.librarymanagement._
 
 class NotInCache(val id: ModuleID, cause: Throwable)
     extends RuntimeException(NotInCache(id, cause), cause) {
diff --git a/librarymanagement/src/main/scala/sbt/IvyConfigurations.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyConfigurations.scala
similarity index 99%
rename from librarymanagement/src/main/scala/sbt/IvyConfigurations.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyConfigurations.scala
index f03deb071..9b35425ef 100644
--- a/librarymanagement/src/main/scala/sbt/IvyConfigurations.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyConfigurations.scala
@@ -1,12 +1,13 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010  Mark Harrah
  */
-package sbt
+package sbt.internal.librarymanagement
 
 import java.io.File
 import java.net.{ URI, URL }
 import scala.xml.NodeSeq
 import sbt.util.Logger
+import sbt.librarymanagement._
 
 final class IvyPaths(val baseDirectory: File, val ivyHome: Option[File]) {
   def withBase(newBaseDirectory: File) = new IvyPaths(newBaseDirectory, ivyHome)
diff --git a/librarymanagement/src/main/scala/sbt/IvyLogger.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyLogger.scala
similarity index 96%
rename from librarymanagement/src/main/scala/sbt/IvyLogger.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyLogger.scala
index 60d8c4616..b5d61fc06 100644
--- a/librarymanagement/src/main/scala/sbt/IvyLogger.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyLogger.scala
@@ -1,10 +1,11 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010  Mark Harrah
  */
-package sbt
+package sbt.internal.librarymanagement
 
 import org.apache.ivy.util.{ Message, MessageLogger, MessageLoggerEngine }
 import sbt.util.Logger
+import sbt.librarymanagement._
 
 /** Interface to Ivy logging. */
 private final class IvyLoggerInterface(logger: Logger) extends MessageLogger {
diff --git a/librarymanagement/src/main/scala/sbt/IvyRetrieve.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyRetrieve.scala
similarity index 99%
rename from librarymanagement/src/main/scala/sbt/IvyRetrieve.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyRetrieve.scala
index 14ad917fa..8e10b0633 100644
--- a/librarymanagement/src/main/scala/sbt/IvyRetrieve.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyRetrieve.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010  Mark Harrah
  */
-package sbt
+package sbt.internal.librarymanagement
 
 import java.io.File
 import java.{ util => ju }
@@ -14,6 +14,7 @@ import report.{ ArtifactDownloadReport, ConfigurationResolveReport, ResolveRepor
 import resolve.{ IvyNode, IvyNodeCallers }
 import IvyNodeCallers.{ Caller => IvyCaller }
 import ivyint.SbtDefaultDependencyDescriptor
+import sbt.librarymanagement._
 
 object IvyRetrieve {
   def reports(report: ResolveReport): Seq[ConfigurationResolveReport] =
diff --git a/librarymanagement/src/main/scala/sbt/IvyUtil.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyUtil.scala
similarity index 79%
rename from librarymanagement/src/main/scala/sbt/IvyUtil.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyUtil.scala
index 0f06b6b84..d9477b9cc 100644
--- a/librarymanagement/src/main/scala/sbt/IvyUtil.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyUtil.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.internal.librarymanagement
 
 private[sbt] object IvyUtil {
   def separate[A, B](l: Seq[Either[A, B]]): (Seq[A], Seq[B]) =
diff --git a/librarymanagement/src/main/scala/sbt/JsonUtil.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/JsonUtil.scala
similarity index 97%
rename from librarymanagement/src/main/scala/sbt/JsonUtil.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/JsonUtil.scala
index f83ee21ff..8842301ea 100644
--- a/librarymanagement/src/main/scala/sbt/JsonUtil.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/JsonUtil.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.internal.librarymanagement
 
 import java.io.File
 import java.net.URL
@@ -7,6 +7,7 @@ import core.module.descriptor.ModuleDescriptor
 import sbt.serialization._
 import java.net.{ URLEncoder, URLDecoder }
 import sbt.util.Logger
+import sbt.librarymanagement._
 
 private[sbt] object JsonUtil {
   def sbtOrgTemp = "org.scala-sbt.temp"
diff --git a/librarymanagement/src/main/scala/sbt/LogicalClock.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/LogicalClock.scala
similarity index 94%
rename from librarymanagement/src/main/scala/sbt/LogicalClock.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/LogicalClock.scala
index 83c516a17..b8ce426e7 100644
--- a/librarymanagement/src/main/scala/sbt/LogicalClock.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/LogicalClock.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.internal.librarymanagement
 
 /**
  * Represents a logical time point for dependency resolution.
diff --git a/librarymanagement/src/main/scala/sbt/MakePom.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/MakePom.scala
similarity index 99%
rename from librarymanagement/src/main/scala/sbt/MakePom.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/MakePom.scala
index 2f4640c39..a8489119c 100644
--- a/librarymanagement/src/main/scala/sbt/MakePom.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/MakePom.scala
@@ -5,12 +5,12 @@
 // based on Ivy's PomModuleDescriptorWriter, which is Apache Licensed, Version 2.0
 // http://www.apache.org/licenses/LICENSE-2.0
 
-package sbt
+package sbt.internal.librarymanagement
 
 import java.io.File
 import sbt.util.Logger
-
-import sbt.mavenint.PomExtraDependencyAttributes
+import sbt.librarymanagement._
+import mavenint.PomExtraDependencyAttributes
 
 // Node needs to be renamed to XNode because the task subproject contains a Node type that will shadow
 // scala.xml.Node when generating aggregated API documentation
@@ -23,6 +23,7 @@ import org.apache.ivy.core.module.descriptor.{ DependencyArtifactDescriptor, Dep
 import org.apache.ivy.plugins.resolver.{ ChainResolver, DependencyResolver, IBiblioResolver }
 import ivyint.CustomRemoteMavenResolver
 import sbt.io.IO
+
 object MakePom {
   /** True if the revision is an ivy-range, not a complete revision. */
   def isDependencyVersionRange(revision: String): Boolean = {
diff --git a/librarymanagement/src/main/scala/sbt/ProjectResolver.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ProjectResolver.scala
similarity index 98%
rename from librarymanagement/src/main/scala/sbt/ProjectResolver.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/ProjectResolver.scala
index 61c811e7b..760f63f52 100644
--- a/librarymanagement/src/main/scala/sbt/ProjectResolver.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ProjectResolver.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2011 Mark Harrah
  */
-package sbt
+package sbt.internal.librarymanagement
 
 import java.io.File
 import java.util.Date
@@ -15,6 +15,7 @@ import org.apache.ivy.plugins.namespace.Namespace
 import org.apache.ivy.plugins.resolver.{ DependencyResolver, ResolverSettings }
 import report.{ ArtifactDownloadReport, DownloadReport, DownloadStatus, MetadataArtifactDownloadReport }
 import resolve.{ DownloadOptions, ResolveData, ResolvedModuleRevision }
+import sbt.librarymanagement._
 
 /**
  * A Resolver that uses a predefined mapping from module ids to in-memory descriptors.
diff --git a/librarymanagement/src/main/scala/sbt/ResolutionCache.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ResolutionCache.scala
similarity index 98%
rename from librarymanagement/src/main/scala/sbt/ResolutionCache.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/ResolutionCache.scala
index 30b8d74f7..26b85b0b7 100644
--- a/librarymanagement/src/main/scala/sbt/ResolutionCache.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ResolutionCache.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.internal.librarymanagement
 
 import java.io.File
 import java.io.FileInputStream
@@ -13,6 +13,7 @@ import core.module.descriptor.ModuleDescriptor
 import ResolutionCache.{ Name, ReportDirectory, ResolvedName, ResolvedPattern }
 import parser.xml.XmlModuleDescriptorParser
 import sbt.io.IO
+import sbt.librarymanagement._
 
 /**
  * Replaces the standard Ivy resolution cache in order to:
diff --git a/librarymanagement/src/main/scala/sbt/SbtExclusionRule.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/SbtExclusionRule.scala
similarity index 93%
rename from librarymanagement/src/main/scala/sbt/SbtExclusionRule.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/SbtExclusionRule.scala
index 6e897a16b..1f6c27c47 100644
--- a/librarymanagement/src/main/scala/sbt/SbtExclusionRule.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/SbtExclusionRule.scala
@@ -1,6 +1,7 @@
-package sbt
+package sbt.internal.librarymanagement
 
-import sbt.impl.{ GroupID, GroupArtifactID }
+import impl.{ GroupID, GroupArtifactID }
+import sbt.librarymanagement._
 
 final class SbtExclusionRule(
     val organization: String,
diff --git a/librarymanagement/src/main/scala/sbt/StringUtilities.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/StringUtilities.scala
similarity index 92%
rename from librarymanagement/src/main/scala/sbt/StringUtilities.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/StringUtilities.scala
index 40018250e..00541d441 100644
--- a/librarymanagement/src/main/scala/sbt/StringUtilities.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/StringUtilities.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009  Mark Harrah
  */
-package sbt
+package sbt.internal.librarymanagement
 
 import java.util.Locale
 
diff --git a/librarymanagement/src/main/scala/sbt/cross/CrossVersionUtil.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/cross/CrossVersionUtil.scala
similarity index 98%
rename from librarymanagement/src/main/scala/sbt/cross/CrossVersionUtil.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/cross/CrossVersionUtil.scala
index c890980fc..fee1ae4ef 100644
--- a/librarymanagement/src/main/scala/sbt/cross/CrossVersionUtil.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/cross/CrossVersionUtil.scala
@@ -1,4 +1,5 @@
-package sbt.cross
+package sbt.internal.librarymanagement
+package cross
 
 object CrossVersionUtil
 {
diff --git a/librarymanagement/src/main/scala/sbt/impl/DependencyBuilders.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/impl/DependencyBuilders.scala
similarity index 97%
rename from librarymanagement/src/main/scala/sbt/impl/DependencyBuilders.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/impl/DependencyBuilders.scala
index c449393f7..f589e7674 100755
--- a/librarymanagement/src/main/scala/sbt/impl/DependencyBuilders.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/impl/DependencyBuilders.scala
@@ -1,10 +1,11 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009,2010  Mark Harrah
  */
-package sbt
+package sbt.internal.librarymanagement
 package impl
 
 import StringUtilities.nonEmpty
+import sbt.librarymanagement._
 
 trait DependencyBuilders {
   final implicit def toGroupID(groupID: String): GroupID =
diff --git a/librarymanagement/src/main/scala/sbt/ivyint/CachedResolutionResolveEngine.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala
similarity index 99%
rename from librarymanagement/src/main/scala/sbt/ivyint/CachedResolutionResolveEngine.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala
index 1fc3291a4..adabbeb47 100644
--- a/librarymanagement/src/main/scala/sbt/ivyint/CachedResolutionResolveEngine.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.internal.librarymanagement
 package ivyint
 
 import java.util.Date
@@ -19,11 +19,12 @@ import core.{ IvyPatternHelper, LogOptions }
 import org.apache.ivy.util.{ Message, MessageLogger }
 import org.apache.ivy.plugins.latest.{ ArtifactInfo => IvyArtifactInfo }
 import org.apache.ivy.plugins.matcher.{ MapMatcher, PatternMatcher }
-import Configurations.{ System => _, _ }
 import annotation.tailrec
 import scala.concurrent.duration._
 import sbt.io.{ DirectoryFilter, Hash, IO, Path }
 import sbt.util.Logger
+import sbt.librarymanagement._
+import Configurations.{ System => _, _ }
 
 private[sbt] object CachedResolutionResolveCache {
   def createID(organization: String, name: String, revision: String) =
diff --git a/librarymanagement/src/main/scala/sbt/ivyint/CustomMavenResolver.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/CustomMavenResolver.scala
similarity index 80%
rename from librarymanagement/src/main/scala/sbt/ivyint/CustomMavenResolver.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/CustomMavenResolver.scala
index e3e41148e..3fc19aed9 100644
--- a/librarymanagement/src/main/scala/sbt/ivyint/CustomMavenResolver.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/CustomMavenResolver.scala
@@ -1,7 +1,8 @@
-package sbt
+package sbt.internal.librarymanagement
 package ivyint
 
 import org.apache.ivy.plugins.resolver.DependencyResolver
+import sbt.librarymanagement._
 
 // These are placeholder traits for sbt-aether-resolver
 trait CustomMavenResolver extends DependencyResolver {
diff --git a/librarymanagement/src/main/scala/sbt/ivyint/ErrorMessageAuthenticator.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/ErrorMessageAuthenticator.scala
similarity index 99%
rename from librarymanagement/src/main/scala/sbt/ivyint/ErrorMessageAuthenticator.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/ErrorMessageAuthenticator.scala
index 5d067d313..9a889d808 100644
--- a/librarymanagement/src/main/scala/sbt/ivyint/ErrorMessageAuthenticator.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/ErrorMessageAuthenticator.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.internal.librarymanagement
 package ivyint
 
 import java.lang.reflect.Field
diff --git a/librarymanagement/src/main/scala/sbt/ivyint/IvyCredentialsLookup.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/IvyCredentialsLookup.scala
similarity index 98%
rename from librarymanagement/src/main/scala/sbt/ivyint/IvyCredentialsLookup.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/IvyCredentialsLookup.scala
index aeef4d428..88a237910 100644
--- a/librarymanagement/src/main/scala/sbt/ivyint/IvyCredentialsLookup.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/IvyCredentialsLookup.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.internal.librarymanagement
 package ivyint
 
 import org.apache.ivy.util.url.CredentialsStore
diff --git a/librarymanagement/src/main/scala/sbt/ivyint/MergeDescriptors.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/MergeDescriptors.scala
similarity index 99%
rename from librarymanagement/src/main/scala/sbt/ivyint/MergeDescriptors.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/MergeDescriptors.scala
index 76bb4d2af..03e043043 100644
--- a/librarymanagement/src/main/scala/sbt/ivyint/MergeDescriptors.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/MergeDescriptors.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.internal.librarymanagement
 package ivyint
 
 import java.io.File
diff --git a/librarymanagement/src/main/scala/sbt/ivyint/SbtChainResolver.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/SbtChainResolver.scala
similarity index 99%
rename from librarymanagement/src/main/scala/sbt/ivyint/SbtChainResolver.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/SbtChainResolver.scala
index 2ca80898f..c67c77b7e 100644
--- a/librarymanagement/src/main/scala/sbt/ivyint/SbtChainResolver.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/SbtChainResolver.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.internal.librarymanagement
 package ivyint
 
 import java.io.File
@@ -16,6 +16,7 @@ import org.apache.ivy.plugins.resolver._
 import org.apache.ivy.plugins.resolver.util.{ HasLatestStrategy, ResolvedResource }
 import org.apache.ivy.util.{ Message, StringUtils => IvyStringUtils }
 import sbt.util.Logger
+import sbt.librarymanagement._
 
 private[sbt] case class SbtChainResolver(
     name: String,
diff --git a/librarymanagement/src/main/scala/sbt/ivyint/SbtDefaultDependencyDescriptor.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/SbtDefaultDependencyDescriptor.scala
similarity index 75%
rename from librarymanagement/src/main/scala/sbt/ivyint/SbtDefaultDependencyDescriptor.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/SbtDefaultDependencyDescriptor.scala
index 0a3338fac..f4f281a50 100644
--- a/librarymanagement/src/main/scala/sbt/ivyint/SbtDefaultDependencyDescriptor.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/SbtDefaultDependencyDescriptor.scala
@@ -1,8 +1,9 @@
-package sbt
+package sbt.internal.librarymanagement
 package ivyint
 
 import org.apache.ivy.core
 import core.module.descriptor.DefaultDependencyDescriptor
+import sbt.librarymanagement._
 
 trait SbtDefaultDependencyDescriptor { self: DefaultDependencyDescriptor =>
   def dependencyModuleId: ModuleID
diff --git a/librarymanagement/src/main/scala/sbt/mavenint/PomExtraDependencyAttributes.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/mavenint/PomExtraDependencyAttributes.scala
similarity index 98%
rename from librarymanagement/src/main/scala/sbt/mavenint/PomExtraDependencyAttributes.scala
rename to librarymanagement/src/main/scala/sbt/internal/librarymanagement/mavenint/PomExtraDependencyAttributes.scala
index ab87cae75..a1091aed4 100644
--- a/librarymanagement/src/main/scala/sbt/mavenint/PomExtraDependencyAttributes.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/mavenint/PomExtraDependencyAttributes.scala
@@ -1,4 +1,5 @@
-package sbt.mavenint
+package sbt.internal.librarymanagement
+package mavenint
 
 import java.util.Properties
 import java.util.regex.Pattern
diff --git a/librarymanagement/src/main/scala/sbt/Artifact.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/Artifact.scala
similarity index 99%
rename from librarymanagement/src/main/scala/sbt/Artifact.scala
rename to librarymanagement/src/main/scala/sbt/librarymanagement/Artifact.scala
index 4cafb0e67..93dc66fcb 100644
--- a/librarymanagement/src/main/scala/sbt/Artifact.scala
+++ b/librarymanagement/src/main/scala/sbt/librarymanagement/Artifact.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010  Mark Harrah
  */
-package sbt
+package sbt.librarymanagement
 
 import java.io.File
 import java.net.URL
diff --git a/librarymanagement/src/main/scala/sbt/CircularDependencyLevel.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/CircularDependencyLevel.scala
similarity index 97%
rename from librarymanagement/src/main/scala/sbt/CircularDependencyLevel.scala
rename to librarymanagement/src/main/scala/sbt/librarymanagement/CircularDependencyLevel.scala
index 3c2f62bc6..0fc32c015 100644
--- a/librarymanagement/src/main/scala/sbt/CircularDependencyLevel.scala
+++ b/librarymanagement/src/main/scala/sbt/librarymanagement/CircularDependencyLevel.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.librarymanagement
 
 import org.apache.ivy.plugins.circular.{ CircularDependencyStrategy, WarnCircularDependencyStrategy, IgnoreCircularDependencyStrategy, ErrorCircularDependencyStrategy }
 
diff --git a/librarymanagement/src/main/scala/sbt/Configuration.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/Configuration.scala
similarity index 99%
rename from librarymanagement/src/main/scala/sbt/Configuration.scala
rename to librarymanagement/src/main/scala/sbt/librarymanagement/Configuration.scala
index d2307b89d..95c8119da 100644
--- a/librarymanagement/src/main/scala/sbt/Configuration.scala
+++ b/librarymanagement/src/main/scala/sbt/librarymanagement/Configuration.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010  Mark Harrah
  */
-package sbt
+package sbt.librarymanagement
 
 import sbt.serialization._
 
diff --git a/librarymanagement/src/main/scala/sbt/ConflictWarning.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/ConflictWarning.scala
similarity index 78%
rename from librarymanagement/src/main/scala/sbt/ConflictWarning.scala
rename to librarymanagement/src/main/scala/sbt/librarymanagement/ConflictWarning.scala
index 75a4a5bd9..ab98c67af 100644
--- a/librarymanagement/src/main/scala/sbt/ConflictWarning.scala
+++ b/librarymanagement/src/main/scala/sbt/librarymanagement/ConflictWarning.scala
@@ -1,6 +1,6 @@
-package sbt
+package sbt.librarymanagement
 
-import DependencyFilter._
+import sbt.internal.librarymanagement.DependencyFilter._
 import sbt.util.{ Logger, Level }
 
 /**
@@ -9,16 +9,8 @@ import sbt.util.{ Logger, Level }
  * library dependency graph by mistake, but it won't be caught by eviction.
  */
 final case class ConflictWarning(label: String, level: Level.Value, failOnConflict: Boolean) {
-  @deprecated("`filter` is no longer used", "0.13.0")
-  val filter: ModuleFilter = (_: ModuleID) => false
-  @deprecated("`group` is no longer used", "0.13.0")
-  val group: ModuleID => String = ConflictWarning.org
 }
 object ConflictWarning {
-  @deprecated("`group` and `filter` are no longer used.  Use a standard Ivy conflict manager.", "0.13.0")
-  def apply(label: String, filter: ModuleFilter, group: ModuleID => String, level: Level.Value, failOnConflict: Boolean): ConflictWarning =
-    ConflictWarning(label, level, failOnConflict)
-
   def disable: ConflictWarning = ConflictWarning("", Level.Debug, false)
 
   private def org = (_: ModuleID).organization
@@ -26,9 +18,6 @@ object ConflictWarning {
 
   def default(label: String): ConflictWarning = ConflictWarning(label, Level.Error, true)
 
-  @deprecated("Warning on evicted modules is no longer done, so this is the same as `default`.  Use a standard Ivy conflict manager.", "0.13.0")
-  def strict(label: String): ConflictWarning = ConflictWarning(label, Level.Error, true)
-
   def apply(config: ConflictWarning, report: UpdateReport, log: Logger): Unit = {
     processCrossVersioned(config, report, log)
   }
diff --git a/librarymanagement/src/main/scala/sbt/Credentials.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/Credentials.scala
similarity index 97%
rename from librarymanagement/src/main/scala/sbt/Credentials.scala
rename to librarymanagement/src/main/scala/sbt/librarymanagement/Credentials.scala
index e2bd74fed..d86a8b774 100644
--- a/librarymanagement/src/main/scala/sbt/Credentials.scala
+++ b/librarymanagement/src/main/scala/sbt/librarymanagement/Credentials.scala
@@ -1,12 +1,13 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009 Mark Harrah
  */
-package sbt
+package sbt.librarymanagement
 
 import java.io.File
 import org.apache.ivy.util.url.CredentialsStore
 import sbt.io.IO
 import sbt.util.Logger
+import sbt.internal.librarymanagement.IvyUtil
 
 object Credentials {
   def apply(realm: String, host: String, userName: String, passwd: String): Credentials =
diff --git a/librarymanagement/src/main/scala/sbt/CrossVersion.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/CrossVersion.scala
similarity index 98%
rename from librarymanagement/src/main/scala/sbt/CrossVersion.scala
rename to librarymanagement/src/main/scala/sbt/librarymanagement/CrossVersion.scala
index b17ac525c..63cee85a3 100644
--- a/librarymanagement/src/main/scala/sbt/CrossVersion.scala
+++ b/librarymanagement/src/main/scala/sbt/librarymanagement/CrossVersion.scala
@@ -1,7 +1,8 @@
-package sbt
+package sbt.librarymanagement
 
-import cross.CrossVersionUtil
 import sbt.serialization._
+import sbt.internal.librarymanagement.SbtExclusionRule
+import sbt.internal.librarymanagement.cross.CrossVersionUtil
 
 final case class ScalaVersion(full: String, binary: String)
 
diff --git a/librarymanagement/src/main/scala/sbt/EvictionWarning.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/EvictionWarning.scala
similarity index 98%
rename from librarymanagement/src/main/scala/sbt/EvictionWarning.scala
rename to librarymanagement/src/main/scala/sbt/librarymanagement/EvictionWarning.scala
index 4d6618b3c..f7b4523e3 100644
--- a/librarymanagement/src/main/scala/sbt/EvictionWarning.scala
+++ b/librarymanagement/src/main/scala/sbt/librarymanagement/EvictionWarning.scala
@@ -1,10 +1,11 @@
-package sbt
+package sbt.librarymanagement
 
 import collection.mutable
 import Configurations.Compile
 import ScalaArtifacts.{ LibraryID, CompilerID }
 import sbt.util.Logger
 import sbt.internal.util.ShowLines
+import sbt.internal.librarymanagement.{ IvySbt, InlineConfiguration, InlineConfigurationWithExcludes }
 
 final class EvictionWarningOptions private[sbt] (
     val configurations: Seq[Configuration],
diff --git a/librarymanagement/src/main/scala/sbt/IvyInterface.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/IvyInterface.scala
similarity index 98%
rename from librarymanagement/src/main/scala/sbt/IvyInterface.scala
rename to librarymanagement/src/main/scala/sbt/librarymanagement/IvyInterface.scala
index 3b54c684c..b582a51ed 100644
--- a/librarymanagement/src/main/scala/sbt/IvyInterface.scala
+++ b/librarymanagement/src/main/scala/sbt/librarymanagement/IvyInterface.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010  Mark Harrah
  */
-package sbt
+package sbt.librarymanagement
 
 import java.io.File
 import java.net.{ URI, URL }
diff --git a/librarymanagement/src/main/scala/sbt/IvyScala.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/IvyScala.scala
similarity index 98%
rename from librarymanagement/src/main/scala/sbt/IvyScala.scala
rename to librarymanagement/src/main/scala/sbt/librarymanagement/IvyScala.scala
index ea82f44ce..a399cb9d9 100644
--- a/librarymanagement/src/main/scala/sbt/IvyScala.scala
+++ b/librarymanagement/src/main/scala/sbt/librarymanagement/IvyScala.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 Mark Harrah
  */
-package sbt
+package sbt.librarymanagement
 
 import java.util.Collections.emptyMap
 import scala.collection.mutable.HashSet
@@ -10,7 +10,6 @@ import org.apache.ivy.core.module.descriptor.{ DefaultExcludeRule, ExcludeRule }
 import org.apache.ivy.core.module.descriptor.{ DependencyDescriptor, DefaultModuleDescriptor, ModuleDescriptor, OverrideDependencyDescriptorMediator }
 import org.apache.ivy.core.module.id.{ ArtifactId, ModuleId, ModuleRevisionId }
 import org.apache.ivy.plugins.matcher.ExactPatternMatcher
-
 import sbt.util.Logger
 
 object ScalaArtifacts {
@@ -35,7 +34,7 @@ import ScalaArtifacts._
 
 final case class IvyScala(scalaFullVersion: String, scalaBinaryVersion: String, configurations: Iterable[Configuration], checkExplicit: Boolean, filterImplicit: Boolean, overrideScalaVersion: Boolean, scalaOrganization: String = ScalaArtifacts.Organization)
 
-private object IvyScala {
+private[sbt] object IvyScala {
   /** Performs checks/adds filters on Scala dependencies (if enabled in IvyScala). */
   def checkModule(module: DefaultModuleDescriptor, conf: String, log: Logger)(check: IvyScala): Unit = {
     if (check.checkExplicit)
diff --git a/librarymanagement/src/main/scala/sbt/ModuleID.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/ModuleID.scala
similarity index 98%
rename from librarymanagement/src/main/scala/sbt/ModuleID.scala
rename to librarymanagement/src/main/scala/sbt/librarymanagement/ModuleID.scala
index 10647dcad..46b63ce39 100644
--- a/librarymanagement/src/main/scala/sbt/ModuleID.scala
+++ b/librarymanagement/src/main/scala/sbt/librarymanagement/ModuleID.scala
@@ -1,11 +1,11 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010  Mark Harrah
  */
-package sbt
+package sbt.librarymanagement
 
 import java.net.URL
 
-import sbt.mavenint.SbtPomExtraProperties
+import sbt.internal.librarymanagement.mavenint.SbtPomExtraProperties
 import sbt.serialization._
 
 final case class ModuleID(organization: String, name: String, revision: String, configurations: Option[String] = None, isChanging: Boolean = false, isTransitive: Boolean = true, isForce: Boolean = false, explicitArtifacts: Seq[Artifact] = Nil, exclusions: Seq[ExclusionRule] = Nil, extraAttributes: Map[String, String] = Map.empty, crossVersion: CrossVersion = CrossVersion.Disabled) {
diff --git a/librarymanagement/src/main/scala/sbt/Resolver.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/Resolver.scala
similarity index 99%
rename from librarymanagement/src/main/scala/sbt/Resolver.scala
rename to librarymanagement/src/main/scala/sbt/librarymanagement/Resolver.scala
index ec2564b43..a44615784 100644
--- a/librarymanagement/src/main/scala/sbt/Resolver.scala
+++ b/librarymanagement/src/main/scala/sbt/librarymanagement/Resolver.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010  Mark Harrah
  */
-package sbt
+package sbt.librarymanagement
 
 import java.io.{ IOException, File }
 import java.net.URL
diff --git a/librarymanagement/src/main/scala/sbt/UpdateOptions.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/UpdateOptions.scala
similarity index 99%
rename from librarymanagement/src/main/scala/sbt/UpdateOptions.scala
rename to librarymanagement/src/main/scala/sbt/librarymanagement/UpdateOptions.scala
index 91fa7902d..2ff9bf80f 100644
--- a/librarymanagement/src/main/scala/sbt/UpdateOptions.scala
+++ b/librarymanagement/src/main/scala/sbt/librarymanagement/UpdateOptions.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.librarymanagement
 
 import java.io.File
 import org.apache.ivy.plugins.resolver.DependencyResolver
diff --git a/librarymanagement/src/main/scala/sbt/UpdateReport.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/UpdateReport.scala
similarity index 97%
rename from librarymanagement/src/main/scala/sbt/UpdateReport.scala
rename to librarymanagement/src/main/scala/sbt/librarymanagement/UpdateReport.scala
index 5a866632a..8f03a2939 100644
--- a/librarymanagement/src/main/scala/sbt/UpdateReport.scala
+++ b/librarymanagement/src/main/scala/sbt/librarymanagement/UpdateReport.scala
@@ -1,12 +1,13 @@
 /* sbt -- Simple Build Tool
  * Copyright 2011  Mark Harrah
  */
-package sbt
+package sbt.librarymanagement
 
 import java.io.File
 import java.net.URL
 import java.{ util => ju }
 import sbt.serialization._
+import sbt.internal.librarymanagement.{ DependencyFilter, ConfigurationFilter, ModuleFilter, ArtifactFilter }
 
 /**
  * Provides information about resolution of a single configuration.
@@ -225,14 +226,15 @@ object UpdateReport {
       }
 
     import DependencyFilter._
+
     /** Obtains all successfully retrieved files in all configurations and modules. */
     def allFiles: Seq[File] = matching(DependencyFilter.allPass)
 
     /** Obtains all successfully retrieved files in configurations, modules, and artifacts matching the specified filter. */
-    def matching(f: DependencyFilter): Seq[File] = select0(f).distinct
+    private[sbt] def matching(f: DependencyFilter): Seq[File] = select0(f).distinct
 
     /** Obtains all successfully retrieved files matching all provided filters.  An unspecified argument matches all files. */
-    def select(configuration: ConfigurationFilter = configurationFilter(), module: ModuleFilter = moduleFilter(), artifact: ArtifactFilter = artifactFilter()): Seq[File] =
+    private[sbt] def select(configuration: ConfigurationFilter = configurationFilter(), module: ModuleFilter = moduleFilter(), artifact: ArtifactFilter = artifactFilter()): Seq[File] =
       matching(DependencyFilter.make(configuration, module, artifact))
 
     private[this] def select0(f: DependencyFilter): Seq[File] =
@@ -242,7 +244,7 @@ object UpdateReport {
       }
 
     /** Constructs a new report that only contains files matching the specified filter.*/
-    def filter(f: DependencyFilter): UpdateReport =
+    private[sbt] def filter(f: DependencyFilter): UpdateReport =
       moduleReportMap { (configuration, modReport) =>
         modReport.copy(
           artifacts = modReport.artifacts filter { case (art, file) => f(configuration, modReport.module, art) },
diff --git a/librarymanagement/src/main/scala/sbt/VersionNumber.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/VersionNumber.scala
similarity index 99%
rename from librarymanagement/src/main/scala/sbt/VersionNumber.scala
rename to librarymanagement/src/main/scala/sbt/librarymanagement/VersionNumber.scala
index a5d1d494b..226126bc3 100644
--- a/librarymanagement/src/main/scala/sbt/VersionNumber.scala
+++ b/librarymanagement/src/main/scala/sbt/librarymanagement/VersionNumber.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.librarymanagement
 
 final class VersionNumber private[sbt] (
     val numbers: Seq[Long],
diff --git a/librarymanagement/src/test/scala/BaseIvySpecification.scala b/librarymanagement/src/test/scala/BaseIvySpecification.scala
index a9936e956..7ac8a3014 100644
--- a/librarymanagement/src/test/scala/BaseIvySpecification.scala
+++ b/librarymanagement/src/test/scala/BaseIvySpecification.scala
@@ -1,13 +1,15 @@
-package sbt
+package sbt.internal.librarymanagement
 
-import sbt.io.Path._, Configurations._
+import sbt.io.Path._
 import sbt.io.IO
 import java.io.File
 import cross.CrossVersionUtil
-import sbt.ivyint.SbtChainResolver
 import sbt.util.Logger
 import sbt.internal.util.ConsoleLogger
 import sbt.internal.util.UnitSpec
+import sbt.librarymanagement._
+import ivyint.SbtChainResolver
+import Configurations._
 
 trait BaseIvySpecification extends UnitSpec {
   def currentBase: File = new File(".")
diff --git a/librarymanagement/src/test/scala/CachedResolutionSpec.scala b/librarymanagement/src/test/scala/CachedResolutionSpec.scala
index 48ee003c0..5950fba99 100644
--- a/librarymanagement/src/test/scala/CachedResolutionSpec.scala
+++ b/librarymanagement/src/test/scala/CachedResolutionSpec.scala
@@ -1,6 +1,7 @@
-package sbt
+package sbt.internal.librarymanagement
 
 import sbt.internal.util.ShowLines
+import sbt.librarymanagement._
 
 class CachedResolutionSpec extends BaseIvySpecification {
   import ShowLines._
diff --git a/librarymanagement/src/test/scala/ComponentManagerTest.scala b/librarymanagement/src/test/scala/ComponentManagerTest.scala
index 22923f62f..800f5de0c 100644
--- a/librarymanagement/src/test/scala/ComponentManagerTest.scala
+++ b/librarymanagement/src/test/scala/ComponentManagerTest.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.internal.librarymanagement
 
 import java.io.File
 import java.util.concurrent.Callable
diff --git a/librarymanagement/src/test/scala/CrossVersionTest.scala b/librarymanagement/src/test/scala/CrossVersionTest.scala
index 33e1f62f2..3f8a608ea 100644
--- a/librarymanagement/src/test/scala/CrossVersionTest.scala
+++ b/librarymanagement/src/test/scala/CrossVersionTest.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.librarymanagement
 
 import java.io.File
 import sbt.internal.util.UnitSpec
diff --git a/librarymanagement/src/test/scala/CustomPomParserTest.scala b/librarymanagement/src/test/scala/CustomPomParserTest.scala
index e8319ba2b..62e9edec2 100644
--- a/librarymanagement/src/test/scala/CustomPomParserTest.scala
+++ b/librarymanagement/src/test/scala/CustomPomParserTest.scala
@@ -1,8 +1,10 @@
+package sbt.internal.librarymanagement
+
 import java.io.File
 import org.apache.ivy.core.module.descriptor.{ Artifact => IvyArtifact }
 import org.apache.ivy.core.module.id.ModuleRevisionId
 import org.apache.ivy.core.resolve.ResolveOptions
-import sbt._
+import sbt.librarymanagement._
 import sbt.io.IO.withTemporaryDirectory
 import sbt.util.Logger
 import sbt.internal.util.ConsoleLogger
diff --git a/librarymanagement/src/test/scala/DMSerializationSpec.scala b/librarymanagement/src/test/scala/DMSerializationSpec.scala
index 532fae381..e35ea9748 100644
--- a/librarymanagement/src/test/scala/DMSerializationSpec.scala
+++ b/librarymanagement/src/test/scala/DMSerializationSpec.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.librarymanagement
 
 import java.net.URL
 import java.io.File
@@ -7,13 +7,13 @@ import sbt.internal.util.UnitSpec
 
 class DMSerializationSpec extends UnitSpec {
   "CrossVersion.full" should "roundtrip" in {
-    roundtripStr(CrossVersion.full: sbt.CrossVersion)
+    roundtripStr(CrossVersion.full: CrossVersion)
   }
   "CrossVersion.binary" should "roundtrip" in {
-    roundtripStr(CrossVersion.binary: sbt.CrossVersion)
+    roundtripStr(CrossVersion.binary: CrossVersion)
   }
   "CrossVersion.Disabled" should "roundtrip" in {
-    roundtrip(CrossVersion.Disabled: sbt.CrossVersion)
+    roundtrip(CrossVersion.Disabled: CrossVersion)
   }
   """Artifact("foo")""" should "roundtrip" in {
     roundtrip(Artifact("foo"))
diff --git a/librarymanagement/src/test/scala/EvictionWarningSpec.scala b/librarymanagement/src/test/scala/EvictionWarningSpec.scala
index a2f30fb3b..46dea91f2 100644
--- a/librarymanagement/src/test/scala/EvictionWarningSpec.scala
+++ b/librarymanagement/src/test/scala/EvictionWarningSpec.scala
@@ -1,4 +1,6 @@
-package sbt
+package sbt.librarymanagement
+
+import sbt.internal.librarymanagement.BaseIvySpecification
 
 class EvictionWarningSpec extends BaseIvySpecification {
   // This is a specification to check the eviction warnings
diff --git a/librarymanagement/src/test/scala/InconsistentDuplicateSpec.scala b/librarymanagement/src/test/scala/InconsistentDuplicateSpec.scala
index 343149e85..5bcbcebcd 100644
--- a/librarymanagement/src/test/scala/InconsistentDuplicateSpec.scala
+++ b/librarymanagement/src/test/scala/InconsistentDuplicateSpec.scala
@@ -1,6 +1,7 @@
-package sbt
+package sbt.internal.librarymanagement
 
 import sbt.internal.util.UnitSpec
+import sbt.librarymanagement._
 
 // This is a specification to check the inconsistent duplicate warnings
 class InconsistentDuplicateSpec extends UnitSpec {
diff --git a/librarymanagement/src/test/scala/MakePomSpec.scala b/librarymanagement/src/test/scala/MakePomSpec.scala
index 5f0513556..726e397b1 100644
--- a/librarymanagement/src/test/scala/MakePomSpec.scala
+++ b/librarymanagement/src/test/scala/MakePomSpec.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.internal.librarymanagement
 
 import java.io.File
 import sbt.util.Logger
diff --git a/librarymanagement/src/test/scala/ResolverTest.scala b/librarymanagement/src/test/scala/ResolverTest.scala
index adfb9c576..499e86db4 100644
--- a/librarymanagement/src/test/scala/ResolverTest.scala
+++ b/librarymanagement/src/test/scala/ResolverTest.scala
@@ -1,3 +1,5 @@
+package sbt.librarymanagement
+
 import java.net.URL
 
 import sbt._
diff --git a/librarymanagement/src/test/scala/VersionNumberSpec.scala b/librarymanagement/src/test/scala/VersionNumberSpec.scala
index 3e7b8c631..9f882f30e 100644
--- a/librarymanagement/src/test/scala/VersionNumberSpec.scala
+++ b/librarymanagement/src/test/scala/VersionNumberSpec.scala
@@ -1,4 +1,4 @@
-package sbt
+package sbt.librarymanagement
 
 import sbt.internal.util.UnitSpec