diff --git a/build.xml b/build.xml
index 01be811..d6f290f 100644
--- a/build.xml
+++ b/build.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 
-<project default="generate" xmlns:mvn="urn:maven-artifact-ant">
+<project default="assemble" xmlns:mvn="urn:maven-artifact-ant">
 
     <!-- Requires Ant 1.7.0 to execute! -->
 
@@ -184,27 +184,5 @@
         <delete dir="${binimage.dir}" quiet="true"/>
     </target>
 
-    <target name="generate" description="Generate and deploy the build.">
-        <macrodef name="maven">
-            <attribute name="args"/>
-
-            <sequential>
-                <echo><![CDATA[
-
-*** Executing mvn @{args} ***
-
-]]></echo>
-                <exec searchpath="true" executable="mvn">
-                    <arg line="@{args}"/>
-                </exec>
-            </sequential>
-        </macrodef>
-
-        <maven args="clean"/>
-        <maven args="install"/>
-        <maven args="site site:deploy -Pjavadoc"/>
-        <maven args="deploy -Pdeploy"/>
-        <antcall target="assemble"/>
-    </target>
 
 </project>
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/EagerLoad.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/EagerLoad.java
similarity index 95%
rename from tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/EagerLoad.java
rename to tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/EagerLoad.java
index 9a853aa..4787e45 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/EagerLoad.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/EagerLoad.java
@@ -14,8 +14,6 @@
 
 package org.apache.tapestry5.ioc.annotations;
 
-import org.apache.tapestry5.ioc.ServiceBinder;
-
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;
@@ -29,7 +27,7 @@
  * decorators to the service.
  * <p/>
  * This annotation may also be placed directly on a service implementation class, when using autobuilding via the {@link
- * ServiceBinder}.
+ * org.apache.tapestry5.ioc.ServiceBinder}.
  */
 @Target(
         { TYPE, METHOD })
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/Marker.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Marker.java
similarity index 100%
rename from tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/Marker.java
rename to tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Marker.java
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/Match.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Match.java
similarity index 100%
rename from tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/Match.java
rename to tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Match.java
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/Order.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Order.java
similarity index 100%
rename from tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/Order.java
rename to tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Order.java
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/Scope.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Scope.java
similarity index 100%
rename from tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/Scope.java
rename to tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Scope.java
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/SubModule.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/SubModule.java
similarity index 100%
rename from tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/SubModule.java
rename to tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/SubModule.java