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 6aa77a1dd..1d2a723b7 100644
--- a/src/java/com/threerings/media/tile/bundle/tools/DumpBundle.java
+++ b/src/java/com/threerings/media/tile/bundle/tools/DumpBundle.java
@@ -1,5 +1,5 @@
 //
-// $Id: DumpBundle.java,v 1.6 2002/02/05 20:29:09 mdb Exp $
+// $Id: DumpBundle.java,v 1.7 2002/07/19 20:13:04 shaper Exp $
 
 package com.threerings.media.tile.bundle.tools;
 
@@ -33,7 +33,7 @@ public class DumpBundle
 
         // create a resource and image manager in case they want to dump
         // the tiles
-        ResourceManager rmgr = new ResourceManager("rsrc", null, null);
+        ResourceManager rmgr = new ResourceManager("rsrc");
         ImageManager imgr = new ImageManager(rmgr, null);
 
         for (int i = 0; i < args.length; i++) {
diff --git a/tests/src/java/com/threerings/cast/CharSpriteViz.java b/tests/src/java/com/threerings/cast/CharSpriteViz.java
index 32f740309..0f92ac37a 100644
--- a/tests/src/java/com/threerings/cast/CharSpriteViz.java
+++ b/tests/src/java/com/threerings/cast/CharSpriteViz.java
@@ -1,5 +1,5 @@
 //
-// $Id: CharSpriteViz.java,v 1.1 2002/06/26 23:53:07 mdb Exp $
+// $Id: CharSpriteViz.java,v 1.2 2002/07/19 20:13:29 shaper Exp $
 
 package com.threerings.cast;
 
@@ -102,8 +102,8 @@ public class CharSpriteViz extends JPanel
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
         try {
-            ResourceManager rmgr = new ResourceManager(
-                "rsrc", null, "config/resource/manager.properties");
+            ResourceManager rmgr = new ResourceManager("rsrc");
+            rmgr.initBundles(null, "config/resource/manager.properties", null);
             ImageManager imgr = new ImageManager(rmgr, frame);
             ComponentRepository crepo =
                 new BundledComponentRepository(rmgr, imgr, "components");
diff --git a/tests/src/java/com/threerings/cast/builder/TestApp.java b/tests/src/java/com/threerings/cast/builder/TestApp.java
index 075867d24..8cf7228f6 100644
--- a/tests/src/java/com/threerings/cast/builder/TestApp.java
+++ b/tests/src/java/com/threerings/cast/builder/TestApp.java
@@ -1,5 +1,5 @@
 //
-// $Id: TestApp.java,v 1.14 2002/06/19 23:24:19 mdb Exp $
+// $Id: TestApp.java,v 1.15 2002/07/19 20:13:29 shaper Exp $
 
 package com.threerings.cast.builder;
 
@@ -27,8 +27,8 @@ public class TestApp
         _frame.setSize(800, 600);
         SwingUtil.centerWindow(_frame);
 
-        ResourceManager rmgr = new ResourceManager(
-            "rsrc", null, "config/resource/manager.properties");
+        ResourceManager rmgr = new ResourceManager("rsrc");
+        rmgr.initBundles(null, "config/resource/manager.properties", null);
         ImageManager imgr = new ImageManager(rmgr, _frame);
 
         ComponentRepository crepo =
diff --git a/tests/src/java/com/threerings/cast/bundle/BundledComponentRepositoryTest.java b/tests/src/java/com/threerings/cast/bundle/BundledComponentRepositoryTest.java
index 15338ac16..9a8fa7685 100644
--- a/tests/src/java/com/threerings/cast/bundle/BundledComponentRepositoryTest.java
+++ b/tests/src/java/com/threerings/cast/bundle/BundledComponentRepositoryTest.java
@@ -1,5 +1,5 @@
 //
-// $Id: BundledComponentRepositoryTest.java,v 1.6 2002/02/09 07:50:04 mdb Exp $
+// $Id: BundledComponentRepositoryTest.java,v 1.7 2002/07/19 20:13:29 shaper Exp $
 
 package com.threerings.cast.bundle;
 
@@ -22,8 +22,8 @@ public class BundledComponentRepositoryTest extends TestCase
     public void runTest ()
     {
         try {
-            ResourceManager rmgr = new ResourceManager(
-                "rsrc", null, "config/resource/manager.properties");
+            ResourceManager rmgr = new ResourceManager("rsrc");
+            rmgr.initBundles(null, "config/resource/manager.properties", null);
             ImageManager imgr = new ImageManager(rmgr, null);
             BundledComponentRepository repo =
                 new BundledComponentRepository(rmgr, imgr, "components");
diff --git a/tests/src/java/com/threerings/media/TestIconManager.java b/tests/src/java/com/threerings/media/TestIconManager.java
index 6a42806c7..cc05f2f13 100644
--- a/tests/src/java/com/threerings/media/TestIconManager.java
+++ b/tests/src/java/com/threerings/media/TestIconManager.java
@@ -1,5 +1,5 @@
 //
-// $Id: TestIconManager.java,v 1.1 2002/02/03 22:43:54 mdb Exp $
+// $Id: TestIconManager.java,v 1.2 2002/07/19 20:13:29 shaper Exp $
 
 package com.threerings.media;
 
@@ -23,7 +23,7 @@ public class TestIconManager
             JFrame frame = new JFrame("TestIconManager");
             frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
-            ResourceManager rmgr = new ResourceManager("rsrc", null, null);
+            ResourceManager rmgr = new ResourceManager("rsrc");
             ImageManager imgr = new ImageManager(rmgr, frame);
             TileManager tmgr = new TileManager(imgr);
             IconManager iconmgr = new IconManager(
diff --git a/tests/src/java/com/threerings/media/tile/bundle/BundledTileSetRepositoryTest.java b/tests/src/java/com/threerings/media/tile/bundle/BundledTileSetRepositoryTest.java
index 988773cbd..177aa3794 100644
--- a/tests/src/java/com/threerings/media/tile/bundle/BundledTileSetRepositoryTest.java
+++ b/tests/src/java/com/threerings/media/tile/bundle/BundledTileSetRepositoryTest.java
@@ -1,5 +1,5 @@
 //
-// $Id: BundledTileSetRepositoryTest.java,v 1.6 2002/02/09 07:50:04 mdb Exp $
+// $Id: BundledTileSetRepositoryTest.java,v 1.7 2002/07/19 20:13:30 shaper Exp $
 
 package com.threerings.media.tile.bundle;
 
@@ -20,8 +20,8 @@ public class BundledTileSetRepositoryTest extends TestCase
     public void runTest ()
     {
         try {
-            ResourceManager rmgr = new ResourceManager(
-                "rsrc", null, "config/resource/manager.properties");
+            ResourceManager rmgr = new ResourceManager("rsrc");
+            rmgr.initBundles(null, "config/resource/manager.properties", null);
             ImageManager imgr = new ImageManager(rmgr, null);
             BundledTileSetRepository repo =
                 new BundledTileSetRepository(rmgr, imgr, "tilesets");
diff --git a/tests/src/java/com/threerings/miso/client/ScrollingTestApp.java b/tests/src/java/com/threerings/miso/client/ScrollingTestApp.java
index b9f7e3a6a..a03526c47 100644
--- a/tests/src/java/com/threerings/miso/client/ScrollingTestApp.java
+++ b/tests/src/java/com/threerings/miso/client/ScrollingTestApp.java
@@ -1,5 +1,5 @@
 //
-// $Id: ScrollingTestApp.java,v 1.15 2002/06/18 22:38:55 mdb Exp $
+// $Id: ScrollingTestApp.java,v 1.16 2002/07/19 20:13:30 shaper Exp $
 
 package com.threerings.miso.scene;
 
@@ -77,8 +77,8 @@ public class ScrollingTestApp
         _framemgr = new FrameManager(_frame);
 
         // we don't need to configure anything
-        ResourceManager rmgr = new ResourceManager(
-            "rsrc", null, "config/resource/manager.properties");
+        ResourceManager rmgr = new ResourceManager("rsrc");
+        rmgr.initBundles(null, "config/resource/manager.properties", null);
         ImageManager imgr = new ImageManager(rmgr, _frame);
 	_tilemgr = new MisoTileManager(rmgr, imgr);
         _tilemgr.setTileSetRepository(
diff --git a/tests/src/java/com/threerings/miso/viewer/ViewerApp.java b/tests/src/java/com/threerings/miso/viewer/ViewerApp.java
index 4fcb8a821..c7ae5aacb 100644
--- a/tests/src/java/com/threerings/miso/viewer/ViewerApp.java
+++ b/tests/src/java/com/threerings/miso/viewer/ViewerApp.java
@@ -1,5 +1,5 @@
 //
-// $Id: ViewerApp.java,v 1.33 2002/05/03 04:17:25 mdb Exp $
+// $Id: ViewerApp.java,v 1.34 2002/07/19 20:13:30 shaper Exp $
 
 package com.threerings.miso.viewer;
 
@@ -68,8 +68,8 @@ public class ViewerApp
         _framemgr = new FrameManager(_frame);
 
         // we don't need to configure anything
-        ResourceManager rmgr = new ResourceManager(
-            "rsrc", null, "config/resource/manager.properties");
+        ResourceManager rmgr = new ResourceManager("rsrc");
+        rmgr.initBundles(null, "config/resource/manager.properties", null);
         ImageManager imgr = new ImageManager(rmgr, _frame);
 	_tilemgr = new MisoTileManager(rmgr, imgr);
         _tilemgr.setTileSetRepository(