diff --git a/ivy/src/main/java/ResolverAdapter.java b/ivy/src/main/java/sbt/ResolverAdapter.java
similarity index 100%
rename from ivy/src/main/java/ResolverAdapter.java
rename to ivy/src/main/java/sbt/ResolverAdapter.java
diff --git a/ivy/ComponentManager.scala b/ivy/src/main/scala/sbt/ComponentManager.scala
similarity index 100%
rename from ivy/ComponentManager.scala
rename to ivy/src/main/scala/sbt/ComponentManager.scala
diff --git a/ivy/ConflictWarning.scala b/ivy/src/main/scala/sbt/ConflictWarning.scala
similarity index 100%
rename from ivy/ConflictWarning.scala
rename to ivy/src/main/scala/sbt/ConflictWarning.scala
diff --git a/ivy/ConvertResolver.scala b/ivy/src/main/scala/sbt/ConvertResolver.scala
similarity index 100%
rename from ivy/ConvertResolver.scala
rename to ivy/src/main/scala/sbt/ConvertResolver.scala
diff --git a/ivy/Credentials.scala b/ivy/src/main/scala/sbt/Credentials.scala
similarity index 100%
rename from ivy/Credentials.scala
rename to ivy/src/main/scala/sbt/Credentials.scala
diff --git a/ivy/CrossVersion.scala b/ivy/src/main/scala/sbt/CrossVersion.scala
similarity index 100%
rename from ivy/CrossVersion.scala
rename to ivy/src/main/scala/sbt/CrossVersion.scala
diff --git a/ivy/CustomPomParser.scala b/ivy/src/main/scala/sbt/CustomPomParser.scala
similarity index 100%
rename from ivy/CustomPomParser.scala
rename to ivy/src/main/scala/sbt/CustomPomParser.scala
diff --git a/ivy/CustomXmlParser.scala b/ivy/src/main/scala/sbt/CustomXmlParser.scala
similarity index 100%
rename from ivy/CustomXmlParser.scala
rename to ivy/src/main/scala/sbt/CustomXmlParser.scala
diff --git a/ivy/DependencyFilter.scala b/ivy/src/main/scala/sbt/DependencyFilter.scala
similarity index 100%
rename from ivy/DependencyFilter.scala
rename to ivy/src/main/scala/sbt/DependencyFilter.scala
diff --git a/ivy/Ivy.scala b/ivy/src/main/scala/sbt/Ivy.scala
similarity index 100%
rename from ivy/Ivy.scala
rename to ivy/src/main/scala/sbt/Ivy.scala
diff --git a/ivy/IvyActions.scala b/ivy/src/main/scala/sbt/IvyActions.scala
similarity index 100%
rename from ivy/IvyActions.scala
rename to ivy/src/main/scala/sbt/IvyActions.scala
diff --git a/ivy/IvyCache.scala b/ivy/src/main/scala/sbt/IvyCache.scala
similarity index 100%
rename from ivy/IvyCache.scala
rename to ivy/src/main/scala/sbt/IvyCache.scala
diff --git a/ivy/IvyConfigurations.scala b/ivy/src/main/scala/sbt/IvyConfigurations.scala
similarity index 100%
rename from ivy/IvyConfigurations.scala
rename to ivy/src/main/scala/sbt/IvyConfigurations.scala
diff --git a/ivy/IvyInterface.scala b/ivy/src/main/scala/sbt/IvyInterface.scala
similarity index 100%
rename from ivy/IvyInterface.scala
rename to ivy/src/main/scala/sbt/IvyInterface.scala
diff --git a/ivy/IvyLogger.scala b/ivy/src/main/scala/sbt/IvyLogger.scala
similarity index 100%
rename from ivy/IvyLogger.scala
rename to ivy/src/main/scala/sbt/IvyLogger.scala
diff --git a/ivy/IvyRetrieve.scala b/ivy/src/main/scala/sbt/IvyRetrieve.scala
similarity index 100%
rename from ivy/IvyRetrieve.scala
rename to ivy/src/main/scala/sbt/IvyRetrieve.scala
diff --git a/ivy/IvyScala.scala b/ivy/src/main/scala/sbt/IvyScala.scala
similarity index 100%
rename from ivy/IvyScala.scala
rename to ivy/src/main/scala/sbt/IvyScala.scala
diff --git a/ivy/IvyUtil.scala b/ivy/src/main/scala/sbt/IvyUtil.scala
similarity index 100%
rename from ivy/IvyUtil.scala
rename to ivy/src/main/scala/sbt/IvyUtil.scala
diff --git a/ivy/MakePom.scala b/ivy/src/main/scala/sbt/MakePom.scala
similarity index 100%
rename from ivy/MakePom.scala
rename to ivy/src/main/scala/sbt/MakePom.scala
diff --git a/ivy/ProjectResolver.scala b/ivy/src/main/scala/sbt/ProjectResolver.scala
similarity index 100%
rename from ivy/ProjectResolver.scala
rename to ivy/src/main/scala/sbt/ProjectResolver.scala
diff --git a/ivy/ResolutionCache.scala b/ivy/src/main/scala/sbt/ResolutionCache.scala
similarity index 100%
rename from ivy/ResolutionCache.scala
rename to ivy/src/main/scala/sbt/ResolutionCache.scala
diff --git a/ivy/StringUtilities.scala b/ivy/src/main/scala/sbt/StringUtilities.scala
similarity index 100%
rename from ivy/StringUtilities.scala
rename to ivy/src/main/scala/sbt/StringUtilities.scala
diff --git a/ivy/UpdateReport.scala b/ivy/src/main/scala/sbt/UpdateReport.scala
similarity index 100%
rename from ivy/UpdateReport.scala
rename to ivy/src/main/scala/sbt/UpdateReport.scala
diff --git a/ivy/DependencyBuilders.scala b/ivy/src/main/scala/sbt/impl/DependencyBuilders.scala
similarity index 100%
rename from ivy/DependencyBuilders.scala
rename to ivy/src/main/scala/sbt/impl/DependencyBuilders.scala
diff --git a/ivy/MergeDescriptors.scala b/ivy/src/main/scala/sbt/ivyint/MergeDescriptors.scala
similarity index 100%
rename from ivy/MergeDescriptors.scala
rename to ivy/src/main/scala/sbt/ivyint/MergeDescriptors.scala