diff --git a/tests/src/java/com/threerings/miso/client/ScrollingFrame.java b/tests/src/java/com/threerings/miso/client/ScrollingFrame.java
index 4a263d24d..d8456426f 100644
--- a/tests/src/java/com/threerings/miso/client/ScrollingFrame.java
+++ b/tests/src/java/com/threerings/miso/client/ScrollingFrame.java
@@ -1,7 +1,7 @@
 //
-// $Id: ScrollingFrame.java,v 1.3 2002/04/23 01:19:04 mdb Exp $
+// $Id: ScrollingFrame.java,v 1.4 2003/01/31 23:11:07 mdb Exp $
 
-package com.threerings.miso.scene;
+package com.threerings.miso.client;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
diff --git a/tests/src/java/com/threerings/miso/client/ScrollingScene.java b/tests/src/java/com/threerings/miso/client/ScrollingScene.java
index 0aee7c192..bcc63d969 100644
--- a/tests/src/java/com/threerings/miso/client/ScrollingScene.java
+++ b/tests/src/java/com/threerings/miso/client/ScrollingScene.java
@@ -1,7 +1,7 @@
 //
-// $Id: ScrollingScene.java,v 1.10 2003/01/13 22:57:45 mdb Exp $
+// $Id: ScrollingScene.java,v 1.11 2003/01/31 23:11:07 mdb Exp $
 
-package com.threerings.miso.scene;
+package com.threerings.miso.client;
 
 import java.awt.Rectangle;
 
@@ -18,7 +18,7 @@ import com.threerings.media.tile.Tile;
 import com.threerings.media.tile.TileSet;
 import com.threerings.media.tile.TileSetRepository;
 
-import com.threerings.miso.scene.util.ObjectSet;
+import com.threerings.miso.client.util.ObjectSet;
 import com.threerings.miso.tile.BaseTile;
 import com.threerings.miso.tile.BaseTileSet;
 import com.threerings.miso.util.MisoContext;
diff --git a/tests/src/java/com/threerings/miso/client/ScrollingTestApp.java b/tests/src/java/com/threerings/miso/client/ScrollingTestApp.java
index d5e35d3d2..5539c5f0d 100644
--- a/tests/src/java/com/threerings/miso/client/ScrollingTestApp.java
+++ b/tests/src/java/com/threerings/miso/client/ScrollingTestApp.java
@@ -1,7 +1,7 @@
 //
-// $Id: ScrollingTestApp.java,v 1.18 2003/01/13 22:57:45 mdb Exp $
+// $Id: ScrollingTestApp.java,v 1.19 2003/01/31 23:11:07 mdb Exp $
 
-package com.threerings.miso.scene;
+package com.threerings.miso.client;
 
 import java.awt.DisplayMode;
 import java.awt.GraphicsConfiguration;
diff --git a/tests/src/java/com/threerings/miso/viewer/ViewerApp.java b/tests/src/java/com/threerings/miso/viewer/ViewerApp.java
index 94bea17f9..7817f9382 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.35 2003/01/13 22:57:46 mdb Exp $
+// $Id: ViewerApp.java,v 1.36 2003/01/31 23:11:07 mdb Exp $
 
 package com.threerings.miso.viewer;
 
@@ -21,10 +21,10 @@ import com.threerings.cast.CharacterManager;
 import com.threerings.cast.bundle.BundledComponentRepository;
 
 import com.threerings.miso.Log;
-import com.threerings.miso.scene.DisplayMisoSceneImpl;
-import com.threerings.miso.scene.MisoSceneModel;
-import com.threerings.miso.scene.tools.xml.MisoSceneParser;
+import com.threerings.miso.client.DisplayMisoSceneImpl;
+import com.threerings.miso.data.MisoSceneModel;
 import com.threerings.miso.tile.MisoTileManager;
+import com.threerings.miso.tools.xml.MisoSceneParser;
 import com.threerings.miso.util.MisoContext;
 
 /**
diff --git a/tests/src/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java b/tests/src/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java
index a44919f96..3f3e246df 100644
--- a/tests/src/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java
+++ b/tests/src/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java
@@ -1,5 +1,5 @@
 //
-// $Id: ViewerSceneViewPanel.java,v 1.54 2003/01/13 23:56:28 mdb Exp $
+// $Id: ViewerSceneViewPanel.java,v 1.55 2003/01/31 23:11:07 mdb Exp $
 
 package com.threerings.miso.viewer;
 
@@ -28,11 +28,11 @@ import com.threerings.media.util.PerformanceMonitor;
 import com.threerings.media.util.PerformanceObserver;
 
 import com.threerings.miso.Log;
-import com.threerings.miso.scene.DisplayMisoScene;
-import com.threerings.miso.scene.IsoSceneView;
-import com.threerings.miso.scene.IsoSceneViewModel;
-import com.threerings.miso.scene.SceneViewPanel;
-import com.threerings.miso.scene.util.IsoUtil;
+import com.threerings.miso.client.DisplayMisoScene;
+import com.threerings.miso.client.IsoSceneView;
+import com.threerings.miso.client.IsoSceneViewModel;
+import com.threerings.miso.client.SceneViewPanel;
+import com.threerings.miso.client.util.IsoUtil;
 import com.threerings.miso.util.MisoContext;
 
 public class ViewerSceneViewPanel extends SceneViewPanel