diff --git a/src/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java b/src/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java
index 1620601d1..d3d0cde17 100644
--- a/src/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java
+++ b/src/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java
@@ -1,7 +1,7 @@
 //
-// $Id: ComponentBundlerTask.java,v 1.2 2001/11/29 00:15:25 mdb Exp $
+// $Id: ComponentBundlerTask.java,v 1.3 2002/02/05 20:29:09 mdb Exp $
 
-package com.threerings.cast.tools.bundle;
+package com.threerings.cast.bundle.tools;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/java/com/threerings/cast/bundle/tools/DumpBundle.java b/src/java/com/threerings/cast/bundle/tools/DumpBundle.java
index bb40a08c2..c026a3b48 100644
--- a/src/java/com/threerings/cast/bundle/tools/DumpBundle.java
+++ b/src/java/com/threerings/cast/bundle/tools/DumpBundle.java
@@ -1,7 +1,7 @@
 //
-// $Id: DumpBundle.java,v 1.1 2001/12/16 23:12:37 shaper Exp $
+// $Id: DumpBundle.java,v 1.2 2002/02/05 20:29:09 mdb Exp $
 
-package com.threerings.cast.tools.bundle;
+package com.threerings.cast.bundle.tools;
 
 import java.io.File;
 import java.util.HashMap;
diff --git a/src/java/com/threerings/cast/bundle/tools/MetadataBundlerTask.java b/src/java/com/threerings/cast/bundle/tools/MetadataBundlerTask.java
index 100508c53..be7d83426 100644
--- a/src/java/com/threerings/cast/bundle/tools/MetadataBundlerTask.java
+++ b/src/java/com/threerings/cast/bundle/tools/MetadataBundlerTask.java
@@ -1,7 +1,7 @@
 //
-// $Id: MetadataBundlerTask.java,v 1.1 2001/11/27 08:09:35 mdb Exp $
+// $Id: MetadataBundlerTask.java,v 1.2 2002/02/05 20:29:09 mdb Exp $
 
-package com.threerings.cast.tools.bundle;
+package com.threerings.cast.bundle.tools;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -27,7 +27,7 @@ import org.apache.commons.digester.Digester;
 import com.samskivert.util.Tuple;
 
 import com.threerings.media.tile.TileSet;
-import com.threerings.media.tools.tile.xml.SwissArmyTileSetRuleSet;
+import com.threerings.media.tile.tools.xml.SwissArmyTileSetRuleSet;
 
 import com.threerings.cast.ActionSequence;
 import com.threerings.cast.ComponentClass;
diff --git a/src/java/com/threerings/media/tile/bundle/tools/DumpBundle.java b/src/java/com/threerings/media/tile/bundle/tools/DumpBundle.java
index dc2c18dd2..6aa77a1dd 100644
--- a/src/java/com/threerings/media/tile/bundle/tools/DumpBundle.java
+++ b/src/java/com/threerings/media/tile/bundle/tools/DumpBundle.java
@@ -1,7 +1,7 @@
 //
-// $Id: DumpBundle.java,v 1.5 2002/01/16 03:01:45 mdb Exp $
+// $Id: DumpBundle.java,v 1.6 2002/02/05 20:29:09 mdb Exp $
 
-package com.threerings.media.tools.tile.bundle;
+package com.threerings.media.tile.bundle.tools;
 
 import java.io.File;
 import java.util.Iterator;
diff --git a/src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java b/src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java
index 0b5dadaa5..bedd90895 100644
--- a/src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java
+++ b/src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java
@@ -1,7 +1,7 @@
 //
-// $Id: TileSetBundler.java,v 1.3 2001/11/29 21:58:15 mdb Exp $
+// $Id: TileSetBundler.java,v 1.4 2002/02/05 20:29:09 mdb Exp $
 
-package com.threerings.media.tools.tile.bundle;
+package com.threerings.media.tile.bundle.tools;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -32,7 +32,7 @@ import com.threerings.media.tile.TileSet;
 import com.threerings.media.tile.TileSetIDBroker;
 import com.threerings.media.tile.bundle.BundleUtil;
 import com.threerings.media.tile.bundle.TileSetBundle;
-import com.threerings.media.tools.tile.xml.TileSetRuleSet;
+import com.threerings.media.tile.tools.xml.TileSetRuleSet;
 
 /**
  * The tileset bundler is used to create tileset bundles from a set of XML
@@ -50,13 +50,13 @@ import com.threerings.media.tools.tile.xml.TileSetRuleSet;
  *   <mapping>
  *     <path>bundle.tilesets.uniform</path>
  *     <ruleset>
- *       com.threerings.media.tools.tile.xml.UniformTileSetRuleSet
+ *       com.threerings.media.tile.tools.xml.UniformTileSetRuleSet
  *     </ruleset>
  *   </mapping>
  *   <mapping>
  *     <path>bundle.tilesets.object</path>
  *     <ruleset>
- *       com.threerings.media.tools.tile.xml.ObjectTileSetRuleSet
+ *       com.threerings.media.tile.tools.xml.ObjectTileSetRuleSet
  *     </ruleset>
  *   </mapping>
  * </bundler-config>
diff --git a/src/java/com/threerings/media/tile/bundle/tools/TileSetBundlerTask.java b/src/java/com/threerings/media/tile/bundle/tools/TileSetBundlerTask.java
index e773a0129..b643345bd 100644
--- a/src/java/com/threerings/media/tile/bundle/tools/TileSetBundlerTask.java
+++ b/src/java/com/threerings/media/tile/bundle/tools/TileSetBundlerTask.java
@@ -1,7 +1,7 @@
 //
-// $Id: TileSetBundlerTask.java,v 1.1 2001/11/29 00:14:11 mdb Exp $
+// $Id: TileSetBundlerTask.java,v 1.2 2002/02/05 20:29:09 mdb Exp $
 
-package com.threerings.media.tools.tile.bundle;
+package com.threerings.media.tile.bundle.tools;
 
 import java.io.File;
 import java.io.IOException;
@@ -9,7 +9,7 @@ import java.io.IOException;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
 
-import com.threerings.media.tools.tile.MapFileTileSetIDBroker;
+import com.threerings.media.tile.tools.MapFileTileSetIDBroker;
 
 /**
  * Ant task for creating tilset bundles.
diff --git a/src/java/com/threerings/media/tile/tools/MapFileTileSetIDBroker.java b/src/java/com/threerings/media/tile/tools/MapFileTileSetIDBroker.java
index db34f6d69..7ba1f3e05 100644
--- a/src/java/com/threerings/media/tile/tools/MapFileTileSetIDBroker.java
+++ b/src/java/com/threerings/media/tile/tools/MapFileTileSetIDBroker.java
@@ -1,7 +1,7 @@
 //
-// $Id: MapFileTileSetIDBroker.java,v 1.1 2001/11/29 00:14:11 mdb Exp $
+// $Id: MapFileTileSetIDBroker.java,v 1.2 2002/02/05 20:29:09 mdb Exp $
 
-package com.threerings.media.tools.tile;
+package com.threerings.media.tile.tools;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/java/com/threerings/media/tile/tools/xml/ObjectTileSetRuleSet.java b/src/java/com/threerings/media/tile/tools/xml/ObjectTileSetRuleSet.java
index 2a12dcf09..075dcde5d 100644
--- a/src/java/com/threerings/media/tile/tools/xml/ObjectTileSetRuleSet.java
+++ b/src/java/com/threerings/media/tile/tools/xml/ObjectTileSetRuleSet.java
@@ -1,7 +1,7 @@
 //
-// $Id: ObjectTileSetRuleSet.java,v 1.3 2001/12/18 08:37:54 mdb Exp $
+// $Id: ObjectTileSetRuleSet.java,v 1.4 2002/02/05 20:29:09 mdb Exp $
 
-package com.threerings.media.tools.tile.xml;
+package com.threerings.media.tile.tools.xml;
 
 import java.awt.Dimension;
 import java.awt.Point;
diff --git a/src/java/com/threerings/media/tile/tools/xml/SwissArmyTileSetRuleSet.java b/src/java/com/threerings/media/tile/tools/xml/SwissArmyTileSetRuleSet.java
index ea59d27c4..660b72d51 100644
--- a/src/java/com/threerings/media/tile/tools/xml/SwissArmyTileSetRuleSet.java
+++ b/src/java/com/threerings/media/tile/tools/xml/SwissArmyTileSetRuleSet.java
@@ -1,7 +1,7 @@
 //
-// $Id: SwissArmyTileSetRuleSet.java,v 1.7 2001/11/29 21:58:15 mdb Exp $
+// $Id: SwissArmyTileSetRuleSet.java,v 1.8 2002/02/05 20:29:09 mdb Exp $
 
-package com.threerings.media.tools.tile.xml;
+package com.threerings.media.tile.tools.xml;
 
 import java.awt.Dimension;
 import java.awt.Point;
diff --git a/src/java/com/threerings/media/tile/tools/xml/TileSetRuleSet.java b/src/java/com/threerings/media/tile/tools/xml/TileSetRuleSet.java
index 009b9f5de..857910009 100644
--- a/src/java/com/threerings/media/tile/tools/xml/TileSetRuleSet.java
+++ b/src/java/com/threerings/media/tile/tools/xml/TileSetRuleSet.java
@@ -1,7 +1,7 @@
 //
-// $Id: TileSetRuleSet.java,v 1.5 2001/11/29 21:58:15 mdb Exp $
+// $Id: TileSetRuleSet.java,v 1.6 2002/02/05 20:29:10 mdb Exp $
 
-package com.threerings.media.tools.tile.xml;
+package com.threerings.media.tile.tools.xml;
 
 import org.xml.sax.Attributes;
 
diff --git a/src/java/com/threerings/media/tile/tools/xml/UniformTileSetRuleSet.java b/src/java/com/threerings/media/tile/tools/xml/UniformTileSetRuleSet.java
index 1bdf122ac..5f0a3a636 100644
--- a/src/java/com/threerings/media/tile/tools/xml/UniformTileSetRuleSet.java
+++ b/src/java/com/threerings/media/tile/tools/xml/UniformTileSetRuleSet.java
@@ -1,7 +1,7 @@
 //
-// $Id: UniformTileSetRuleSet.java,v 1.6 2001/11/29 21:58:15 mdb Exp $
+// $Id: UniformTileSetRuleSet.java,v 1.7 2002/02/05 20:29:10 mdb Exp $
 
-package com.threerings.media.tools.tile.xml;
+package com.threerings.media.tile.tools.xml;
 
 import org.xml.sax.Attributes;
 import org.apache.commons.digester.Digester;
diff --git a/src/java/com/threerings/media/tile/tools/xml/XMLTileSetParser.java b/src/java/com/threerings/media/tile/tools/xml/XMLTileSetParser.java
index 1e794f517..8d1995bed 100644
--- a/src/java/com/threerings/media/tile/tools/xml/XMLTileSetParser.java
+++ b/src/java/com/threerings/media/tile/tools/xml/XMLTileSetParser.java
@@ -1,7 +1,7 @@
 //
-// $Id: XMLTileSetParser.java,v 1.5 2001/11/29 21:58:15 mdb Exp $
+// $Id: XMLTileSetParser.java,v 1.6 2002/02/05 20:29:10 mdb Exp $
 
-package com.threerings.media.tools.tile.xml;
+package com.threerings.media.tile.tools.xml;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/java/com/threerings/miso/tile/tools/xml/BaseTileSetRuleSet.java b/src/java/com/threerings/miso/tile/tools/xml/BaseTileSetRuleSet.java
index a90360b83..df1a1fc9e 100644
--- a/src/java/com/threerings/miso/tile/tools/xml/BaseTileSetRuleSet.java
+++ b/src/java/com/threerings/miso/tile/tools/xml/BaseTileSetRuleSet.java
@@ -1,5 +1,5 @@
 //
-// $Id: BaseTileSetRuleSet.java,v 1.8 2002/02/02 01:09:53 mdb Exp $
+// $Id: BaseTileSetRuleSet.java,v 1.9 2002/02/05 20:29:10 mdb Exp $
 
 package com.threerings.miso.tile.tools.xml;
 
@@ -10,7 +10,7 @@ import com.samskivert.util.StringUtil;
 import com.samskivert.xml.CallMethodSpecialRule;
 
 import com.threerings.media.tile.TileSet;
-import com.threerings.media.tools.tile.xml.SwissArmyTileSetRuleSet;
+import com.threerings.media.tile.tools.xml.SwissArmyTileSetRuleSet;
 
 import com.threerings.miso.Log;
 import com.threerings.miso.tile.BaseTileSet;
diff --git a/tests/build.xml b/tests/build.xml
index 1e2aac08d..658b826f9 100644
--- a/tests/build.xml
+++ b/tests/build.xml
@@ -69,14 +69,14 @@
   <target name="cbundles" description="Build component bundles.">
     <!-- first build the metadata bundle -->
     <taskdef name="metabundle"
-      classname="com.threerings.cast.tools.bundle.MetadataBundlerTask"/>
+      classname="com.threerings.cast.bundle.tools.MetadataBundlerTask"/>
     <metabundle actiondef="${cbundle.dir}/actions.xml"
       classdef="${cbundle.dir}/classes.xml"
       target="${cbundle.dir}/metadata.jar"/>
 
     <!-- then a component bundle -->
     <taskdef name="cbundle"
-      classname="com.threerings.cast.tools.bundle.ComponentBundlerTask"/>
+      classname="com.threerings.cast.bundle.tools.ComponentBundlerTask"/>
     <cbundle target="${cbundle.dir}/components.jar"
       mapfile="${cbundle.dir}/components.map">
       <fileset dir="${cbundle.dir}" includes="**/*.png"/>
@@ -86,7 +86,7 @@
   <!-- test the tileset bundling process -->
   <target name="tsbundles" description="Build tileset bundles.">
     <taskdef name="tilebundle"
-      classname="com.threerings.media.tools.tile.bundle.TileSetBundlerTask"/>
+      classname="com.threerings.media.tile.bundle.tools.TileSetBundlerTask"/>
     <tilebundle config="${tbundle.dir}/bundler-config.xml"
       mapfile="${tbundle.dir}/tilesets.map"
       bundledef="${tbundle.dir}/ground/bundle.xml"
diff --git a/tests/rsrc/bundles/tiles/bundler-config.xml b/tests/rsrc/bundles/tiles/bundler-config.xml
index 178141886..19103b663 100644
--- a/tests/rsrc/bundles/tiles/bundler-config.xml
+++ b/tests/rsrc/bundles/tiles/bundler-config.xml
@@ -6,7 +6,7 @@
   <mapping>
     <path>bundle/base</path>
     <ruleset>
-      com.threerings.miso.tools.tile.xml.BaseTileSetRuleSet
+      com.threerings.miso.tile.tools.xml.BaseTileSetRuleSet
     </ruleset>
   </mapping>
 
@@ -14,7 +14,7 @@
   <mapping>
     <path>bundle/fringe</path>
     <ruleset>
-      com.threerings.media.tools.tile.xml.SwissArmyTileSetRuleSet
+      com.threerings.media.tile.tools.xml.SwissArmyTileSetRuleSet
     </ruleset>
   </mapping>
 
@@ -22,7 +22,7 @@
   <mapping>
     <path>bundle/object</path>
     <ruleset>
-      com.threerings.media.tools.tile.xml.ObjectTileSetRuleSet
+      com.threerings.media.tile.tools.xml.ObjectTileSetRuleSet
     </ruleset>
   </mapping>
 </bundler-config>
diff --git a/tests/src/java/com/threerings/media/tile/bundle/tools/BuildTestTileSetBundle.java b/tests/src/java/com/threerings/media/tile/bundle/tools/BuildTestTileSetBundle.java
index 9e4f1f666..cc20593a6 100644
--- a/tests/src/java/com/threerings/media/tile/bundle/tools/BuildTestTileSetBundle.java
+++ b/tests/src/java/com/threerings/media/tile/bundle/tools/BuildTestTileSetBundle.java
@@ -1,7 +1,7 @@
 //
-// $Id: BuildTestTileSetBundle.java,v 1.4 2001/12/13 01:35:51 mdb Exp $
+// $Id: BuildTestTileSetBundle.java,v 1.5 2002/02/05 20:29:09 mdb Exp $
 
-package com.threerings.media.tools.tile.bundle;
+package com.threerings.media.tile.bundle.tools;
 
 import java.io.File;
 import java.io.IOException;
@@ -64,11 +64,11 @@ public class BuildTestTileSetBundle
     }
 
     protected static final String CONFIG_PATH =
-        "rsrc/media/tools/tile/bundle/bundler-config.xml";
+        "rsrc/media/tile/bundle/tools/bundler-config.xml";
 
     protected static final String BUNDLE_DESC_PATH =
-        "rsrc/media/tools/tile/bundle/bundle.xml";
+        "rsrc/media/tile/bundle/tools/bundle.xml";
 
     protected static final String TARGET_PATH =
-        "rsrc/media/tools/tile/bundle/bundle.jar";
+        "rsrc/media/tile/bundle/tools/bundle.jar";
 }
diff --git a/tests/src/java/com/threerings/media/tile/tools/xml/XMLTileSetParserTest.java b/tests/src/java/com/threerings/media/tile/tools/xml/XMLTileSetParserTest.java
index 87bda4dd4..0aefc62a8 100644
--- a/tests/src/java/com/threerings/media/tile/tools/xml/XMLTileSetParserTest.java
+++ b/tests/src/java/com/threerings/media/tile/tools/xml/XMLTileSetParserTest.java
@@ -1,7 +1,7 @@
 //
-// $Id: XMLTileSetParserTest.java,v 1.2 2001/11/29 21:55:56 mdb Exp $
+// $Id: XMLTileSetParserTest.java,v 1.3 2002/02/05 20:29:09 mdb Exp $
 
-package com.threerings.media.tools.tile.xml;
+package com.threerings.media.tile.tools.xml;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -55,5 +55,5 @@ public class XMLTileSetParserTest extends TestCase
     }
 
     protected static final String TILESET_PATH =
-        "rsrc/media/tools/tile/xml/tilesets.xml";
+        "rsrc/media/tile/tools/xml/tilesets.xml";
 }