diff --git a/src/java/com/threerings/cast/ActionFrames.java b/src/java/com/threerings/cast/ActionFrames.java
index 168e4ddee..66444ef75 100644
--- a/src/java/com/threerings/cast/ActionFrames.java
+++ b/src/java/com/threerings/cast/ActionFrames.java
@@ -1,12 +1,11 @@
 //
-// $Id: ActionFrames.java,v 1.5 2002/06/26 23:53:06 mdb Exp $
+// $Id: ActionFrames.java,v 1.6 2002/09/17 19:11:13 mdb Exp $
 
 package com.threerings.cast;
 
 import java.awt.Graphics;
 import java.awt.Image;
 
-import com.threerings.media.sprite.MultiFrameImage;
 import com.threerings.media.util.Colorization;
 import com.threerings.util.DirectionCodes;
 
diff --git a/src/java/com/threerings/cast/CompositedActionFrames.java b/src/java/com/threerings/cast/CompositedActionFrames.java
index 1a63a2eaa..95979efe5 100644
--- a/src/java/com/threerings/cast/CompositedActionFrames.java
+++ b/src/java/com/threerings/cast/CompositedActionFrames.java
@@ -1,5 +1,5 @@
 //
-// $Id: CompositedActionFrames.java,v 1.7 2002/06/26 23:53:06 mdb Exp $
+// $Id: CompositedActionFrames.java,v 1.8 2002/09/17 19:11:13 mdb Exp $
 
 package com.threerings.cast;
 
@@ -9,9 +9,9 @@ import java.awt.Rectangle;
 
 import com.samskivert.util.StringUtil;
 
-import com.threerings.media.sprite.MultiFrameImage;
 import com.threerings.media.util.Colorization;
 import com.threerings.media.util.ImageUtil;
+import com.threerings.media.util.MultiFrameImage;
 
 import com.threerings.util.DirectionCodes;
 
diff --git a/src/java/com/threerings/cast/TrimmedMultiFrameImage.java b/src/java/com/threerings/cast/TrimmedMultiFrameImage.java
index 1d33617d6..ecba6d953 100644
--- a/src/java/com/threerings/cast/TrimmedMultiFrameImage.java
+++ b/src/java/com/threerings/cast/TrimmedMultiFrameImage.java
@@ -1,11 +1,11 @@
 //
-// $Id: TrimmedMultiFrameImage.java,v 1.1 2002/06/19 23:31:57 mdb Exp $
+// $Id: TrimmedMultiFrameImage.java,v 1.2 2002/09/17 19:11:13 mdb Exp $
 
 package com.threerings.cast;
 
 import java.awt.Rectangle;
 
-import com.threerings.media.sprite.MultiFrameImage;
+import com.threerings.media.util.MultiFrameImage;
 
 /**
  * Used to generate more memory efficient composited images in
diff --git a/src/java/com/threerings/cast/bundle/BundledComponentRepository.java b/src/java/com/threerings/cast/bundle/BundledComponentRepository.java
index 266827c9f..78f78b64b 100644
--- a/src/java/com/threerings/cast/bundle/BundledComponentRepository.java
+++ b/src/java/com/threerings/cast/bundle/BundledComponentRepository.java
@@ -1,5 +1,5 @@
 //
-// $Id: BundledComponentRepository.java,v 1.17 2002/08/13 23:09:25 shaper Exp $
+// $Id: BundledComponentRepository.java,v 1.18 2002/09/17 19:11:13 mdb Exp $
 
 package com.threerings.cast.bundle;
 
@@ -31,8 +31,7 @@ import com.threerings.resource.ResourceManager;
 import com.threerings.media.ImageManager;
 import com.threerings.media.util.Colorization;
 import com.threerings.media.util.ImageUtil;
-
-import com.threerings.media.sprite.MultiFrameImage;
+import com.threerings.media.util.MultiFrameImage;
 
 import com.threerings.media.tile.ImageProvider;
 import com.threerings.media.tile.NoSuchTileException;
diff --git a/src/java/com/threerings/media/sprite/ImageSprite.java b/src/java/com/threerings/media/sprite/ImageSprite.java
index c0f8579d7..06f228e21 100644
--- a/src/java/com/threerings/media/sprite/ImageSprite.java
+++ b/src/java/com/threerings/media/sprite/ImageSprite.java
@@ -1,5 +1,5 @@
 //
-// $Id: ImageSprite.java,v 1.11 2002/09/17 02:34:05 ray Exp $
+// $Id: ImageSprite.java,v 1.12 2002/09/17 19:11:13 mdb Exp $
 
 package com.threerings.media.sprite;
 
@@ -16,6 +16,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 
 import com.threerings.media.Log;
+import com.threerings.media.util.MultiFrameImage;
 
 /**
  * Extends the sprite class to support rendering the sprite with one or
diff --git a/src/java/com/threerings/media/util/MultiFrameImage.java b/src/java/com/threerings/media/util/MultiFrameImage.java
index 348b1a132..3d8cc7ff1 100644
--- a/src/java/com/threerings/media/util/MultiFrameImage.java
+++ b/src/java/com/threerings/media/util/MultiFrameImage.java
@@ -1,7 +1,7 @@
 //
-// $Id: MultiFrameImage.java,v 1.2 2002/05/04 19:35:31 mdb Exp $
+// $Id: MultiFrameImage.java,v 1.3 2002/09/17 19:11:13 mdb Exp $
 
-package com.threerings.media.sprite;
+package com.threerings.media.util;
 
 import java.awt.Graphics;
 import java.awt.Image;
diff --git a/src/java/com/threerings/media/util/MultiFrameImageImpl.java b/src/java/com/threerings/media/util/MultiFrameImageImpl.java
index 775551399..512fa7f98 100644
--- a/src/java/com/threerings/media/util/MultiFrameImageImpl.java
+++ b/src/java/com/threerings/media/util/MultiFrameImageImpl.java
@@ -1,7 +1,7 @@
 //
-// $Id: MultiFrameImageImpl.java,v 1.2 2002/05/04 19:35:31 mdb Exp $
+// $Id: MultiFrameImageImpl.java,v 1.3 2002/09/17 19:11:13 mdb Exp $
 
-package com.threerings.media.sprite;
+package com.threerings.media.util;
 
 import java.awt.Graphics;
 import java.awt.Image;
@@ -10,7 +10,7 @@ import com.threerings.media.util.ImageUtil;
 
 /**
  * A basic implementation of the {@link MultiFrameImage} interface
- * intended to facilitate the creation of sprites whose display frames
+ * intended to facilitate the creation of MFIs whose display frames
  * consist of multiple image objects.
  */
 public class MultiFrameImageImpl implements MultiFrameImage
diff --git a/src/java/com/threerings/media/util/SingleFrameImageImpl.java b/src/java/com/threerings/media/util/SingleFrameImageImpl.java
index 04bdf6b9e..944c5e6f0 100644
--- a/src/java/com/threerings/media/util/SingleFrameImageImpl.java
+++ b/src/java/com/threerings/media/util/SingleFrameImageImpl.java
@@ -1,7 +1,7 @@
 //
-// $Id: SingleFrameImageImpl.java,v 1.2 2002/05/04 19:35:31 mdb Exp $
+// $Id: SingleFrameImageImpl.java,v 1.3 2002/09/17 19:11:13 mdb Exp $
 
-package com.threerings.media.sprite;
+package com.threerings.media.util;
 
 import java.awt.Graphics;
 import java.awt.Image;
@@ -9,10 +9,9 @@ import java.awt.Image;
 import com.threerings.media.util.ImageUtil;
 
 /**
- * The single frame image class is a basic implementation of the
- * {@link MultiFrameImage} interface intended to facilitate the
- * creation of sprites whose display frames consist of only a single
- * image.
+ * The single frame image class is a basic implementation of the {@link
+ * MultiFrameImage} interface intended to facilitate the creation of MFIs
+ * whose display frames consist of only a single image.
  */
 public class SingleFrameImageImpl implements MultiFrameImage
 {
diff --git a/tests/src/java/com/threerings/miso/client/ScrollingTestApp.java b/tests/src/java/com/threerings/miso/client/ScrollingTestApp.java
index a03526c47..4b235079e 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.16 2002/07/19 20:13:30 shaper Exp $
+// $Id: ScrollingTestApp.java,v 1.17 2002/09/17 19:11:13 mdb Exp $
 
 package com.threerings.miso.scene;
 
@@ -17,18 +17,19 @@ import com.samskivert.swing.util.SwingUtil;
 import com.samskivert.util.Config;
 
 import com.threerings.resource.ResourceManager;
+
 import com.threerings.media.FrameManager;
 import com.threerings.media.ImageManager;
+import com.threerings.media.util.LinePath;
+import com.threerings.media.util.MultiFrameImage;
+import com.threerings.media.util.MultiFrameImageImpl;
 
-import com.threerings.media.sprite.MultiFrameImage;
-import com.threerings.media.sprite.MultiFrameImageImpl;
 import com.threerings.media.sprite.PathCompletedEvent;
 import com.threerings.media.sprite.Sprite;
 import com.threerings.media.sprite.SpriteEvent;
 import com.threerings.media.sprite.SpriteObserver;
 
 import com.threerings.media.tile.bundle.BundledTileSetRepository;
-import com.threerings.media.util.LinePath;
 
 import com.threerings.cast.CharacterComponent;
 import com.threerings.cast.CharacterDescriptor;