diff --git a/src/java/com/threerings/parlor/data/Table.java b/src/java/com/threerings/parlor/data/Table.java
index f64ccbce7..231fd7956 100644
--- a/src/java/com/threerings/parlor/data/Table.java
+++ b/src/java/com/threerings/parlor/data/Table.java
@@ -1,5 +1,5 @@
 //
-// $Id: Table.java,v 1.6 2001/10/23 23:47:02 mdb Exp $
+// $Id: Table.java,v 1.7 2002/02/01 23:32:37 mdb Exp $
 
 package com.threerings.parlor.data;
 
@@ -10,7 +10,7 @@ import java.io.DataOutputStream;
 import com.samskivert.util.StringUtil;
 
 import com.threerings.presents.dobj.DSet;
-import com.threerings.presents.dobj.io.ValueMarshaller;
+import com.threerings.presents.io.ValueMarshaller;
 
 import com.threerings.parlor.client.ParlorCodes;
 import com.threerings.parlor.game.GameConfig;
diff --git a/src/java/com/threerings/presents/dobj/AttributeChangedEvent.java b/src/java/com/threerings/presents/dobj/AttributeChangedEvent.java
index e0b037658..df2332694 100644
--- a/src/java/com/threerings/presents/dobj/AttributeChangedEvent.java
+++ b/src/java/com/threerings/presents/dobj/AttributeChangedEvent.java
@@ -1,5 +1,5 @@
 //
-// $Id: AttributeChangedEvent.java,v 1.10 2001/10/12 00:03:03 mdb Exp $
+// $Id: AttributeChangedEvent.java,v 1.11 2002/02/01 23:32:37 mdb Exp $
 
 package com.threerings.presents.dobj;
 
@@ -8,7 +8,7 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Method;
 
-import com.threerings.presents.dobj.io.ValueMarshaller;
+import com.threerings.presents.io.ValueMarshaller;
 
 /**
  * An attribute changed event is dispatched when a single attribute of a
diff --git a/src/java/com/threerings/presents/dobj/AttributesChangedEvent.java b/src/java/com/threerings/presents/dobj/AttributesChangedEvent.java
index 263fd14ef..33d8d163a 100644
--- a/src/java/com/threerings/presents/dobj/AttributesChangedEvent.java
+++ b/src/java/com/threerings/presents/dobj/AttributesChangedEvent.java
@@ -1,5 +1,5 @@
 //
-// $Id: AttributesChangedEvent.java,v 1.8 2001/10/11 04:07:52 mdb Exp $
+// $Id: AttributesChangedEvent.java,v 1.9 2002/02/01 23:32:37 mdb Exp $
 
 package com.threerings.presents.dobj;
 
@@ -8,7 +8,7 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 
 import com.samskivert.util.StringUtil;
-import com.threerings.presents.dobj.io.ValueMarshaller;
+import com.threerings.presents.io.ValueMarshaller;
 
 /**
  * An attribute<em>s</em> changed event is dispatched when multiple
diff --git a/src/java/com/threerings/presents/dobj/EntryRemovedEvent.java b/src/java/com/threerings/presents/dobj/EntryRemovedEvent.java
index c75691de5..4a1c78058 100644
--- a/src/java/com/threerings/presents/dobj/EntryRemovedEvent.java
+++ b/src/java/com/threerings/presents/dobj/EntryRemovedEvent.java
@@ -1,5 +1,5 @@
 //
-// $Id: EntryRemovedEvent.java,v 1.6 2001/10/12 00:03:03 mdb Exp $
+// $Id: EntryRemovedEvent.java,v 1.7 2002/02/01 23:32:37 mdb Exp $
 
 package com.threerings.presents.dobj;
 
@@ -7,7 +7,7 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import com.threerings.presents.dobj.io.ValueMarshaller;
+import com.threerings.presents.io.ValueMarshaller;
 
 /**
  * An element removed event is dispatched when an element is removed from
diff --git a/src/java/com/threerings/presents/dobj/MessageEvent.java b/src/java/com/threerings/presents/dobj/MessageEvent.java
index 5f945f642..2da1bb261 100644
--- a/src/java/com/threerings/presents/dobj/MessageEvent.java
+++ b/src/java/com/threerings/presents/dobj/MessageEvent.java
@@ -1,5 +1,5 @@
 //
-// $Id: MessageEvent.java,v 1.7 2001/10/12 00:03:03 mdb Exp $
+// $Id: MessageEvent.java,v 1.8 2002/02/01 23:32:37 mdb Exp $
 
 package com.threerings.presents.dobj;
 
@@ -9,7 +9,7 @@ import java.io.IOException;
 import java.lang.reflect.Method;
 
 import com.samskivert.util.StringUtil;
-import com.threerings.presents.dobj.io.ValueMarshaller;
+import com.threerings.presents.io.ValueMarshaller;
 
 /**
  * A message event is used to dispatch a message to all subscribers of a
diff --git a/src/java/com/threerings/presents/dobj/ReleaseLockEvent.java b/src/java/com/threerings/presents/dobj/ReleaseLockEvent.java
index c0e076d31..a541f1daa 100644
--- a/src/java/com/threerings/presents/dobj/ReleaseLockEvent.java
+++ b/src/java/com/threerings/presents/dobj/ReleaseLockEvent.java
@@ -1,5 +1,5 @@
 //
-// $Id: ReleaseLockEvent.java,v 1.4 2001/10/11 04:07:52 mdb Exp $
+// $Id: ReleaseLockEvent.java,v 1.5 2002/02/01 23:32:37 mdb Exp $
 
 package com.threerings.presents.dobj;
 
@@ -8,8 +8,6 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Method;
 
-import com.threerings.presents.dobj.io.ValueMarshaller;
-
 /**
  * A release lock event is dispatched at the end of a chain of events to
  * release a lock that is intended to prevent some application defined
diff --git a/src/java/com/threerings/presents/dobj/io/DObjectFactory.java b/src/java/com/threerings/presents/dobj/io/DObjectFactory.java
index 00c594e5a..2d1603542 100644
--- a/src/java/com/threerings/presents/dobj/io/DObjectFactory.java
+++ b/src/java/com/threerings/presents/dobj/io/DObjectFactory.java
@@ -1,5 +1,5 @@
 //
-// $Id: DObjectFactory.java,v 1.10 2002/02/01 23:26:49 mdb Exp $
+// $Id: DObjectFactory.java,v 1.11 2002/02/01 23:32:37 mdb Exp $
 
 package com.threerings.presents.dobj.io;
 
@@ -9,6 +9,7 @@ import java.io.DataOutputStream;
 
 import com.threerings.presents.Log;
 import com.threerings.presents.dobj.DObject;
+import com.threerings.presents.io.Marshaller;
 import com.threerings.presents.io.ObjectStreamException;
 
 /**
diff --git a/src/java/com/threerings/presents/io/BooleanFieldMarshaller.java b/src/java/com/threerings/presents/io/BooleanFieldMarshaller.java
index e39d26095..ba484b8f7 100644
--- a/src/java/com/threerings/presents/io/BooleanFieldMarshaller.java
+++ b/src/java/com/threerings/presents/io/BooleanFieldMarshaller.java
@@ -1,7 +1,7 @@
 //
-// $Id: BooleanFieldMarshaller.java,v 1.5 2002/02/01 23:26:49 mdb Exp $
+// $Id: BooleanFieldMarshaller.java,v 1.6 2002/02/01 23:32:37 mdb Exp $
 
-package com.threerings.presents.dobj.io;
+package com.threerings.presents.io;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/src/java/com/threerings/presents/io/DSetFieldMarshaller.java b/src/java/com/threerings/presents/io/DSetFieldMarshaller.java
index 21098b9e6..576b8b7dc 100644
--- a/src/java/com/threerings/presents/io/DSetFieldMarshaller.java
+++ b/src/java/com/threerings/presents/io/DSetFieldMarshaller.java
@@ -1,7 +1,7 @@
 //
-// $Id: DSetFieldMarshaller.java,v 1.3 2002/02/01 23:26:49 mdb Exp $
+// $Id: DSetFieldMarshaller.java,v 1.4 2002/02/01 23:32:37 mdb Exp $
 
-package com.threerings.presents.dobj.io;
+package com.threerings.presents.io;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/src/java/com/threerings/presents/io/DoubleFieldMarshaller.java b/src/java/com/threerings/presents/io/DoubleFieldMarshaller.java
index cc9f347df..239eb5a23 100644
--- a/src/java/com/threerings/presents/io/DoubleFieldMarshaller.java
+++ b/src/java/com/threerings/presents/io/DoubleFieldMarshaller.java
@@ -1,7 +1,7 @@
 //
-// $Id: DoubleFieldMarshaller.java,v 1.5 2002/02/01 23:26:49 mdb Exp $
+// $Id: DoubleFieldMarshaller.java,v 1.6 2002/02/01 23:32:37 mdb Exp $
 
-package com.threerings.presents.dobj.io;
+package com.threerings.presents.io;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/src/java/com/threerings/presents/io/FieldMarshaller.java b/src/java/com/threerings/presents/io/FieldMarshaller.java
index e5f398e62..c5601c83d 100644
--- a/src/java/com/threerings/presents/io/FieldMarshaller.java
+++ b/src/java/com/threerings/presents/io/FieldMarshaller.java
@@ -1,7 +1,7 @@
 //
-// $Id: FieldMarshaller.java,v 1.5 2002/02/01 23:26:49 mdb Exp $
+// $Id: FieldMarshaller.java,v 1.6 2002/02/01 23:32:37 mdb Exp $
 
-package com.threerings.presents.dobj.io;
+package com.threerings.presents.io;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/src/java/com/threerings/presents/io/FieldMarshallerRegistry.java b/src/java/com/threerings/presents/io/FieldMarshallerRegistry.java
index 165426c1a..e4f9e1a07 100644
--- a/src/java/com/threerings/presents/io/FieldMarshallerRegistry.java
+++ b/src/java/com/threerings/presents/io/FieldMarshallerRegistry.java
@@ -1,7 +1,7 @@
 //
-// $Id: FieldMarshallerRegistry.java,v 1.10 2001/10/17 02:56:51 mdb Exp $
+// $Id: FieldMarshallerRegistry.java,v 1.11 2002/02/01 23:32:37 mdb Exp $
 
-package com.threerings.presents.dobj.io;
+package com.threerings.presents.io;
 
 import java.lang.reflect.Field;
 import java.util.Hashtable;
diff --git a/src/java/com/threerings/presents/io/FloatFieldMarshaller.java b/src/java/com/threerings/presents/io/FloatFieldMarshaller.java
index ed883bea9..581cfdd3a 100644
--- a/src/java/com/threerings/presents/io/FloatFieldMarshaller.java
+++ b/src/java/com/threerings/presents/io/FloatFieldMarshaller.java
@@ -1,7 +1,7 @@
 //
-// $Id: FloatFieldMarshaller.java,v 1.5 2002/02/01 23:26:49 mdb Exp $
+// $Id: FloatFieldMarshaller.java,v 1.6 2002/02/01 23:32:37 mdb Exp $
 
-package com.threerings.presents.dobj.io;
+package com.threerings.presents.io;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/src/java/com/threerings/presents/io/IntArrayFieldMarshaller.java b/src/java/com/threerings/presents/io/IntArrayFieldMarshaller.java
index a4b8e0056..8f197e9df 100644
--- a/src/java/com/threerings/presents/io/IntArrayFieldMarshaller.java
+++ b/src/java/com/threerings/presents/io/IntArrayFieldMarshaller.java
@@ -1,7 +1,7 @@
 //
-// $Id: IntArrayFieldMarshaller.java,v 1.2 2002/02/01 23:26:49 mdb Exp $
+// $Id: IntArrayFieldMarshaller.java,v 1.3 2002/02/01 23:32:37 mdb Exp $
 
-package com.threerings.presents.dobj.io;
+package com.threerings.presents.io;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/src/java/com/threerings/presents/io/IntFieldMarshaller.java b/src/java/com/threerings/presents/io/IntFieldMarshaller.java
index d3a2f3140..202817c13 100644
--- a/src/java/com/threerings/presents/io/IntFieldMarshaller.java
+++ b/src/java/com/threerings/presents/io/IntFieldMarshaller.java
@@ -1,7 +1,7 @@
 //
-// $Id: IntFieldMarshaller.java,v 1.5 2002/02/01 23:26:49 mdb Exp $
+// $Id: IntFieldMarshaller.java,v 1.6 2002/02/01 23:32:37 mdb Exp $
 
-package com.threerings.presents.dobj.io;
+package com.threerings.presents.io;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/src/java/com/threerings/presents/io/LongFieldMarshaller.java b/src/java/com/threerings/presents/io/LongFieldMarshaller.java
index 92ed792e1..68cdd2f65 100644
--- a/src/java/com/threerings/presents/io/LongFieldMarshaller.java
+++ b/src/java/com/threerings/presents/io/LongFieldMarshaller.java
@@ -1,7 +1,7 @@
 //
-// $Id: LongFieldMarshaller.java,v 1.5 2002/02/01 23:26:49 mdb Exp $
+// $Id: LongFieldMarshaller.java,v 1.6 2002/02/01 23:32:37 mdb Exp $
 
-package com.threerings.presents.dobj.io;
+package com.threerings.presents.io;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/src/java/com/threerings/presents/io/Marshaller.java b/src/java/com/threerings/presents/io/Marshaller.java
index a40452fb6..949a7c49f 100644
--- a/src/java/com/threerings/presents/io/Marshaller.java
+++ b/src/java/com/threerings/presents/io/Marshaller.java
@@ -1,7 +1,7 @@
 //
-// $Id: Marshaller.java,v 1.7 2002/02/01 23:26:49 mdb Exp $
+// $Id: Marshaller.java,v 1.8 2002/02/01 23:32:37 mdb Exp $
 
-package com.threerings.presents.dobj.io;
+package com.threerings.presents.io;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/src/java/com/threerings/presents/io/OidListFieldMarshaller.java b/src/java/com/threerings/presents/io/OidListFieldMarshaller.java
index 5590c5926..799379042 100644
--- a/src/java/com/threerings/presents/io/OidListFieldMarshaller.java
+++ b/src/java/com/threerings/presents/io/OidListFieldMarshaller.java
@@ -1,7 +1,7 @@
 //
-// $Id: OidListFieldMarshaller.java,v 1.3 2002/02/01 23:26:49 mdb Exp $
+// $Id: OidListFieldMarshaller.java,v 1.4 2002/02/01 23:32:37 mdb Exp $
 
-package com.threerings.presents.dobj.io;
+package com.threerings.presents.io;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/src/java/com/threerings/presents/io/ShortFieldMarshaller.java b/src/java/com/threerings/presents/io/ShortFieldMarshaller.java
index 4ec29ee8c..eb5a66f97 100644
--- a/src/java/com/threerings/presents/io/ShortFieldMarshaller.java
+++ b/src/java/com/threerings/presents/io/ShortFieldMarshaller.java
@@ -1,7 +1,7 @@
 //
-// $Id: ShortFieldMarshaller.java,v 1.5 2002/02/01 23:26:49 mdb Exp $
+// $Id: ShortFieldMarshaller.java,v 1.6 2002/02/01 23:32:37 mdb Exp $
 
-package com.threerings.presents.dobj.io;
+package com.threerings.presents.io;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/src/java/com/threerings/presents/io/StreamableFieldMarshaller.java b/src/java/com/threerings/presents/io/StreamableFieldMarshaller.java
index e3a58af47..b444e0313 100644
--- a/src/java/com/threerings/presents/io/StreamableFieldMarshaller.java
+++ b/src/java/com/threerings/presents/io/StreamableFieldMarshaller.java
@@ -1,7 +1,7 @@
 //
-// $Id: StreamableFieldMarshaller.java,v 1.2 2002/02/01 23:26:49 mdb Exp $
+// $Id: StreamableFieldMarshaller.java,v 1.3 2002/02/01 23:32:37 mdb Exp $
 
-package com.threerings.presents.dobj.io;
+package com.threerings.presents.io;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/src/java/com/threerings/presents/io/StringArrayFieldMarshaller.java b/src/java/com/threerings/presents/io/StringArrayFieldMarshaller.java
index 88ad7d00e..bb10759bd 100644
--- a/src/java/com/threerings/presents/io/StringArrayFieldMarshaller.java
+++ b/src/java/com/threerings/presents/io/StringArrayFieldMarshaller.java
@@ -1,7 +1,7 @@
 //
-// $Id: StringArrayFieldMarshaller.java,v 1.3 2002/02/01 23:26:49 mdb Exp $
+// $Id: StringArrayFieldMarshaller.java,v 1.4 2002/02/01 23:32:37 mdb Exp $
 
-package com.threerings.presents.dobj.io;
+package com.threerings.presents.io;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/src/java/com/threerings/presents/io/StringFieldMarshaller.java b/src/java/com/threerings/presents/io/StringFieldMarshaller.java
index 47c8b9fd0..476e90fcf 100644
--- a/src/java/com/threerings/presents/io/StringFieldMarshaller.java
+++ b/src/java/com/threerings/presents/io/StringFieldMarshaller.java
@@ -1,7 +1,7 @@
 //
-// $Id: StringFieldMarshaller.java,v 1.6 2002/02/01 23:26:49 mdb Exp $
+// $Id: StringFieldMarshaller.java,v 1.7 2002/02/01 23:32:37 mdb Exp $
 
-package com.threerings.presents.dobj.io;
+package com.threerings.presents.io;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/src/java/com/threerings/presents/io/ValueMarshaller.java b/src/java/com/threerings/presents/io/ValueMarshaller.java
index a7107d9e6..ce4ad1696 100644
--- a/src/java/com/threerings/presents/io/ValueMarshaller.java
+++ b/src/java/com/threerings/presents/io/ValueMarshaller.java
@@ -1,7 +1,7 @@
 //
-// $Id: ValueMarshaller.java,v 1.7 2002/01/23 18:01:19 mdb Exp $
+// $Id: ValueMarshaller.java,v 1.8 2002/02/01 23:32:37 mdb Exp $
 
-package com.threerings.presents.dobj.io;
+package com.threerings.presents.io;
 
 import java.io.*;
 import java.lang.reflect.Array;