diff --git a/src/java/com/threerings/presents/Log.java b/src/java/com/threerings/presents/Log.java
index 3fdc2c8b4..fc2106e99 100644
--- a/src/java/com/threerings/presents/Log.java
+++ b/src/java/com/threerings/presents/Log.java
@@ -1,7 +1,7 @@
 //
-// $Id: Log.java,v 1.2 2001/05/29 03:27:59 mdb Exp $
+// $Id: Log.java,v 1.3 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher;
+package com.threerings.cocktail.cher;
 
 /**
  * A placeholder class that contains a reference to the log object used by
diff --git a/src/java/com/threerings/presents/client/Client.java b/src/java/com/threerings/presents/client/Client.java
index 050cde0a0..08252cf97 100644
--- a/src/java/com/threerings/presents/client/Client.java
+++ b/src/java/com/threerings/presents/client/Client.java
@@ -1,14 +1,14 @@
 //
-// $Id: Client.java,v 1.3 2001/05/29 03:27:59 mdb Exp $
+// $Id: Client.java,v 1.4 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.client;
+package com.threerings.cocktail.cher.client;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.samskivert.cocktail.cher.Log;
-import com.samskivert.cocktail.cher.net.Credentials;
-import com.samskivert.cocktail.cher.net.Registry;
+import com.threerings.cocktail.cher.Log;
+import com.threerings.cocktail.cher.net.Credentials;
+import com.threerings.cocktail.cher.net.Registry;
 
 /**
  * Through the client object, a connection to the system is established
diff --git a/src/java/com/threerings/presents/client/ClientObserver.java b/src/java/com/threerings/presents/client/ClientObserver.java
index 7289a16ad..e890202d3 100644
--- a/src/java/com/threerings/presents/client/ClientObserver.java
+++ b/src/java/com/threerings/presents/client/ClientObserver.java
@@ -1,7 +1,7 @@
 //
-// $Id: ClientObserver.java,v 1.1 2001/05/22 06:07:59 mdb Exp $
+// $Id: ClientObserver.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.client;
+package com.threerings.cocktail.cher.client;
 
 /**
  * A client observer is registered with the client instance to be notified
diff --git a/src/java/com/threerings/presents/client/Communicator.java b/src/java/com/threerings/presents/client/Communicator.java
index 34286dbb9..ee27418c2 100644
--- a/src/java/com/threerings/presents/client/Communicator.java
+++ b/src/java/com/threerings/presents/client/Communicator.java
@@ -1,7 +1,7 @@
 //
-// $Id: Communicator.java,v 1.5 2001/05/30 23:51:39 mdb Exp $
+// $Id: Communicator.java,v 1.6 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.client;
+package com.threerings.cocktail.cher.client;
 
 import java.io.*;
 import java.net.Socket;
@@ -10,11 +10,11 @@ import java.net.InetAddress;
 import com.samskivert.util.LoopingThread;
 import com.samskivert.util.Queue;
 
-import com.samskivert.cocktail.cher.Log;
-import com.samskivert.cocktail.cher.io.*;
-import com.samskivert.cocktail.cher.io.ObjectStreamException;
-import com.samskivert.cocktail.cher.net.*;
-import com.samskivert.cocktail.cher.util.Codes;
+import com.threerings.cocktail.cher.Log;
+import com.threerings.cocktail.cher.io.*;
+import com.threerings.cocktail.cher.io.ObjectStreamException;
+import com.threerings.cocktail.cher.net.*;
+import com.threerings.cocktail.cher.util.Codes;
 
 /**
  * The client performs all network I/O on separate threads (one for
diff --git a/src/java/com/threerings/presents/client/LogonException.java b/src/java/com/threerings/presents/client/LogonException.java
index 74030412e..9a07b81ea 100644
--- a/src/java/com/threerings/presents/client/LogonException.java
+++ b/src/java/com/threerings/presents/client/LogonException.java
@@ -1,7 +1,7 @@
 //
-// $Id: LogonException.java,v 1.1 2001/05/22 06:07:59 mdb Exp $
+// $Id: LogonException.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.client;
+package com.threerings.cocktail.cher.client;
 
 /**
  * A logon exception is used to indicate a failure to log on to the
diff --git a/src/java/com/threerings/presents/dobj/DObject.java b/src/java/com/threerings/presents/dobj/DObject.java
index a0e3a3005..3b1e55025 100644
--- a/src/java/com/threerings/presents/dobj/DObject.java
+++ b/src/java/com/threerings/presents/dobj/DObject.java
@@ -1,7 +1,7 @@
 //
-// $Id: DObject.java,v 1.3 2001/05/29 03:27:59 mdb Exp $
+// $Id: DObject.java,v 1.4 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.dobj;
+package com.threerings.cocktail.cher.dobj;
 
 import java.io.IOException;
 import java.io.DataInputStream;
diff --git a/src/java/com/threerings/presents/dobj/Event.java b/src/java/com/threerings/presents/dobj/Event.java
index 572e30ce3..035a87d2f 100644
--- a/src/java/com/threerings/presents/dobj/Event.java
+++ b/src/java/com/threerings/presents/dobj/Event.java
@@ -1,7 +1,7 @@
 //
-// $Id: Event.java,v 1.1 2001/05/22 06:07:59 mdb Exp $
+// $Id: Event.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.dobj;
+package com.threerings.cocktail.cher.dobj;
 
 import java.io.IOException;
 import java.io.DataInputStream;
diff --git a/src/java/com/threerings/presents/dobj/io/DObjectFactory.java b/src/java/com/threerings/presents/dobj/io/DObjectFactory.java
index a24995bc6..22658ca07 100644
--- a/src/java/com/threerings/presents/dobj/io/DObjectFactory.java
+++ b/src/java/com/threerings/presents/dobj/io/DObjectFactory.java
@@ -1,16 +1,16 @@
 //
-// $Id: DObjectFactory.java,v 1.2 2001/05/30 00:16:00 mdb Exp $
+// $Id: DObjectFactory.java,v 1.3 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.dobj.net;
+package com.threerings.cocktail.cher.dobj.net;
 
 import java.io.IOException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.util.HashMap;
 
-import com.samskivert.cocktail.cher.Log;
-import com.samskivert.cocktail.cher.dobj.DObject;
-import com.samskivert.cocktail.cher.io.ObjectStreamException;
+import com.threerings.cocktail.cher.Log;
+import com.threerings.cocktail.cher.dobj.DObject;
+import com.threerings.cocktail.cher.io.ObjectStreamException;
 
 /**
  * The distributed object factory is responsible for marshalling and
diff --git a/src/java/com/threerings/presents/io/BooleanFieldMarshaller.java b/src/java/com/threerings/presents/io/BooleanFieldMarshaller.java
index 4908579cf..d36d5e060 100644
--- a/src/java/com/threerings/presents/io/BooleanFieldMarshaller.java
+++ b/src/java/com/threerings/presents/io/BooleanFieldMarshaller.java
@@ -1,14 +1,14 @@
 //
-// $Id: BooleanFieldMarshaller.java,v 1.1 2001/05/30 00:16:00 mdb Exp $
+// $Id: BooleanFieldMarshaller.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.dobj.net;
+package com.threerings.cocktail.cher.dobj.net;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Field;
 
-import com.samskivert.cocktail.cher.dobj.DObject;
+import com.threerings.cocktail.cher.dobj.DObject;
 
 public class BooleanFieldMarshaller implements FieldMarshaller
 {
diff --git a/src/java/com/threerings/presents/io/DoubleFieldMarshaller.java b/src/java/com/threerings/presents/io/DoubleFieldMarshaller.java
index c2753594f..7184942aa 100644
--- a/src/java/com/threerings/presents/io/DoubleFieldMarshaller.java
+++ b/src/java/com/threerings/presents/io/DoubleFieldMarshaller.java
@@ -1,14 +1,14 @@
 //
-// $Id: DoubleFieldMarshaller.java,v 1.1 2001/05/30 00:16:00 mdb Exp $
+// $Id: DoubleFieldMarshaller.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.dobj.net;
+package com.threerings.cocktail.cher.dobj.net;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Field;
 
-import com.samskivert.cocktail.cher.dobj.DObject;
+import com.threerings.cocktail.cher.dobj.DObject;
 
 public class DoubleFieldMarshaller implements FieldMarshaller
 {
diff --git a/src/java/com/threerings/presents/io/FieldMarshaller.java b/src/java/com/threerings/presents/io/FieldMarshaller.java
index d27699952..fefe934f3 100644
--- a/src/java/com/threerings/presents/io/FieldMarshaller.java
+++ b/src/java/com/threerings/presents/io/FieldMarshaller.java
@@ -1,14 +1,14 @@
 //
-// $Id: FieldMarshaller.java,v 1.1 2001/05/30 00:16:00 mdb Exp $
+// $Id: FieldMarshaller.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.dobj.net;
+package com.threerings.cocktail.cher.dobj.net;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Field;
 
-import com.samskivert.cocktail.cher.dobj.DObject;
+import com.threerings.cocktail.cher.dobj.DObject;
 
 /**
  * A field marshaller knows how to marshall and unmarshall a particular
diff --git a/src/java/com/threerings/presents/io/FieldMarshallerRegistry.java b/src/java/com/threerings/presents/io/FieldMarshallerRegistry.java
index ce4f219fa..c2713c594 100644
--- a/src/java/com/threerings/presents/io/FieldMarshallerRegistry.java
+++ b/src/java/com/threerings/presents/io/FieldMarshallerRegistry.java
@@ -1,11 +1,11 @@
 //
-// $Id: FieldMarshallerRegistry.java,v 1.1 2001/05/30 00:16:00 mdb Exp $
+// $Id: FieldMarshallerRegistry.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.dobj.net;
+package com.threerings.cocktail.cher.dobj.net;
 
 import java.lang.reflect.Field;
 import java.util.Hashtable;
-import com.samskivert.cocktail.cher.Log;
+import com.threerings.cocktail.cher.Log;
 
 /**
  * Field marshaller instances are registered for each type of field that
diff --git a/src/java/com/threerings/presents/io/FloatFieldMarshaller.java b/src/java/com/threerings/presents/io/FloatFieldMarshaller.java
index 721b8f766..bf755ff94 100644
--- a/src/java/com/threerings/presents/io/FloatFieldMarshaller.java
+++ b/src/java/com/threerings/presents/io/FloatFieldMarshaller.java
@@ -1,14 +1,14 @@
 //
-// $Id: FloatFieldMarshaller.java,v 1.1 2001/05/30 00:16:00 mdb Exp $
+// $Id: FloatFieldMarshaller.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.dobj.net;
+package com.threerings.cocktail.cher.dobj.net;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Field;
 
-import com.samskivert.cocktail.cher.dobj.DObject;
+import com.threerings.cocktail.cher.dobj.DObject;
 
 public class FloatFieldMarshaller implements FieldMarshaller
 {
diff --git a/src/java/com/threerings/presents/io/FramedInputStream.java b/src/java/com/threerings/presents/io/FramedInputStream.java
index 3a7db989b..6d3c6c436 100644
--- a/src/java/com/threerings/presents/io/FramedInputStream.java
+++ b/src/java/com/threerings/presents/io/FramedInputStream.java
@@ -1,7 +1,7 @@
 //
-// $Id: FramedInputStream.java,v 1.3 2001/05/29 03:27:59 mdb Exp $
+// $Id: FramedInputStream.java,v 1.4 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.io;
+package com.threerings.cocktail.cher.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.EOFException;
diff --git a/src/java/com/threerings/presents/io/FramingOutputStream.java b/src/java/com/threerings/presents/io/FramingOutputStream.java
index 69ad7a1e5..2e9b45a11 100644
--- a/src/java/com/threerings/presents/io/FramingOutputStream.java
+++ b/src/java/com/threerings/presents/io/FramingOutputStream.java
@@ -1,7 +1,7 @@
 //
-// $Id: FramingOutputStream.java,v 1.2 2001/05/29 03:27:59 mdb Exp $
+// $Id: FramingOutputStream.java,v 1.3 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.io;
+package com.threerings.cocktail.cher.io;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/src/java/com/threerings/presents/io/IntFieldMarshaller.java b/src/java/com/threerings/presents/io/IntFieldMarshaller.java
index f46575663..93263ad9b 100644
--- a/src/java/com/threerings/presents/io/IntFieldMarshaller.java
+++ b/src/java/com/threerings/presents/io/IntFieldMarshaller.java
@@ -1,14 +1,14 @@
 //
-// $Id: IntFieldMarshaller.java,v 1.1 2001/05/30 00:16:00 mdb Exp $
+// $Id: IntFieldMarshaller.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.dobj.net;
+package com.threerings.cocktail.cher.dobj.net;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Field;
 
-import com.samskivert.cocktail.cher.dobj.DObject;
+import com.threerings.cocktail.cher.dobj.DObject;
 
 public class IntFieldMarshaller implements FieldMarshaller
 {
diff --git a/src/java/com/threerings/presents/io/LongFieldMarshaller.java b/src/java/com/threerings/presents/io/LongFieldMarshaller.java
index 07a2665ac..df73a1cd9 100644
--- a/src/java/com/threerings/presents/io/LongFieldMarshaller.java
+++ b/src/java/com/threerings/presents/io/LongFieldMarshaller.java
@@ -1,14 +1,14 @@
 //
-// $Id: LongFieldMarshaller.java,v 1.1 2001/05/30 00:16:00 mdb Exp $
+// $Id: LongFieldMarshaller.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.dobj.net;
+package com.threerings.cocktail.cher.dobj.net;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Field;
 
-import com.samskivert.cocktail.cher.dobj.DObject;
+import com.threerings.cocktail.cher.dobj.DObject;
 
 public class LongFieldMarshaller implements FieldMarshaller
 {
diff --git a/src/java/com/threerings/presents/io/Marshaller.java b/src/java/com/threerings/presents/io/Marshaller.java
index 714d98556..27121342c 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.1 2001/05/30 00:16:00 mdb Exp $
+// $Id: Marshaller.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.dobj.net;
+package com.threerings.cocktail.cher.dobj.net;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -10,9 +10,9 @@ import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.Comparator;
 
-import com.samskivert.cocktail.cher.Log;
-import com.samskivert.cocktail.cher.dobj.DObject;
-import com.samskivert.cocktail.cher.io.ObjectStreamException;
+import com.threerings.cocktail.cher.Log;
+import com.threerings.cocktail.cher.dobj.DObject;
+import com.threerings.cocktail.cher.io.ObjectStreamException;
 
 /**
  * The marshaller inspects the class with which it is constructed and
diff --git a/src/java/com/threerings/presents/io/ObjectStreamException.java b/src/java/com/threerings/presents/io/ObjectStreamException.java
index 189a132fc..e0846c530 100644
--- a/src/java/com/threerings/presents/io/ObjectStreamException.java
+++ b/src/java/com/threerings/presents/io/ObjectStreamException.java
@@ -1,7 +1,7 @@
 //
-// $Id: ObjectStreamException.java,v 1.2 2001/05/22 21:51:29 mdb Exp $
+// $Id: ObjectStreamException.java,v 1.3 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.io;
+package com.threerings.cocktail.cher.io;
 
 import java.io.IOException;
 
diff --git a/src/java/com/threerings/presents/io/ShortFieldMarshaller.java b/src/java/com/threerings/presents/io/ShortFieldMarshaller.java
index 9d3a09bc3..2cd71be2d 100644
--- a/src/java/com/threerings/presents/io/ShortFieldMarshaller.java
+++ b/src/java/com/threerings/presents/io/ShortFieldMarshaller.java
@@ -1,14 +1,14 @@
 //
-// $Id: ShortFieldMarshaller.java,v 1.1 2001/05/30 00:16:00 mdb Exp $
+// $Id: ShortFieldMarshaller.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.dobj.net;
+package com.threerings.cocktail.cher.dobj.net;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Field;
 
-import com.samskivert.cocktail.cher.dobj.DObject;
+import com.threerings.cocktail.cher.dobj.DObject;
 
 public class ShortFieldMarshaller implements FieldMarshaller
 {
diff --git a/src/java/com/threerings/presents/io/StringFieldMarshaller.java b/src/java/com/threerings/presents/io/StringFieldMarshaller.java
index cea6b335d..aeac223b1 100644
--- a/src/java/com/threerings/presents/io/StringFieldMarshaller.java
+++ b/src/java/com/threerings/presents/io/StringFieldMarshaller.java
@@ -1,14 +1,14 @@
 //
-// $Id: StringFieldMarshaller.java,v 1.1 2001/05/30 00:16:00 mdb Exp $
+// $Id: StringFieldMarshaller.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.dobj.net;
+package com.threerings.cocktail.cher.dobj.net;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Field;
 
-import com.samskivert.cocktail.cher.dobj.DObject;
+import com.threerings.cocktail.cher.dobj.DObject;
 
 public class StringFieldMarshaller implements FieldMarshaller
 {
diff --git a/src/java/com/threerings/presents/io/TypedObject.java b/src/java/com/threerings/presents/io/TypedObject.java
index b99abfb0d..17abf934c 100644
--- a/src/java/com/threerings/presents/io/TypedObject.java
+++ b/src/java/com/threerings/presents/io/TypedObject.java
@@ -1,7 +1,7 @@
 //
-// $Id: TypedObject.java,v 1.2 2001/05/23 04:03:40 mdb Exp $
+// $Id: TypedObject.java,v 1.3 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.io;
+package com.threerings.cocktail.cher.io;
 
 import java.io.IOException;
 import java.io.DataInputStream;
diff --git a/src/java/com/threerings/presents/io/TypedObjectFactory.java b/src/java/com/threerings/presents/io/TypedObjectFactory.java
index d6829a06e..3f86ab5f3 100644
--- a/src/java/com/threerings/presents/io/TypedObjectFactory.java
+++ b/src/java/com/threerings/presents/io/TypedObjectFactory.java
@@ -1,7 +1,7 @@
 //
-// $Id: TypedObjectFactory.java,v 1.3 2001/05/23 04:03:40 mdb Exp $
+// $Id: TypedObjectFactory.java,v 1.4 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.io;
+package com.threerings.cocktail.cher.io;
 
 import java.io.IOException;
 import java.io.DataInputStream;
diff --git a/src/java/com/threerings/presents/net/AuthRequest.java b/src/java/com/threerings/presents/net/AuthRequest.java
index 3f039bded..f53827e01 100644
--- a/src/java/com/threerings/presents/net/AuthRequest.java
+++ b/src/java/com/threerings/presents/net/AuthRequest.java
@@ -1,13 +1,13 @@
 //
-// $Id: AuthRequest.java,v 1.3 2001/05/23 04:03:40 mdb Exp $
+// $Id: AuthRequest.java,v 1.4 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.net;
+package com.threerings.cocktail.cher.net;
 
 import java.io.IOException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 
-import com.samskivert.cocktail.cher.io.TypedObjectFactory;
+import com.threerings.cocktail.cher.io.TypedObjectFactory;
 
 public class AuthRequest extends UpstreamMessage
 {
diff --git a/src/java/com/threerings/presents/net/AuthResponse.java b/src/java/com/threerings/presents/net/AuthResponse.java
index b1cd182f5..953b00814 100644
--- a/src/java/com/threerings/presents/net/AuthResponse.java
+++ b/src/java/com/threerings/presents/net/AuthResponse.java
@@ -1,13 +1,13 @@
 //
-// $Id: AuthResponse.java,v 1.4 2001/05/30 00:16:00 mdb Exp $
+// $Id: AuthResponse.java,v 1.5 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.net;
+package com.threerings.cocktail.cher.net;
 
 import java.io.IOException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 
-import com.samskivert.cocktail.cher.dobj.net.DObjectFactory;
+import com.threerings.cocktail.cher.dobj.net.DObjectFactory;
 
 /**
  * The auth response communicates authentication success or failure as
diff --git a/src/java/com/threerings/presents/net/AuthResponseData.java b/src/java/com/threerings/presents/net/AuthResponseData.java
index 66414b0f4..3bc218f4b 100644
--- a/src/java/com/threerings/presents/net/AuthResponseData.java
+++ b/src/java/com/threerings/presents/net/AuthResponseData.java
@@ -1,13 +1,13 @@
 //
-// $Id: AuthResponseData.java,v 1.3 2001/05/30 00:16:00 mdb Exp $
+// $Id: AuthResponseData.java,v 1.4 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.net;
+package com.threerings.cocktail.cher.net;
 
 import java.io.IOException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 
-import com.samskivert.cocktail.cher.dobj.DObject;
+import com.threerings.cocktail.cher.dobj.DObject;
 
 /**
  * An <code>AuthResponseData</code> object is communicated back to the
diff --git a/src/java/com/threerings/presents/net/Credentials.java b/src/java/com/threerings/presents/net/Credentials.java
index 2d0ddcc4f..de5b09624 100644
--- a/src/java/com/threerings/presents/net/Credentials.java
+++ b/src/java/com/threerings/presents/net/Credentials.java
@@ -1,14 +1,14 @@
 //
-// $Id: Credentials.java,v 1.3 2001/05/29 03:27:59 mdb Exp $
+// $Id: Credentials.java,v 1.4 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.net;
+package com.threerings.cocktail.cher.net;
 
 import java.io.IOException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 
-import com.samskivert.cocktail.cher.io.TypedObject;
-import com.samskivert.cocktail.cher.io.TypedObjectFactory;
+import com.threerings.cocktail.cher.io.TypedObject;
+import com.threerings.cocktail.cher.io.TypedObjectFactory;
 
 /**
  * Credentials are supplied by the client implementation and sent along to
diff --git a/src/java/com/threerings/presents/net/DownstreamMessage.java b/src/java/com/threerings/presents/net/DownstreamMessage.java
index a7650090e..371bf994a 100644
--- a/src/java/com/threerings/presents/net/DownstreamMessage.java
+++ b/src/java/com/threerings/presents/net/DownstreamMessage.java
@@ -1,14 +1,14 @@
 //
-// $Id: DownstreamMessage.java,v 1.4 2001/05/29 03:27:59 mdb Exp $
+// $Id: DownstreamMessage.java,v 1.5 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.net;
+package com.threerings.cocktail.cher.net;
 
 import java.io.IOException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 
-import com.samskivert.cocktail.cher.io.TypedObject;
-import com.samskivert.cocktail.cher.io.TypedObjectFactory;
+import com.threerings.cocktail.cher.io.TypedObject;
+import com.threerings.cocktail.cher.io.TypedObjectFactory;
 
 /**
  * The <code>DownstreamMessage</code> class encapsulates a message in the
diff --git a/src/java/com/threerings/presents/net/EventNotification.java b/src/java/com/threerings/presents/net/EventNotification.java
index 00507537b..8ca8f5b56 100644
--- a/src/java/com/threerings/presents/net/EventNotification.java
+++ b/src/java/com/threerings/presents/net/EventNotification.java
@@ -1,14 +1,14 @@
 //
-// $Id: EventNotification.java,v 1.2 2001/05/22 21:51:29 mdb Exp $
+// $Id: EventNotification.java,v 1.3 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.net;
+package com.threerings.cocktail.cher.net;
 
 import java.io.IOException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 
-import com.samskivert.cocktail.cher.dobj.Event;
-import com.samskivert.cocktail.cher.dobj.EventFactory;
+import com.threerings.cocktail.cher.dobj.Event;
+import com.threerings.cocktail.cher.dobj.EventFactory;
 
 public class EventNotification extends DownstreamMessage
 {
diff --git a/src/java/com/threerings/presents/net/FailureResponse.java b/src/java/com/threerings/presents/net/FailureResponse.java
index 94270ceba..d3d0e40c0 100644
--- a/src/java/com/threerings/presents/net/FailureResponse.java
+++ b/src/java/com/threerings/presents/net/FailureResponse.java
@@ -1,7 +1,7 @@
 //
-// $Id: FailureResponse.java,v 1.1 2001/05/22 21:51:29 mdb Exp $
+// $Id: FailureResponse.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.net;
+package com.threerings.cocktail.cher.net;
 
 import java.io.IOException;
 import java.io.DataInputStream;
diff --git a/src/java/com/threerings/presents/net/FetchRequest.java b/src/java/com/threerings/presents/net/FetchRequest.java
index 4d6acb527..b0d611caa 100644
--- a/src/java/com/threerings/presents/net/FetchRequest.java
+++ b/src/java/com/threerings/presents/net/FetchRequest.java
@@ -1,7 +1,7 @@
 //
-// $Id: FetchRequest.java,v 1.1 2001/05/22 06:07:59 mdb Exp $
+// $Id: FetchRequest.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.net;
+package com.threerings.cocktail.cher.net;
 
 import java.io.IOException;
 import java.io.DataInputStream;
diff --git a/src/java/com/threerings/presents/net/ForwardEventRequest.java b/src/java/com/threerings/presents/net/ForwardEventRequest.java
index 290f5f7ff..33e028379 100644
--- a/src/java/com/threerings/presents/net/ForwardEventRequest.java
+++ b/src/java/com/threerings/presents/net/ForwardEventRequest.java
@@ -1,14 +1,14 @@
 //
-// $Id: ForwardEventRequest.java,v 1.1 2001/05/22 06:07:59 mdb Exp $
+// $Id: ForwardEventRequest.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.net;
+package com.threerings.cocktail.cher.net;
 
 import java.io.IOException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 
-import com.samskivert.cocktail.cher.dobj.Event;
-import com.samskivert.cocktail.cher.dobj.EventFactory;
+import com.threerings.cocktail.cher.dobj.Event;
+import com.threerings.cocktail.cher.dobj.EventFactory;
 
 public class ForwardEventNotification extends UpstreamMessage
 {
diff --git a/src/java/com/threerings/presents/net/LogoffRequest.java b/src/java/com/threerings/presents/net/LogoffRequest.java
index 4f536070e..bca1aa56b 100644
--- a/src/java/com/threerings/presents/net/LogoffRequest.java
+++ b/src/java/com/threerings/presents/net/LogoffRequest.java
@@ -1,7 +1,7 @@
 //
-// $Id: LogoffRequest.java,v 1.1 2001/05/22 06:08:00 mdb Exp $
+// $Id: LogoffRequest.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.net;
+package com.threerings.cocktail.cher.net;
 
 public class LogoffNotification extends UpstreamMessage
 {
diff --git a/src/java/com/threerings/presents/net/ObjectResponse.java b/src/java/com/threerings/presents/net/ObjectResponse.java
index b8f378996..fc1014b58 100644
--- a/src/java/com/threerings/presents/net/ObjectResponse.java
+++ b/src/java/com/threerings/presents/net/ObjectResponse.java
@@ -1,14 +1,14 @@
 //
-// $Id: ObjectResponse.java,v 1.4 2001/05/30 00:16:00 mdb Exp $
+// $Id: ObjectResponse.java,v 1.5 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.net;
+package com.threerings.cocktail.cher.net;
 
 import java.io.IOException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 
-import com.samskivert.cocktail.cher.dobj.DObject;
-import com.samskivert.cocktail.cher.dobj.net.DObjectFactory;
+import com.threerings.cocktail.cher.dobj.DObject;
+import com.threerings.cocktail.cher.dobj.net.DObjectFactory;
 
 public class ObjectResponse extends DownstreamMessage
 {
diff --git a/src/java/com/threerings/presents/net/PingRequest.java b/src/java/com/threerings/presents/net/PingRequest.java
index c8a7d1032..8bdd4f095 100644
--- a/src/java/com/threerings/presents/net/PingRequest.java
+++ b/src/java/com/threerings/presents/net/PingRequest.java
@@ -1,7 +1,7 @@
 //
-// $Id: PingRequest.java,v 1.1 2001/05/22 06:08:00 mdb Exp $
+// $Id: PingRequest.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.net;
+package com.threerings.cocktail.cher.net;
 
 public class PingNotification extends UpstreamMessage
 {
diff --git a/src/java/com/threerings/presents/net/PongResponse.java b/src/java/com/threerings/presents/net/PongResponse.java
index 8615d99ff..f19d2597a 100644
--- a/src/java/com/threerings/presents/net/PongResponse.java
+++ b/src/java/com/threerings/presents/net/PongResponse.java
@@ -1,7 +1,7 @@
 //
-// $Id: PongResponse.java,v 1.1 2001/05/22 21:51:29 mdb Exp $
+// $Id: PongResponse.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.net;
+package com.threerings.cocktail.cher.net;
 
 public class PongNotification extends DownstreamMessage
 {
diff --git a/src/java/com/threerings/presents/net/Registry.java b/src/java/com/threerings/presents/net/Registry.java
index 737c33d9c..d82dafa03 100644
--- a/src/java/com/threerings/presents/net/Registry.java
+++ b/src/java/com/threerings/presents/net/Registry.java
@@ -1,11 +1,11 @@
 //
-// $Id: Registry.java,v 1.1 2001/05/29 03:27:59 mdb Exp $
+// $Id: Registry.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.net;
+package com.threerings.cocktail.cher.net;
 
-import com.samskivert.cocktail.cher.dobj.DObject;
-import com.samskivert.cocktail.cher.io.TypedObject;
-import com.samskivert.cocktail.cher.io.TypedObjectFactory;
+import com.threerings.cocktail.cher.dobj.DObject;
+import com.threerings.cocktail.cher.io.TypedObject;
+import com.threerings.cocktail.cher.io.TypedObjectFactory;
 
 /**
  * The registry provides a single place where all typed objects that are
diff --git a/src/java/com/threerings/presents/net/SubscribeRequest.java b/src/java/com/threerings/presents/net/SubscribeRequest.java
index dfa70dd5b..659014b2f 100644
--- a/src/java/com/threerings/presents/net/SubscribeRequest.java
+++ b/src/java/com/threerings/presents/net/SubscribeRequest.java
@@ -1,7 +1,7 @@
 //
-// $Id: SubscribeRequest.java,v 1.1 2001/05/22 06:08:00 mdb Exp $
+// $Id: SubscribeRequest.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.net;
+package com.threerings.cocktail.cher.net;
 
 import java.io.IOException;
 import java.io.DataInputStream;
diff --git a/src/java/com/threerings/presents/net/UnsubscribeRequest.java b/src/java/com/threerings/presents/net/UnsubscribeRequest.java
index 3e25f95e1..63ea04c30 100644
--- a/src/java/com/threerings/presents/net/UnsubscribeRequest.java
+++ b/src/java/com/threerings/presents/net/UnsubscribeRequest.java
@@ -1,7 +1,7 @@
 //
-// $Id: UnsubscribeRequest.java,v 1.1 2001/05/22 06:08:00 mdb Exp $
+// $Id: UnsubscribeRequest.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.net;
+package com.threerings.cocktail.cher.net;
 
 import java.io.IOException;
 import java.io.DataInputStream;
diff --git a/src/java/com/threerings/presents/net/UpstreamMessage.java b/src/java/com/threerings/presents/net/UpstreamMessage.java
index f3b50f165..d39041e97 100644
--- a/src/java/com/threerings/presents/net/UpstreamMessage.java
+++ b/src/java/com/threerings/presents/net/UpstreamMessage.java
@@ -1,14 +1,14 @@
 //
-// $Id: UpstreamMessage.java,v 1.4 2001/05/29 03:27:59 mdb Exp $
+// $Id: UpstreamMessage.java,v 1.5 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.net;
+package com.threerings.cocktail.cher.net;
 
 import java.io.IOException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 
-import com.samskivert.cocktail.cher.io.TypedObject;
-import com.samskivert.cocktail.cher.io.TypedObjectFactory;
+import com.threerings.cocktail.cher.io.TypedObject;
+import com.threerings.cocktail.cher.io.TypedObjectFactory;
 
 /**
  * The <code>UpstreamMessage</code> class encapsulates a message in the
diff --git a/src/java/com/threerings/presents/net/UsernamePasswordCreds.java b/src/java/com/threerings/presents/net/UsernamePasswordCreds.java
index be2a37519..f67a8cf3e 100644
--- a/src/java/com/threerings/presents/net/UsernamePasswordCreds.java
+++ b/src/java/com/threerings/presents/net/UsernamePasswordCreds.java
@@ -1,7 +1,7 @@
 //
-// $Id: UsernamePasswordCreds.java,v 1.3 2001/05/23 04:03:40 mdb Exp $
+// $Id: UsernamePasswordCreds.java,v 1.4 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.net;
+package com.threerings.cocktail.cher.net;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/src/java/com/threerings/presents/server/Authenticator.java b/src/java/com/threerings/presents/server/Authenticator.java
index 8a4e2fb32..c8b116b90 100644
--- a/src/java/com/threerings/presents/server/Authenticator.java
+++ b/src/java/com/threerings/presents/server/Authenticator.java
@@ -1,10 +1,10 @@
 //
-// $Id: Authenticator.java,v 1.1 2001/05/29 03:27:59 mdb Exp $
+// $Id: Authenticator.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.server.net;
+package com.threerings.cocktail.cher.server.net;
 
-import com.samskivert.cocktail.cher.net.AuthRequest;
-import com.samskivert.cocktail.cher.net.AuthResponse;
+import com.threerings.cocktail.cher.net.AuthRequest;
+import com.threerings.cocktail.cher.net.AuthResponse;
 
 /**
  * The authenticator is a pluggable component of the authentication
diff --git a/src/java/com/threerings/presents/server/DummyAuthenticator.java b/src/java/com/threerings/presents/server/DummyAuthenticator.java
index 5ded64cf8..ffab05bc3 100644
--- a/src/java/com/threerings/presents/server/DummyAuthenticator.java
+++ b/src/java/com/threerings/presents/server/DummyAuthenticator.java
@@ -1,12 +1,12 @@
 //
-// $Id: DummyAuthenticator.java,v 1.1 2001/05/29 03:27:59 mdb Exp $
+// $Id: DummyAuthenticator.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.server;
+package com.threerings.cocktail.cher.server;
 
-import com.samskivert.cocktail.cher.Log;
-import com.samskivert.cocktail.cher.net.*;
-import com.samskivert.cocktail.cher.server.net.Authenticator;
-import com.samskivert.cocktail.cher.util.Codes;
+import com.threerings.cocktail.cher.Log;
+import com.threerings.cocktail.cher.net.*;
+import com.threerings.cocktail.cher.server.net.Authenticator;
+import com.threerings.cocktail.cher.util.Codes;
 
 public class DummyAuthenticator implements Authenticator
 {
diff --git a/src/java/com/threerings/presents/server/PresentsServer.java b/src/java/com/threerings/presents/server/PresentsServer.java
index 2ce344508..df8320f8f 100644
--- a/src/java/com/threerings/presents/server/PresentsServer.java
+++ b/src/java/com/threerings/presents/server/PresentsServer.java
@@ -1,11 +1,11 @@
 //
-// $Id: PresentsServer.java,v 1.1 2001/05/29 03:27:59 mdb Exp $
+// $Id: PresentsServer.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.server;
+package com.threerings.cocktail.cher.server;
 
-import com.samskivert.cocktail.cher.Log;
-import com.samskivert.cocktail.cher.server.net.AuthManager;
-import com.samskivert.cocktail.cher.server.net.ConnectionManager;
+import com.threerings.cocktail.cher.Log;
+import com.threerings.cocktail.cher.server.net.AuthManager;
+import com.threerings.cocktail.cher.server.net.ConnectionManager;
 
 /**
  * The cher server provides a central point of access to the various
diff --git a/src/java/com/threerings/presents/server/net/AuthManager.java b/src/java/com/threerings/presents/server/net/AuthManager.java
index 124d6aa90..0d3a2ba67 100644
--- a/src/java/com/threerings/presents/server/net/AuthManager.java
+++ b/src/java/com/threerings/presents/server/net/AuthManager.java
@@ -1,14 +1,14 @@
 //
-// $Id: AuthManager.java,v 1.1 2001/05/29 03:27:59 mdb Exp $
+// $Id: AuthManager.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.server.net;
+package com.threerings.cocktail.cher.server.net;
 
 import com.samskivert.util.LoopingThread;
 import com.samskivert.util.Queue;
 
-import com.samskivert.cocktail.cher.Log;
-import com.samskivert.cocktail.cher.net.AuthRequest;
-import com.samskivert.cocktail.cher.net.AuthResponse;
+import com.threerings.cocktail.cher.Log;
+import com.threerings.cocktail.cher.net.AuthRequest;
+import com.threerings.cocktail.cher.net.AuthResponse;
 
 /**
  * The authentication manager takes care of the authentication process.
diff --git a/src/java/com/threerings/presents/server/net/AuthingConnection.java b/src/java/com/threerings/presents/server/net/AuthingConnection.java
index ca3f3bf63..dbc2e8468 100644
--- a/src/java/com/threerings/presents/server/net/AuthingConnection.java
+++ b/src/java/com/threerings/presents/server/net/AuthingConnection.java
@@ -1,14 +1,14 @@
 //
-// $Id: AuthingConnection.java,v 1.1 2001/05/29 03:27:59 mdb Exp $
+// $Id: AuthingConnection.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.server.net;
+package com.threerings.cocktail.cher.server.net;
 
 import java.io.IOException;
 import ninja2.core.io_core.nbio.NonblockingSocket;
 
-import com.samskivert.cocktail.cher.Log;
-import com.samskivert.cocktail.cher.net.UpstreamMessage;
-import com.samskivert.cocktail.cher.net.AuthRequest;
+import com.threerings.cocktail.cher.Log;
+import com.threerings.cocktail.cher.net.UpstreamMessage;
+import com.threerings.cocktail.cher.net.AuthRequest;
 
 /**
  * The authing connection manages the client connection until
diff --git a/src/java/com/threerings/presents/server/net/Connection.java b/src/java/com/threerings/presents/server/net/Connection.java
index efdaa1989..7db51fd8f 100644
--- a/src/java/com/threerings/presents/server/net/Connection.java
+++ b/src/java/com/threerings/presents/server/net/Connection.java
@@ -1,16 +1,16 @@
 //
-// $Id: Connection.java,v 1.1 2001/05/29 03:27:59 mdb Exp $
+// $Id: Connection.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.server.net;
+package com.threerings.cocktail.cher.server.net;
 
 import java.io.*;
 import ninja2.core.io_core.nbio.*;
 
-import com.samskivert.cocktail.cher.Log;
-import com.samskivert.cocktail.cher.io.FramedInputStream;
-import com.samskivert.cocktail.cher.io.TypedObjectFactory;
-import com.samskivert.cocktail.cher.net.UpstreamMessage;
-import com.samskivert.cocktail.cher.net.DownstreamMessage;
+import com.threerings.cocktail.cher.Log;
+import com.threerings.cocktail.cher.io.FramedInputStream;
+import com.threerings.cocktail.cher.io.TypedObjectFactory;
+import com.threerings.cocktail.cher.net.UpstreamMessage;
+import com.threerings.cocktail.cher.net.DownstreamMessage;
 
 /**
  * The base connection class implements the net event handler interface
diff --git a/src/java/com/threerings/presents/server/net/ConnectionManager.java b/src/java/com/threerings/presents/server/net/ConnectionManager.java
index 39393c156..8bda0ed65 100644
--- a/src/java/com/threerings/presents/server/net/ConnectionManager.java
+++ b/src/java/com/threerings/presents/server/net/ConnectionManager.java
@@ -1,7 +1,7 @@
 //
-// $Id: ConnectionManager.java,v 1.1 2001/05/29 03:27:59 mdb Exp $
+// $Id: ConnectionManager.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.server.net;
+package com.threerings.cocktail.cher.server.net;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -11,11 +11,11 @@ import com.samskivert.util.LoopingThread;
 import com.samskivert.util.Tuple;
 import com.samskivert.util.Queue;
 
-import com.samskivert.cocktail.cher.Log;
-import com.samskivert.cocktail.cher.io.FramingOutputStream;
-import com.samskivert.cocktail.cher.io.TypedObjectFactory;
-import com.samskivert.cocktail.cher.net.DownstreamMessage;
-import com.samskivert.cocktail.cher.net.Registry;
+import com.threerings.cocktail.cher.Log;
+import com.threerings.cocktail.cher.io.FramingOutputStream;
+import com.threerings.cocktail.cher.io.TypedObjectFactory;
+import com.threerings.cocktail.cher.net.DownstreamMessage;
+import com.threerings.cocktail.cher.net.Registry;
 
 /**
  * The connection manager manages the socket on which connections are
diff --git a/src/java/com/threerings/presents/server/net/ConnectionObserver.java b/src/java/com/threerings/presents/server/net/ConnectionObserver.java
index 34a19501f..47855fa87 100644
--- a/src/java/com/threerings/presents/server/net/ConnectionObserver.java
+++ b/src/java/com/threerings/presents/server/net/ConnectionObserver.java
@@ -1,7 +1,7 @@
 //
-// $Id: ConnectionObserver.java,v 1.1 2001/05/29 03:27:59 mdb Exp $
+// $Id: ConnectionObserver.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.server.net;
+package com.threerings.cocktail.cher.server.net;
 
 import java.io.IOException;
 
diff --git a/src/java/com/threerings/presents/server/net/NetEventHandler.java b/src/java/com/threerings/presents/server/net/NetEventHandler.java
index e930f633c..80576e41e 100644
--- a/src/java/com/threerings/presents/server/net/NetEventHandler.java
+++ b/src/java/com/threerings/presents/server/net/NetEventHandler.java
@@ -1,7 +1,7 @@
 //
-// $Id: NetEventHandler.java,v 1.1 2001/05/29 03:27:59 mdb Exp $
+// $Id: NetEventHandler.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.server.net;
+package com.threerings.cocktail.cher.server.net;
 
 import ninja2.core.io_core.nbio.Selectable;
 
diff --git a/src/java/com/threerings/presents/server/net/RunningConnection.java b/src/java/com/threerings/presents/server/net/RunningConnection.java
index 79d437b8c..62bac1562 100644
--- a/src/java/com/threerings/presents/server/net/RunningConnection.java
+++ b/src/java/com/threerings/presents/server/net/RunningConnection.java
@@ -1,11 +1,11 @@
 //
-// $Id: RunningConnection.java,v 1.1 2001/05/29 03:27:59 mdb Exp $
+// $Id: RunningConnection.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.server.net;
+package com.threerings.cocktail.cher.server.net;
 
 import java.io.IOException;
 import ninja2.core.io_core.nbio.NonblockingSocket;
-import com.samskivert.cocktail.cher.net.UpstreamMessage;
+import com.threerings.cocktail.cher.net.UpstreamMessage;
 
 /**
  * A running connection object represents a fully operational client
diff --git a/src/java/com/threerings/presents/util/CherCodes.java b/src/java/com/threerings/presents/util/CherCodes.java
index 3d34a6c4c..a4f98e608 100644
--- a/src/java/com/threerings/presents/util/CherCodes.java
+++ b/src/java/com/threerings/presents/util/CherCodes.java
@@ -1,7 +1,7 @@
 //
-// $Id: CherCodes.java,v 1.1 2001/05/23 04:03:41 mdb Exp $
+// $Id: CherCodes.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.util;
+package com.threerings.cocktail.cher.util;
 
 /**
  * The <code>Codes</code> class serves as a repository for miscellaneous
diff --git a/tests/src/java/com/threerings/io/FrameTest.java b/tests/src/java/com/threerings/io/FrameTest.java
index 810668cc8..35dee0d86 100644
--- a/tests/src/java/com/threerings/io/FrameTest.java
+++ b/tests/src/java/com/threerings/io/FrameTest.java
@@ -1,10 +1,10 @@
 //
-// $Id: FrameTest.java,v 1.1 2001/05/22 21:51:29 mdb Exp $
+// $Id: FrameTest.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.io.test;
+package com.threerings.cocktail.cher.io.test;
 
 import java.io.*;
-import com.samskivert.cocktail.cher.io.*;
+import com.threerings.cocktail.cher.io.*;
 
 public class FrameTest
 {
diff --git a/tests/src/java/com/threerings/presents/client/TestClient.java b/tests/src/java/com/threerings/presents/client/TestClient.java
index 4b71ba2a3..35311e535 100644
--- a/tests/src/java/com/threerings/presents/client/TestClient.java
+++ b/tests/src/java/com/threerings/presents/client/TestClient.java
@@ -1,10 +1,10 @@
 //
-// $Id: TestClient.java,v 1.1 2001/05/29 03:27:59 mdb Exp $
+// $Id: TestClient.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
 
-package com.samskivert.cocktail.cher.client.test;
+package com.threerings.cocktail.cher.client.test;
 
-import com.samskivert.cocktail.cher.net.*;
-import com.samskivert.cocktail.cher.client.*;
+import com.threerings.cocktail.cher.net.*;
+import com.threerings.cocktail.cher.client.*;
 
 /**
  * A standalone test client.