diff --git a/src/java/com/threerings/admin/data/AdminMarshaller.java b/src/java/com/threerings/admin/data/AdminMarshaller.java
index d893ae522..e04777f6a 100644
--- a/src/java/com/threerings/admin/data/AdminMarshaller.java
+++ b/src/java/com/threerings/admin/data/AdminMarshaller.java
@@ -21,12 +21,11 @@
 
 package com.threerings.admin.data;
 
+import com.threerings.admin.client.AdminService;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.dobj.InvocationResponseEvent;
 
-import com.threerings.admin.client.AdminService;
-
 /**
  * Provides the implementation of the {@link AdminService} interface
  * that marshalls the arguments and delivers the request to the provider
diff --git a/src/java/com/threerings/admin/server/AdminDispatcher.java b/src/java/com/threerings/admin/server/AdminDispatcher.java
index 9640a0147..73bd5846e 100644
--- a/src/java/com/threerings/admin/server/AdminDispatcher.java
+++ b/src/java/com/threerings/admin/server/AdminDispatcher.java
@@ -21,13 +21,12 @@
 
 package com.threerings.admin.server;
 
+import com.threerings.admin.client.AdminService;
+import com.threerings.admin.data.AdminMarshaller;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
 
-import com.threerings.admin.client.AdminService;
-import com.threerings.admin.data.AdminMarshaller;
-
 /**
  * Dispatches requests to the {@link AdminProvider}.
  */
diff --git a/src/java/com/threerings/bureau/data/BureauMarshaller.java b/src/java/com/threerings/bureau/data/BureauMarshaller.java
index d1a6213ee..1b8c4e8a8 100644
--- a/src/java/com/threerings/bureau/data/BureauMarshaller.java
+++ b/src/java/com/threerings/bureau/data/BureauMarshaller.java
@@ -21,11 +21,10 @@
 
 package com.threerings.bureau.data;
 
+import com.threerings.bureau.client.BureauService;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 
-import com.threerings.bureau.client.BureauService;
-
 /**
  * Provides the implementation of the {@link BureauService} interface
  * that marshalls the arguments and delivers the request to the provider
diff --git a/src/java/com/threerings/bureau/server/BureauDispatcher.java b/src/java/com/threerings/bureau/server/BureauDispatcher.java
index 912ca0d0b..2157b592d 100644
--- a/src/java/com/threerings/bureau/server/BureauDispatcher.java
+++ b/src/java/com/threerings/bureau/server/BureauDispatcher.java
@@ -21,12 +21,11 @@
 
 package com.threerings.bureau.server;
 
+import com.threerings.bureau.data.BureauMarshaller;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
 
-import com.threerings.bureau.data.BureauMarshaller;
-
 /**
  * Dispatches requests to the {@link BureauProvider}.
  */
diff --git a/src/java/com/threerings/bureau/server/BureauProvider.java b/src/java/com/threerings/bureau/server/BureauProvider.java
index 43aef1369..7c82c3853 100644
--- a/src/java/com/threerings/bureau/server/BureauProvider.java
+++ b/src/java/com/threerings/bureau/server/BureauProvider.java
@@ -21,11 +21,10 @@
 
 package com.threerings.bureau.server;
 
+import com.threerings.bureau.client.BureauService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationProvider;
 
-import com.threerings.bureau.client.BureauService;
-
 /**
  * Defines the server-side of the {@link BureauService}.
  */
diff --git a/src/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java b/src/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java
index aa9300680..4e596aa6a 100644
--- a/src/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java
+++ b/src/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java
@@ -21,11 +21,10 @@
 
 package com.threerings.crowd.chat.data;
 
+import com.threerings.crowd.chat.client.ChannelSpeakService;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 
-import com.threerings.crowd.chat.client.ChannelSpeakService;
-
 /**
  * Provides the implementation of the {@link ChannelSpeakService} interface
  * that marshalls the arguments and delivers the request to the provider
diff --git a/src/java/com/threerings/crowd/chat/data/ChatMarshaller.java b/src/java/com/threerings/crowd/chat/data/ChatMarshaller.java
index 0f1328306..949283a1d 100644
--- a/src/java/com/threerings/crowd/chat/data/ChatMarshaller.java
+++ b/src/java/com/threerings/crowd/chat/data/ChatMarshaller.java
@@ -21,14 +21,12 @@
 
 package com.threerings.crowd.chat.data;
 
-import com.threerings.util.Name;
-
+import com.threerings.crowd.chat.client.ChatService;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.dobj.InvocationResponseEvent;
-
-import com.threerings.crowd.chat.client.ChatService;
+import com.threerings.util.Name;
 
 /**
  * Provides the implementation of the {@link ChatService} interface
diff --git a/src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java b/src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java
index 86eb5183b..aa4fd8e86 100644
--- a/src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java
+++ b/src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java
@@ -21,11 +21,10 @@
 
 package com.threerings.crowd.chat.data;
 
+import com.threerings.crowd.chat.client.SpeakService;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 
-import com.threerings.crowd.chat.client.SpeakService;
-
 /**
  * Provides the implementation of the {@link SpeakService} interface
  * that marshalls the arguments and delivers the request to the provider
diff --git a/src/java/com/threerings/crowd/chat/server/ChannelSpeakDispatcher.java b/src/java/com/threerings/crowd/chat/server/ChannelSpeakDispatcher.java
index 417a1f745..c3487deb9 100644
--- a/src/java/com/threerings/crowd/chat/server/ChannelSpeakDispatcher.java
+++ b/src/java/com/threerings/crowd/chat/server/ChannelSpeakDispatcher.java
@@ -21,13 +21,12 @@
 
 package com.threerings.crowd.chat.server;
 
+import com.threerings.crowd.chat.data.ChannelSpeakMarshaller;
+import com.threerings.crowd.chat.data.ChatChannel;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
 
-import com.threerings.crowd.chat.data.ChannelSpeakMarshaller;
-import com.threerings.crowd.chat.data.ChatChannel;
-
 /**
  * Dispatches requests to the {@link ChannelSpeakProvider}.
  */
diff --git a/src/java/com/threerings/crowd/chat/server/ChannelSpeakProvider.java b/src/java/com/threerings/crowd/chat/server/ChannelSpeakProvider.java
index 9da0d2f6b..59bea767d 100644
--- a/src/java/com/threerings/crowd/chat/server/ChannelSpeakProvider.java
+++ b/src/java/com/threerings/crowd/chat/server/ChannelSpeakProvider.java
@@ -21,11 +21,10 @@
 
 package com.threerings.crowd.chat.server;
 
-import com.threerings.presents.data.ClientObject;
-import com.threerings.presents.server.InvocationProvider;
-
 import com.threerings.crowd.chat.client.ChannelSpeakService;
 import com.threerings.crowd.chat.data.ChatChannel;
+import com.threerings.presents.data.ClientObject;
+import com.threerings.presents.server.InvocationProvider;
 
 /**
  * Defines the server-side of the {@link ChannelSpeakService}.
diff --git a/src/java/com/threerings/crowd/chat/server/ChatDispatcher.java b/src/java/com/threerings/crowd/chat/server/ChatDispatcher.java
index 8cb15a1ca..bf45d27b1 100644
--- a/src/java/com/threerings/crowd/chat/server/ChatDispatcher.java
+++ b/src/java/com/threerings/crowd/chat/server/ChatDispatcher.java
@@ -21,15 +21,13 @@
 
 package com.threerings.crowd.chat.server;
 
-import com.threerings.util.Name;
-
+import com.threerings.crowd.chat.client.ChatService;
+import com.threerings.crowd.chat.data.ChatMarshaller;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
-
-import com.threerings.crowd.chat.client.ChatService;
-import com.threerings.crowd.chat.data.ChatMarshaller;
+import com.threerings.util.Name;
 
 /**
  * Dispatches requests to the {@link ChatProvider}.
diff --git a/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java b/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java
index cc8d52f26..01640722a 100644
--- a/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java
+++ b/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java
@@ -21,12 +21,11 @@
 
 package com.threerings.crowd.chat.server;
 
+import com.threerings.crowd.chat.data.SpeakMarshaller;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
 
-import com.threerings.crowd.chat.data.SpeakMarshaller;
-
 /**
  * Dispatches requests to the {@link SpeakProvider}.
  */
diff --git a/src/java/com/threerings/crowd/chat/server/SpeakProvider.java b/src/java/com/threerings/crowd/chat/server/SpeakProvider.java
index 9c079d788..a350e4a85 100644
--- a/src/java/com/threerings/crowd/chat/server/SpeakProvider.java
+++ b/src/java/com/threerings/crowd/chat/server/SpeakProvider.java
@@ -21,11 +21,10 @@
 
 package com.threerings.crowd.chat.server;
 
+import com.threerings.crowd.chat.client.SpeakService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationProvider;
 
-import com.threerings.crowd.chat.client.SpeakService;
-
 /**
  * Defines the server-side of the {@link SpeakService}.
  */
diff --git a/src/java/com/threerings/crowd/data/BodyMarshaller.java b/src/java/com/threerings/crowd/data/BodyMarshaller.java
index a59789cca..d13e5f826 100644
--- a/src/java/com/threerings/crowd/data/BodyMarshaller.java
+++ b/src/java/com/threerings/crowd/data/BodyMarshaller.java
@@ -21,11 +21,10 @@
 
 package com.threerings.crowd.data;
 
+import com.threerings.crowd.client.BodyService;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 
-import com.threerings.crowd.client.BodyService;
-
 /**
  * Provides the implementation of the {@link BodyService} interface
  * that marshalls the arguments and delivers the request to the provider
diff --git a/src/java/com/threerings/crowd/data/LocationMarshaller.java b/src/java/com/threerings/crowd/data/LocationMarshaller.java
index 49e887d07..7f4f5d274 100644
--- a/src/java/com/threerings/crowd/data/LocationMarshaller.java
+++ b/src/java/com/threerings/crowd/data/LocationMarshaller.java
@@ -21,12 +21,11 @@
 
 package com.threerings.crowd.data;
 
+import com.threerings.crowd.client.LocationService;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.dobj.InvocationResponseEvent;
 
-import com.threerings.crowd.client.LocationService;
-
 /**
  * Provides the implementation of the {@link LocationService} interface
  * that marshalls the arguments and delivers the request to the provider
diff --git a/src/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java b/src/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java
index fc28420a0..b5d180de1 100644
--- a/src/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java
+++ b/src/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java
@@ -21,15 +21,13 @@
 
 package com.threerings.crowd.peer.data;
 
-import com.threerings.util.Name;
-
-import com.threerings.presents.client.Client;
-import com.threerings.presents.data.InvocationMarshaller;
-
 import com.threerings.crowd.chat.client.ChatService;
 import com.threerings.crowd.chat.data.ChatMarshaller;
 import com.threerings.crowd.chat.data.UserMessage;
 import com.threerings.crowd.peer.client.CrowdPeerService;
+import com.threerings.presents.client.Client;
+import com.threerings.presents.data.InvocationMarshaller;
+import com.threerings.util.Name;
 
 /**
  * Provides the implementation of the {@link CrowdPeerService} interface
diff --git a/src/java/com/threerings/crowd/peer/server/CrowdPeerDispatcher.java b/src/java/com/threerings/crowd/peer/server/CrowdPeerDispatcher.java
index de2e32bb6..347781015 100644
--- a/src/java/com/threerings/crowd/peer/server/CrowdPeerDispatcher.java
+++ b/src/java/com/threerings/crowd/peer/server/CrowdPeerDispatcher.java
@@ -21,15 +21,13 @@
 
 package com.threerings.crowd.peer.server;
 
-import com.threerings.util.Name;
-
-import com.threerings.presents.data.ClientObject;
-import com.threerings.presents.server.InvocationDispatcher;
-import com.threerings.presents.server.InvocationException;
-
 import com.threerings.crowd.chat.client.ChatService;
 import com.threerings.crowd.chat.data.UserMessage;
 import com.threerings.crowd.peer.data.CrowdPeerMarshaller;
+import com.threerings.presents.data.ClientObject;
+import com.threerings.presents.server.InvocationDispatcher;
+import com.threerings.presents.server.InvocationException;
+import com.threerings.util.Name;
 
 /**
  * Dispatches requests to the {@link CrowdPeerProvider}.
diff --git a/src/java/com/threerings/crowd/peer/server/CrowdPeerProvider.java b/src/java/com/threerings/crowd/peer/server/CrowdPeerProvider.java
index 5d15cd65d..2980a74bf 100644
--- a/src/java/com/threerings/crowd/peer/server/CrowdPeerProvider.java
+++ b/src/java/com/threerings/crowd/peer/server/CrowdPeerProvider.java
@@ -21,15 +21,13 @@
 
 package com.threerings.crowd.peer.server;
 
-import com.threerings.util.Name;
-
-import com.threerings.presents.data.ClientObject;
-import com.threerings.presents.server.InvocationException;
-import com.threerings.presents.server.InvocationProvider;
-
 import com.threerings.crowd.chat.client.ChatService;
 import com.threerings.crowd.chat.data.UserMessage;
 import com.threerings.crowd.peer.client.CrowdPeerService;
+import com.threerings.presents.data.ClientObject;
+import com.threerings.presents.server.InvocationException;
+import com.threerings.presents.server.InvocationProvider;
+import com.threerings.util.Name;
 
 /**
  * Defines the server-side of the {@link CrowdPeerService}.
diff --git a/src/java/com/threerings/crowd/server/BodyDispatcher.java b/src/java/com/threerings/crowd/server/BodyDispatcher.java
index 6636130ef..d5488643e 100644
--- a/src/java/com/threerings/crowd/server/BodyDispatcher.java
+++ b/src/java/com/threerings/crowd/server/BodyDispatcher.java
@@ -21,12 +21,11 @@
 
 package com.threerings.crowd.server;
 
+import com.threerings.crowd.data.BodyMarshaller;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
 
-import com.threerings.crowd.data.BodyMarshaller;
-
 /**
  * Dispatches requests to the {@link BodyProvider}.
  */
diff --git a/src/java/com/threerings/crowd/server/BodyProvider.java b/src/java/com/threerings/crowd/server/BodyProvider.java
index 48c6dd4db..b1a12e0aa 100644
--- a/src/java/com/threerings/crowd/server/BodyProvider.java
+++ b/src/java/com/threerings/crowd/server/BodyProvider.java
@@ -21,11 +21,10 @@
 
 package com.threerings.crowd.server;
 
+import com.threerings.crowd.client.BodyService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationProvider;
 
-import com.threerings.crowd.client.BodyService;
-
 /**
  * Defines the server-side of the {@link BodyService}.
  */
diff --git a/src/java/com/threerings/crowd/server/LocationDispatcher.java b/src/java/com/threerings/crowd/server/LocationDispatcher.java
index 4ea5f0ed9..a13bc1786 100644
--- a/src/java/com/threerings/crowd/server/LocationDispatcher.java
+++ b/src/java/com/threerings/crowd/server/LocationDispatcher.java
@@ -21,13 +21,12 @@
 
 package com.threerings.crowd.server;
 
+import com.threerings.crowd.client.LocationService;
+import com.threerings.crowd.data.LocationMarshaller;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
 
-import com.threerings.crowd.client.LocationService;
-import com.threerings.crowd.data.LocationMarshaller;
-
 /**
  * Dispatches requests to the {@link LocationProvider}.
  */
diff --git a/src/java/com/threerings/crowd/server/LocationProvider.java b/src/java/com/threerings/crowd/server/LocationProvider.java
index e1c6cf935..c3d2b7beb 100644
--- a/src/java/com/threerings/crowd/server/LocationProvider.java
+++ b/src/java/com/threerings/crowd/server/LocationProvider.java
@@ -21,12 +21,11 @@
 
 package com.threerings.crowd.server;
 
+import com.threerings.crowd.client.LocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationException;
 import com.threerings.presents.server.InvocationProvider;
 
-import com.threerings.crowd.client.LocationService;
-
 /**
  * Defines the server-side of the {@link LocationService}.
  */