diff --git a/build.xml b/build.xml
index b91e3d30..93b73fde 100644
--- a/build.xml
+++ b/build.xml
@@ -25,125 +25,6 @@
     <fileset dir="${deploy.dir}/lib" includes="**/*.jar"/>
   </path>
 
-  <!-- generates fields for persistent record classes -->
-  <target name="genrecord" depends="prepare">
-    <taskdef name="grecord" classname="com.samskivert.depot.tools.GenRecordTask"
-             classpathref="classpath"/>
-    <!-- make sure the record class files are all compiled -->
-    <javac srcdir="src/java" destdir="${classes.dir}"
-           debug="on" optimize="${build.optimize}" deprecation="on">
-      <classpath refid="classpath"/>
-      <include name="**/*Record.java"/>
-    </javac>
-    <!-- now update the source files -->
-    <grecord classpathref="classpath">
-      <fileset dir="src/java" includes="**/*Record.java"/>
-    </grecord>
-  </target>
-
-  <!-- generates additional methods for distributed object classes -->
-  <target name="gendobj" depends="prepare"> 
-    <taskdef name="dobj" classpathref="classpath"
-             classname="com.threerings.presents.tools.GenDObjectTask"/>
-    <!-- make sure the dobject class files are all compiled -->
-    <javac srcdir="src/java" destdir="${classes.dir}" includeAntRuntime="false"
-           debug="on" optimize="${build.optimize}" deprecation="on"
-           source="1.5" target="1.5">
-      <classpath refid="classpath"/>
-      <include name="**/*Object.java"/>
-    </javac>
-    <!-- now generate the associated files -->
-    <dobj classpathref="classpath">
-      <fileset dir="src/java" includes="**/*Object.java"/>
-    </dobj>
-  </target>
-
-  <!-- generates marshaller and dispatcher classes for all invocation -->
-  <!-- service declarations -->
-  <target name="genservice"> 
-    <taskdef name="service" classpathref="classpath"
-             classname="com.threerings.presents.tools.GenServiceTask"/>
-    <!-- make sure the service class files are all compiled -->
-    <javac srcdir="src/java" destdir="${classes.dir}" includeAntRuntime="false"
-           debug="on" optimize="${build.optimize}" deprecation="on"
-           source="1.5" target="1.5">
-      <classpath refid="classpath"/>
-      <include name="**/*Service.java"/>
-      <exclude name="**/InvocationService.java"/>
-    </javac>
-    <!-- generate our services that have no ActionScript counterpart -->
-    <service header="lib/SOURCE_HEADER" classpathref="classpath">
-      <fileset dir="src/java">
-        <include name="**/stage/client/*Service.java"/>
-        <include name="**/puzzle/client/*Service.java"/>
-        <include name="**/micasa/simulator/client/*Service.java"/>
-        <include name="**/micasa/lobby/*Service.java"/>
-        <include name="**/parlor/tourney/client/*Service.java"/>
-      </fileset>
-      <providerless service="SimulatorService"/>
-    </service>
-    <!-- generate our services that have an ActionScript counterpart -->
-    <service header="lib/SOURCE_HEADER" asroot="src/as" classpathref="classpath">
-      <fileset dir="src/java">
-        <include name="**/client/*Service.java"/>
-        <exclude name="**/stage/client/*Service.java"/>
-        <exclude name="**/puzzle/client/*Service.java"/>
-        <exclude name="**/micasa/simulator/client/*Service.java"/>
-        <exclude name="**/parlor/tourney/client/*Service.java"/>
-      </fileset>
-    </service>
-  </target>
-
-  <!-- generates sender and decoder classes for all invocation -->
-  <!-- receiver declarations -->
-  <target name="genreceiver"> 
-    <taskdef name="receiver" classpathref="classpath"
-             classname="com.threerings.presents.tools.GenReceiverTask"/>
-    <!-- make sure the receiver class files are all compiled -->
-    <javac srcdir="src/java" destdir="${classes.dir}" includeAntRuntime="false"
-           debug="on" optimize="${build.optimize}" deprecation="on"
-           source="1.5" target="1.5">
-      <classpath refid="classpath"/>
-      <include name="**/*Receiver.java"/>
-      <exclude name="**/InvocationReceiver.java"/>
-    </javac>
-    <!-- now generate the associated files -->
-    <receiver header="lib/SOURCE_HEADER" classpathref="classpath">
-      <fileset dir="src/java" includes="**/*Receiver.java"
-        excludes="**/InvocationReceiver.java"/>
-    </receiver>
-  </target>
-
-  <!-- adds readField and writeField methods to Stremable classes -->
-  <target name="procstream">
-    <taskdef name="instream" classpathref="classpath"
-             classname="com.threerings.presents.tools.InstrumentStreamableTask"/>
-    <!-- now instrument the associated files -->
-    <instream outdir="${classes.dir}">
-      <path refid="classpath"/>
-      <fileset dir="${classes.dir}" includes="**/*.class"/>
-    </instream>
-  </target>
-
-  <!-- generates ActionScript versions of our Streamable classes -->
-  <target name="genascript">
-    <taskdef name="genscript" classpathref="classpath"
-             classname="com.threerings.presents.tools.GenActionScriptTask"/>
-    <!-- now generate the associated files -->
-    <genscript header="lib/SOURCE_HEADER" asroot="src/as">
-      <fileset dir="src/java">
-        <include name="**/parlor/data/*.java"/>
-        <include name="**/parlor/**/data/*.java"/>
-        <exclude name="**/parlor/game/data/GameConfig.java"/> <!-- fiddly bits -->
-        <exclude name="**/parlor/tourney/**"/>
-        <include name="**/ezgame/data/*.java"/>
-        <include name="**/whirled/data/*.java"/>
-        <include name="**/whirled/**/data/*.java"/>
-        <exclude name="**/whirled/spot/data/Cluster.java"/> <!-- fiddly bits -->
-      </fileset>
-    </genscript>
-  </target>
-
   <!-- prepares the application directories -->
   <target name="prepare">
     <mkdir dir="${deploy.dir}"/>
@@ -161,6 +42,9 @@
     <copy todir="${deploy.dir}/lib" flatten="true">
       <fileset refid="${lib.name}.libs"/>
     </copy>
+    <!-- defines our various presents ant tasks -->
+    <taskdef resource="com/threerings/presents/tools.properties"
+             classpath="${deploy.dir}/lib/narya-tools.jar"/>
   </target>
 
   <!-- cleans out the intermediate build files -->
@@ -313,6 +197,115 @@
     </jar>
   </target>
 
+  <!-- generates fields for persistent record classes -->
+  <target name="genrecord" depends="prepare">
+    <taskdef name="grecord" classname="com.samskivert.depot.tools.GenRecordTask"
+             classpathref="classpath"/>
+    <!-- make sure the record class files are all compiled -->
+    <javac srcdir="src/java" destdir="${classes.dir}"
+           debug="on" optimize="${build.optimize}" deprecation="on">
+      <classpath refid="classpath"/>
+      <include name="**/*Record.java"/>
+    </javac>
+    <!-- now update the source files -->
+    <grecord classpathref="classpath">
+      <fileset dir="src/java" includes="**/*Record.java"/>
+    </grecord>
+  </target>
+
+  <!-- generates additional methods for distributed object classes -->
+  <target name="gendobj" depends="prepare"> 
+    <!-- make sure the dobject class files are all compiled -->
+    <javac srcdir="src/java" destdir="${classes.dir}" includeAntRuntime="false"
+           debug="on" optimize="${build.optimize}" deprecation="on"
+           source="1.5" target="1.5">
+      <classpath refid="classpath"/>
+      <include name="**/*Object.java"/>
+    </javac>
+    <!-- now generate the associated files -->
+    <gendobj classpathref="classpath">
+      <fileset dir="src/java" includes="**/*Object.java"/>
+    </gendobj>
+  </target>
+
+  <!-- generates marshaller and dispatcher classes for all invocation -->
+  <!-- service declarations -->
+  <target name="genservice" depends="prepare"> 
+    <!-- make sure the service class files are all compiled -->
+    <javac srcdir="src/java" destdir="${classes.dir}" includeAntRuntime="false"
+           debug="on" optimize="${build.optimize}" deprecation="on"
+           source="1.5" target="1.5">
+      <classpath refid="classpath"/>
+      <include name="**/*Service.java"/>
+      <exclude name="**/InvocationService.java"/>
+    </javac>
+    <!-- generate our services that have no ActionScript counterpart -->
+    <genservice header="lib/SOURCE_HEADER" classpathref="classpath">
+      <fileset dir="src/java">
+        <include name="**/stage/client/*Service.java"/>
+        <include name="**/puzzle/client/*Service.java"/>
+        <include name="**/micasa/simulator/client/*Service.java"/>
+        <include name="**/micasa/lobby/*Service.java"/>
+        <include name="**/parlor/tourney/client/*Service.java"/>
+      </fileset>
+      <providerless service="SimulatorService"/>
+    </genservice>
+    <!-- generate our services that have an ActionScript counterpart -->
+    <genservice header="lib/SOURCE_HEADER" asroot="src/as" classpathref="classpath">
+      <fileset dir="src/java">
+        <include name="**/client/*Service.java"/>
+        <exclude name="**/stage/client/*Service.java"/>
+        <exclude name="**/puzzle/client/*Service.java"/>
+        <exclude name="**/micasa/simulator/client/*Service.java"/>
+        <exclude name="**/parlor/tourney/client/*Service.java"/>
+      </fileset>
+    </genservice>
+  </target>
+
+  <!-- generates sender and decoder classes for all invocation -->
+  <!-- receiver declarations -->
+  <target name="genreceiver" depends="prepare">
+    <!-- make sure the receiver class files are all compiled -->
+    <javac srcdir="src/java" destdir="${classes.dir}" includeAntRuntime="false"
+           debug="on" optimize="${build.optimize}" deprecation="on"
+           source="1.5" target="1.5">
+      <classpath refid="classpath"/>
+      <include name="**/*Receiver.java"/>
+      <exclude name="**/InvocationReceiver.java"/>
+    </javac>
+    <!-- now generate the associated files -->
+    <genreceiver header="lib/SOURCE_HEADER" classpathref="classpath">
+      <fileset dir="src/java" includes="**/*Receiver.java"
+        excludes="**/InvocationReceiver.java"/>
+    </genreceiver>
+  </target>
+
+  <!-- adds readField and writeField methods to Stremable classes -->
+  <target name="procstream" depends="prepare">
+    <!-- now instrument the associated files -->
+    <instream outdir="${classes.dir}">
+      <path refid="classpath"/>
+      <fileset dir="${classes.dir}" includes="**/*.class"/>
+    </instream>
+  </target>
+
+  <!-- generates ActionScript versions of our Streamable classes -->
+  <target name="genascript" depends="prepare">
+    <!-- now generate the associated files -->
+    <genascript header="lib/SOURCE_HEADER" asroot="src/as">
+      <fileset dir="src/java">
+        <include name="**/parlor/data/*.java"/>
+        <include name="**/parlor/**/data/*.java"/>
+        <exclude name="**/parlor/game/data/GameConfig.java"/> <!-- fiddly bits -->
+        <exclude name="**/parlor/tourney/**"/>
+        <include name="**/ezgame/data/*.java"/>
+        <include name="**/whirled/data/*.java"/>
+        <include name="**/whirled/**/data/*.java"/>
+        <exclude name="**/whirled/spot/data/Cluster.java"/> <!-- fiddly bits -->
+      </fileset>
+    </genascript>
+  </target>
+
   <!-- a helper task for 'retro' -->
   <target name="vweave">
     <!-- various bits used by the retroweaver tasks -->
diff --git a/etc/libs-incl.xml b/etc/libs-incl.xml
index 1f65dffd..fe12d900 100644
--- a/etc/libs-incl.xml
+++ b/etc/libs-incl.xml
@@ -7,10 +7,8 @@
     <include name="commons-logging.jar"/>
     <include name="google-collect.jar"/>
     <include name="guice.jar"/>
-    <include name="javassist.jar"/>
     <include name="junit4.jar"/>
     <include name="retroweaver-all-1.2.2.jar"/>
-    <include name="velocity-1.5-dev.jar"/>
     <include name="xml-writer.jar"/>
     <include name="flexTasks.jar"/>
     <include name="asc.jar"/>
@@ -20,6 +18,7 @@
     <include name="narya-base*.jar"/>
     <include name="narya-distrib*.jar"/>
     <include name="narya-tests*.jar"/>
+    <include name="narya-tools*.jar"/>
     <include name="nenya-cast*.jar"/>
     <include name="nenya-media*.jar"/>
     <include name="nenya-miso*.jar"/>