diff --git a/build.xml b/build.xml
index 52d13f2d9..9c371c581 100644
--- a/build.xml
+++ b/build.xml
@@ -2,9 +2,9 @@
-
-
-
+
+
+
@@ -13,18 +13,18 @@
-
+
-
+
-
+
-
+
@@ -37,11 +37,10 @@
-
-
-
-
+
+
+
+
@@ -61,8 +60,8 @@
-
+ classpathref="pom.path"/>
+
@@ -114,10 +113,7 @@
-
-
-
-
+
@@ -133,7 +129,7 @@
classpathref="built.classpath"/>
+ classpathref="pom.path">
@@ -155,7 +151,7 @@
description="Generates additional methods for distributed object classes">
+ classpathref="pom.path">
@@ -168,7 +164,7 @@
description="Generates marshaller and dispatcher classes for all invocation services">
+ classpathref="pom.path">
@@ -198,7 +194,7 @@
+ cpproot="core/src/cpp" checking="${gencheck}">
@@ -207,7 +203,7 @@
description="Generates sender and decoder classes for all invocation receivers">
+ classpathref="pom.path">
@@ -223,7 +219,7 @@
everything for it -->
-
+
@@ -266,18 +262,16 @@
-
-
-
+
+
-
+
-
-
diff --git a/narya.iml b/core/narya.iml
similarity index 100%
rename from narya.iml
rename to core/narya.iml
diff --git a/narya.xcodeproj/project.pbxproj b/core/narya.xcodeproj/project.pbxproj
similarity index 100%
rename from narya.xcodeproj/project.pbxproj
rename to core/narya.xcodeproj/project.pbxproj
diff --git a/core/pom.xml b/core/pom.xml
new file mode 100644
index 000000000..d39040287
--- /dev/null
+++ b/core/pom.xml
@@ -0,0 +1,96 @@
+
+
+ 4.0.0
+
+ com.threerings
+ narya-parent
+ 1.11-SNAPSHOT
+
+
+ narya
+ jar
+ Narya Core
+
+
+
+
+ com.threerings
+ ooo-util
+ 1.1
+
+
+ com.google.inject
+ guice
+ 2.0
+
+
+ javax.annotation
+ jsr250-api
+ 1.0
+
+
+
+
+ com.samskivert
+ depot
+ 1.5
+ true
+
+
+ net.sf.ehcache
+ ehcache
+ 1.6.0
+ true
+
+
+ com.threerings
+ gwt-utils
+ 1.5
+ true
+
+
+
+
+ com.google.gwt
+ gwt-user
+ 2.4.0
+ provided
+
+
+ org.apache.ant
+ ant
+ 1.7.1
+ provided
+
+
+ junit
+ junit
+ 4.10
+ test
+
+
+ org.hsqldb
+ hsqldb
+ 2.0.0
+ test
+
+
+
+
+
+
+
+ ${project.build.sourceDirectory}
+
+ **/*.gwt.xml
+ **/web/server/*Exception.java
+ **/web/client/*.java
+ **/web/gwt/*.java
+
+
+
+ ${basedir}/src/main/resources
+
+
+
+
diff --git a/src/cpp/presents/ArrayMask.cpp b/core/src/cpp/presents/ArrayMask.cpp
similarity index 100%
rename from src/cpp/presents/ArrayMask.cpp
rename to core/src/cpp/presents/ArrayMask.cpp
diff --git a/src/cpp/presents/ArrayMask.h b/core/src/cpp/presents/ArrayMask.h
similarity index 100%
rename from src/cpp/presents/ArrayMask.h
rename to core/src/cpp/presents/ArrayMask.h
diff --git a/src/cpp/presents/ClassMapping.h b/core/src/cpp/presents/ClassMapping.h
similarity index 100%
rename from src/cpp/presents/ClassMapping.h
rename to core/src/cpp/presents/ClassMapping.h
diff --git a/src/cpp/presents/DisconnectReason.h b/core/src/cpp/presents/DisconnectReason.h
similarity index 100%
rename from src/cpp/presents/DisconnectReason.h
rename to core/src/cpp/presents/DisconnectReason.h
diff --git a/src/cpp/presents/InvocationDecoder.cpp b/core/src/cpp/presents/InvocationDecoder.cpp
similarity index 100%
rename from src/cpp/presents/InvocationDecoder.cpp
rename to core/src/cpp/presents/InvocationDecoder.cpp
diff --git a/src/cpp/presents/InvocationDecoder.h b/core/src/cpp/presents/InvocationDecoder.h
similarity index 100%
rename from src/cpp/presents/InvocationDecoder.h
rename to core/src/cpp/presents/InvocationDecoder.h
diff --git a/src/cpp/presents/ObjectInputStream.cpp b/core/src/cpp/presents/ObjectInputStream.cpp
similarity index 100%
rename from src/cpp/presents/ObjectInputStream.cpp
rename to core/src/cpp/presents/ObjectInputStream.cpp
diff --git a/src/cpp/presents/ObjectInputStream.h b/core/src/cpp/presents/ObjectInputStream.h
similarity index 100%
rename from src/cpp/presents/ObjectInputStream.h
rename to core/src/cpp/presents/ObjectInputStream.h
diff --git a/src/cpp/presents/ObjectOutputStream.cpp b/core/src/cpp/presents/ObjectOutputStream.cpp
similarity index 100%
rename from src/cpp/presents/ObjectOutputStream.cpp
rename to core/src/cpp/presents/ObjectOutputStream.cpp
diff --git a/src/cpp/presents/ObjectOutputStream.h b/core/src/cpp/presents/ObjectOutputStream.h
similarity index 100%
rename from src/cpp/presents/ObjectOutputStream.h
rename to core/src/cpp/presents/ObjectOutputStream.h
diff --git a/src/cpp/presents/PresentsClient.cpp b/core/src/cpp/presents/PresentsClient.cpp
similarity index 100%
rename from src/cpp/presents/PresentsClient.cpp
rename to core/src/cpp/presents/PresentsClient.cpp
diff --git a/src/cpp/presents/PresentsClient.h b/core/src/cpp/presents/PresentsClient.h
similarity index 100%
rename from src/cpp/presents/PresentsClient.h
rename to core/src/cpp/presents/PresentsClient.h
diff --git a/src/cpp/presents/PresentsError.h b/core/src/cpp/presents/PresentsError.h
similarity index 100%
rename from src/cpp/presents/PresentsError.h
rename to core/src/cpp/presents/PresentsError.h
diff --git a/src/cpp/presents/SocketStream.h b/core/src/cpp/presents/SocketStream.h
similarity index 100%
rename from src/cpp/presents/SocketStream.h
rename to core/src/cpp/presents/SocketStream.h
diff --git a/src/cpp/presents/Streamable.h b/core/src/cpp/presents/Streamable.h
similarity index 100%
rename from src/cpp/presents/Streamable.h
rename to core/src/cpp/presents/Streamable.h
diff --git a/src/cpp/presents/Streamer.cpp b/core/src/cpp/presents/Streamer.cpp
similarity index 100%
rename from src/cpp/presents/Streamer.cpp
rename to core/src/cpp/presents/Streamer.cpp
diff --git a/src/cpp/presents/Streamer.h b/core/src/cpp/presents/Streamer.h
similarity index 100%
rename from src/cpp/presents/Streamer.h
rename to core/src/cpp/presents/Streamer.h
diff --git a/src/cpp/presents/Util.cpp b/core/src/cpp/presents/Util.cpp
similarity index 100%
rename from src/cpp/presents/Util.cpp
rename to core/src/cpp/presents/Util.cpp
diff --git a/src/cpp/presents/Util.h b/core/src/cpp/presents/Util.h
similarity index 100%
rename from src/cpp/presents/Util.h
rename to core/src/cpp/presents/Util.h
diff --git a/src/cpp/presents/box/BoxedBoolean.cpp b/core/src/cpp/presents/box/BoxedBoolean.cpp
similarity index 100%
rename from src/cpp/presents/box/BoxedBoolean.cpp
rename to core/src/cpp/presents/box/BoxedBoolean.cpp
diff --git a/src/cpp/presents/box/BoxedBoolean.h b/core/src/cpp/presents/box/BoxedBoolean.h
similarity index 100%
rename from src/cpp/presents/box/BoxedBoolean.h
rename to core/src/cpp/presents/box/BoxedBoolean.h
diff --git a/src/cpp/presents/box/BoxedByte.cpp b/core/src/cpp/presents/box/BoxedByte.cpp
similarity index 100%
rename from src/cpp/presents/box/BoxedByte.cpp
rename to core/src/cpp/presents/box/BoxedByte.cpp
diff --git a/src/cpp/presents/box/BoxedByte.h b/core/src/cpp/presents/box/BoxedByte.h
similarity index 100%
rename from src/cpp/presents/box/BoxedByte.h
rename to core/src/cpp/presents/box/BoxedByte.h
diff --git a/src/cpp/presents/box/BoxedDouble.cpp b/core/src/cpp/presents/box/BoxedDouble.cpp
similarity index 100%
rename from src/cpp/presents/box/BoxedDouble.cpp
rename to core/src/cpp/presents/box/BoxedDouble.cpp
diff --git a/src/cpp/presents/box/BoxedDouble.h b/core/src/cpp/presents/box/BoxedDouble.h
similarity index 100%
rename from src/cpp/presents/box/BoxedDouble.h
rename to core/src/cpp/presents/box/BoxedDouble.h
diff --git a/src/cpp/presents/box/BoxedFloat.cpp b/core/src/cpp/presents/box/BoxedFloat.cpp
similarity index 100%
rename from src/cpp/presents/box/BoxedFloat.cpp
rename to core/src/cpp/presents/box/BoxedFloat.cpp
diff --git a/src/cpp/presents/box/BoxedFloat.h b/core/src/cpp/presents/box/BoxedFloat.h
similarity index 100%
rename from src/cpp/presents/box/BoxedFloat.h
rename to core/src/cpp/presents/box/BoxedFloat.h
diff --git a/src/cpp/presents/box/BoxedInt.cpp b/core/src/cpp/presents/box/BoxedInt.cpp
similarity index 100%
rename from src/cpp/presents/box/BoxedInt.cpp
rename to core/src/cpp/presents/box/BoxedInt.cpp
diff --git a/src/cpp/presents/box/BoxedInt.h b/core/src/cpp/presents/box/BoxedInt.h
similarity index 100%
rename from src/cpp/presents/box/BoxedInt.h
rename to core/src/cpp/presents/box/BoxedInt.h
diff --git a/src/cpp/presents/box/BoxedShort.cpp b/core/src/cpp/presents/box/BoxedShort.cpp
similarity index 100%
rename from src/cpp/presents/box/BoxedShort.cpp
rename to core/src/cpp/presents/box/BoxedShort.cpp
diff --git a/src/cpp/presents/box/BoxedShort.h b/core/src/cpp/presents/box/BoxedShort.h
similarity index 100%
rename from src/cpp/presents/box/BoxedShort.h
rename to core/src/cpp/presents/box/BoxedShort.h
diff --git a/src/cpp/presents/box/boxer.py b/core/src/cpp/presents/box/boxer.py
similarity index 100%
rename from src/cpp/presents/box/boxer.py
rename to core/src/cpp/presents/box/boxer.py
diff --git a/src/cpp/presents/client/Registration.cpp b/core/src/cpp/presents/client/Registration.cpp
similarity index 100%
rename from src/cpp/presents/client/Registration.cpp
rename to core/src/cpp/presents/client/Registration.cpp
diff --git a/src/cpp/presents/client/Registration.h b/core/src/cpp/presents/client/Registration.h
similarity index 100%
rename from src/cpp/presents/client/Registration.h
rename to core/src/cpp/presents/client/Registration.h
diff --git a/src/cpp/presents/data/ClientObject.cpp b/core/src/cpp/presents/data/ClientObject.cpp
similarity index 100%
rename from src/cpp/presents/data/ClientObject.cpp
rename to core/src/cpp/presents/data/ClientObject.cpp
diff --git a/src/cpp/presents/data/ClientObject.h b/core/src/cpp/presents/data/ClientObject.h
similarity index 100%
rename from src/cpp/presents/data/ClientObject.h
rename to core/src/cpp/presents/data/ClientObject.h
diff --git a/src/cpp/presents/data/InvocationMarshaller.cpp b/core/src/cpp/presents/data/InvocationMarshaller.cpp
similarity index 100%
rename from src/cpp/presents/data/InvocationMarshaller.cpp
rename to core/src/cpp/presents/data/InvocationMarshaller.cpp
diff --git a/src/cpp/presents/data/InvocationMarshaller.h b/core/src/cpp/presents/data/InvocationMarshaller.h
similarity index 100%
rename from src/cpp/presents/data/InvocationMarshaller.h
rename to core/src/cpp/presents/data/InvocationMarshaller.h
diff --git a/src/cpp/presents/data/PermissionPolicy.cpp b/core/src/cpp/presents/data/PermissionPolicy.cpp
similarity index 100%
rename from src/cpp/presents/data/PermissionPolicy.cpp
rename to core/src/cpp/presents/data/PermissionPolicy.cpp
diff --git a/src/cpp/presents/data/PermissionPolicy.h b/core/src/cpp/presents/data/PermissionPolicy.h
similarity index 100%
rename from src/cpp/presents/data/PermissionPolicy.h
rename to core/src/cpp/presents/data/PermissionPolicy.h
diff --git a/src/cpp/presents/data/RegistrationMarshaller.cpp b/core/src/cpp/presents/data/RegistrationMarshaller.cpp
similarity index 100%
rename from src/cpp/presents/data/RegistrationMarshaller.cpp
rename to core/src/cpp/presents/data/RegistrationMarshaller.cpp
diff --git a/src/cpp/presents/data/RegistrationMarshaller.h b/core/src/cpp/presents/data/RegistrationMarshaller.h
similarity index 100%
rename from src/cpp/presents/data/RegistrationMarshaller.h
rename to core/src/cpp/presents/data/RegistrationMarshaller.h
diff --git a/src/cpp/presents/dobj/DEvent.cpp b/core/src/cpp/presents/dobj/DEvent.cpp
similarity index 100%
rename from src/cpp/presents/dobj/DEvent.cpp
rename to core/src/cpp/presents/dobj/DEvent.cpp
diff --git a/src/cpp/presents/dobj/DEvent.h b/core/src/cpp/presents/dobj/DEvent.h
similarity index 100%
rename from src/cpp/presents/dobj/DEvent.h
rename to core/src/cpp/presents/dobj/DEvent.h
diff --git a/src/cpp/presents/dobj/DObject.cpp b/core/src/cpp/presents/dobj/DObject.cpp
similarity index 100%
rename from src/cpp/presents/dobj/DObject.cpp
rename to core/src/cpp/presents/dobj/DObject.cpp
diff --git a/src/cpp/presents/dobj/DObject.h b/core/src/cpp/presents/dobj/DObject.h
similarity index 100%
rename from src/cpp/presents/dobj/DObject.h
rename to core/src/cpp/presents/dobj/DObject.h
diff --git a/src/cpp/presents/dobj/DSet.cpp b/core/src/cpp/presents/dobj/DSet.cpp
similarity index 100%
rename from src/cpp/presents/dobj/DSet.cpp
rename to core/src/cpp/presents/dobj/DSet.cpp
diff --git a/src/cpp/presents/dobj/DSet.h b/core/src/cpp/presents/dobj/DSet.h
similarity index 100%
rename from src/cpp/presents/dobj/DSet.h
rename to core/src/cpp/presents/dobj/DSet.h
diff --git a/src/cpp/presents/dobj/EntryAddedEvent.cpp b/core/src/cpp/presents/dobj/EntryAddedEvent.cpp
similarity index 100%
rename from src/cpp/presents/dobj/EntryAddedEvent.cpp
rename to core/src/cpp/presents/dobj/EntryAddedEvent.cpp
diff --git a/src/cpp/presents/dobj/EntryAddedEvent.h b/core/src/cpp/presents/dobj/EntryAddedEvent.h
similarity index 100%
rename from src/cpp/presents/dobj/EntryAddedEvent.h
rename to core/src/cpp/presents/dobj/EntryAddedEvent.h
diff --git a/src/cpp/presents/dobj/EntryEvent.cpp b/core/src/cpp/presents/dobj/EntryEvent.cpp
similarity index 100%
rename from src/cpp/presents/dobj/EntryEvent.cpp
rename to core/src/cpp/presents/dobj/EntryEvent.cpp
diff --git a/src/cpp/presents/dobj/EntryEvent.h b/core/src/cpp/presents/dobj/EntryEvent.h
similarity index 100%
rename from src/cpp/presents/dobj/EntryEvent.h
rename to core/src/cpp/presents/dobj/EntryEvent.h
diff --git a/src/cpp/presents/dobj/EntryRemovedEvent.cpp b/core/src/cpp/presents/dobj/EntryRemovedEvent.cpp
similarity index 100%
rename from src/cpp/presents/dobj/EntryRemovedEvent.cpp
rename to core/src/cpp/presents/dobj/EntryRemovedEvent.cpp
diff --git a/src/cpp/presents/dobj/EntryRemovedEvent.h b/core/src/cpp/presents/dobj/EntryRemovedEvent.h
similarity index 100%
rename from src/cpp/presents/dobj/EntryRemovedEvent.h
rename to core/src/cpp/presents/dobj/EntryRemovedEvent.h
diff --git a/src/cpp/presents/dobj/EntryUpdatedEvent.cpp b/core/src/cpp/presents/dobj/EntryUpdatedEvent.cpp
similarity index 100%
rename from src/cpp/presents/dobj/EntryUpdatedEvent.cpp
rename to core/src/cpp/presents/dobj/EntryUpdatedEvent.cpp
diff --git a/src/cpp/presents/dobj/EntryUpdatedEvent.h b/core/src/cpp/presents/dobj/EntryUpdatedEvent.h
similarity index 100%
rename from src/cpp/presents/dobj/EntryUpdatedEvent.h
rename to core/src/cpp/presents/dobj/EntryUpdatedEvent.h
diff --git a/src/cpp/presents/dobj/InvocationNotificationEvent.cpp b/core/src/cpp/presents/dobj/InvocationNotificationEvent.cpp
similarity index 100%
rename from src/cpp/presents/dobj/InvocationNotificationEvent.cpp
rename to core/src/cpp/presents/dobj/InvocationNotificationEvent.cpp
diff --git a/src/cpp/presents/dobj/InvocationNotificationEvent.h b/core/src/cpp/presents/dobj/InvocationNotificationEvent.h
similarity index 100%
rename from src/cpp/presents/dobj/InvocationNotificationEvent.h
rename to core/src/cpp/presents/dobj/InvocationNotificationEvent.h
diff --git a/src/cpp/presents/dobj/InvocationRequestEvent.cpp b/core/src/cpp/presents/dobj/InvocationRequestEvent.cpp
similarity index 100%
rename from src/cpp/presents/dobj/InvocationRequestEvent.cpp
rename to core/src/cpp/presents/dobj/InvocationRequestEvent.cpp
diff --git a/src/cpp/presents/dobj/InvocationRequestEvent.h b/core/src/cpp/presents/dobj/InvocationRequestEvent.h
similarity index 100%
rename from src/cpp/presents/dobj/InvocationRequestEvent.h
rename to core/src/cpp/presents/dobj/InvocationRequestEvent.h
diff --git a/src/cpp/presents/dobj/NamedEvent.cpp b/core/src/cpp/presents/dobj/NamedEvent.cpp
similarity index 100%
rename from src/cpp/presents/dobj/NamedEvent.cpp
rename to core/src/cpp/presents/dobj/NamedEvent.cpp
diff --git a/src/cpp/presents/dobj/NamedEvent.h b/core/src/cpp/presents/dobj/NamedEvent.h
similarity index 100%
rename from src/cpp/presents/dobj/NamedEvent.h
rename to core/src/cpp/presents/dobj/NamedEvent.h
diff --git a/src/cpp/presents/io/FramedInputStream.cpp b/core/src/cpp/presents/io/FramedInputStream.cpp
similarity index 100%
rename from src/cpp/presents/io/FramedInputStream.cpp
rename to core/src/cpp/presents/io/FramedInputStream.cpp
diff --git a/src/cpp/presents/io/FramedInputStream.h b/core/src/cpp/presents/io/FramedInputStream.h
similarity index 100%
rename from src/cpp/presents/io/FramedInputStream.h
rename to core/src/cpp/presents/io/FramedInputStream.h
diff --git a/src/cpp/presents/io/FramingOutputStream.cpp b/core/src/cpp/presents/io/FramingOutputStream.cpp
similarity index 100%
rename from src/cpp/presents/io/FramingOutputStream.cpp
rename to core/src/cpp/presents/io/FramingOutputStream.cpp
diff --git a/src/cpp/presents/io/FramingOutputStream.h b/core/src/cpp/presents/io/FramingOutputStream.h
similarity index 100%
rename from src/cpp/presents/io/FramingOutputStream.h
rename to core/src/cpp/presents/io/FramingOutputStream.h
diff --git a/src/cpp/presents/io/InputStream.h b/core/src/cpp/presents/io/InputStream.h
similarity index 100%
rename from src/cpp/presents/io/InputStream.h
rename to core/src/cpp/presents/io/InputStream.h
diff --git a/src/cpp/presents/io/OutputStream.h b/core/src/cpp/presents/io/OutputStream.h
similarity index 100%
rename from src/cpp/presents/io/OutputStream.h
rename to core/src/cpp/presents/io/OutputStream.h
diff --git a/src/cpp/presents/net/AuthRequest.cpp b/core/src/cpp/presents/net/AuthRequest.cpp
similarity index 100%
rename from src/cpp/presents/net/AuthRequest.cpp
rename to core/src/cpp/presents/net/AuthRequest.cpp
diff --git a/src/cpp/presents/net/AuthRequest.h b/core/src/cpp/presents/net/AuthRequest.h
similarity index 100%
rename from src/cpp/presents/net/AuthRequest.h
rename to core/src/cpp/presents/net/AuthRequest.h
diff --git a/src/cpp/presents/net/AuthResponse.cpp b/core/src/cpp/presents/net/AuthResponse.cpp
similarity index 100%
rename from src/cpp/presents/net/AuthResponse.cpp
rename to core/src/cpp/presents/net/AuthResponse.cpp
diff --git a/src/cpp/presents/net/AuthResponse.h b/core/src/cpp/presents/net/AuthResponse.h
similarity index 100%
rename from src/cpp/presents/net/AuthResponse.h
rename to core/src/cpp/presents/net/AuthResponse.h
diff --git a/src/cpp/presents/net/AuthResponseData.cpp b/core/src/cpp/presents/net/AuthResponseData.cpp
similarity index 100%
rename from src/cpp/presents/net/AuthResponseData.cpp
rename to core/src/cpp/presents/net/AuthResponseData.cpp
diff --git a/src/cpp/presents/net/AuthResponseData.h b/core/src/cpp/presents/net/AuthResponseData.h
similarity index 100%
rename from src/cpp/presents/net/AuthResponseData.h
rename to core/src/cpp/presents/net/AuthResponseData.h
diff --git a/src/cpp/presents/net/BootstrapData.cpp b/core/src/cpp/presents/net/BootstrapData.cpp
similarity index 100%
rename from src/cpp/presents/net/BootstrapData.cpp
rename to core/src/cpp/presents/net/BootstrapData.cpp
diff --git a/src/cpp/presents/net/BootstrapData.h b/core/src/cpp/presents/net/BootstrapData.h
similarity index 100%
rename from src/cpp/presents/net/BootstrapData.h
rename to core/src/cpp/presents/net/BootstrapData.h
diff --git a/src/cpp/presents/net/BootstrapNotification.cpp b/core/src/cpp/presents/net/BootstrapNotification.cpp
similarity index 100%
rename from src/cpp/presents/net/BootstrapNotification.cpp
rename to core/src/cpp/presents/net/BootstrapNotification.cpp
diff --git a/src/cpp/presents/net/BootstrapNotification.h b/core/src/cpp/presents/net/BootstrapNotification.h
similarity index 100%
rename from src/cpp/presents/net/BootstrapNotification.h
rename to core/src/cpp/presents/net/BootstrapNotification.h
diff --git a/src/cpp/presents/net/Credentials.cpp b/core/src/cpp/presents/net/Credentials.cpp
similarity index 100%
rename from src/cpp/presents/net/Credentials.cpp
rename to core/src/cpp/presents/net/Credentials.cpp
diff --git a/src/cpp/presents/net/Credentials.h b/core/src/cpp/presents/net/Credentials.h
similarity index 100%
rename from src/cpp/presents/net/Credentials.h
rename to core/src/cpp/presents/net/Credentials.h
diff --git a/src/cpp/presents/net/DownstreamMessage.cpp b/core/src/cpp/presents/net/DownstreamMessage.cpp
similarity index 100%
rename from src/cpp/presents/net/DownstreamMessage.cpp
rename to core/src/cpp/presents/net/DownstreamMessage.cpp
diff --git a/src/cpp/presents/net/DownstreamMessage.h b/core/src/cpp/presents/net/DownstreamMessage.h
similarity index 100%
rename from src/cpp/presents/net/DownstreamMessage.h
rename to core/src/cpp/presents/net/DownstreamMessage.h
diff --git a/src/cpp/presents/net/EventNotification.cpp b/core/src/cpp/presents/net/EventNotification.cpp
similarity index 100%
rename from src/cpp/presents/net/EventNotification.cpp
rename to core/src/cpp/presents/net/EventNotification.cpp
diff --git a/src/cpp/presents/net/EventNotification.h b/core/src/cpp/presents/net/EventNotification.h
similarity index 100%
rename from src/cpp/presents/net/EventNotification.h
rename to core/src/cpp/presents/net/EventNotification.h
diff --git a/src/cpp/presents/net/ForwardEventRequest.cpp b/core/src/cpp/presents/net/ForwardEventRequest.cpp
similarity index 100%
rename from src/cpp/presents/net/ForwardEventRequest.cpp
rename to core/src/cpp/presents/net/ForwardEventRequest.cpp
diff --git a/src/cpp/presents/net/ForwardEventRequest.h b/core/src/cpp/presents/net/ForwardEventRequest.h
similarity index 100%
rename from src/cpp/presents/net/ForwardEventRequest.h
rename to core/src/cpp/presents/net/ForwardEventRequest.h
diff --git a/src/cpp/presents/net/ObjectResponse.cpp b/core/src/cpp/presents/net/ObjectResponse.cpp
similarity index 100%
rename from src/cpp/presents/net/ObjectResponse.cpp
rename to core/src/cpp/presents/net/ObjectResponse.cpp
diff --git a/src/cpp/presents/net/ObjectResponse.h b/core/src/cpp/presents/net/ObjectResponse.h
similarity index 100%
rename from src/cpp/presents/net/ObjectResponse.h
rename to core/src/cpp/presents/net/ObjectResponse.h
diff --git a/src/cpp/presents/net/PingRequest.cpp b/core/src/cpp/presents/net/PingRequest.cpp
similarity index 100%
rename from src/cpp/presents/net/PingRequest.cpp
rename to core/src/cpp/presents/net/PingRequest.cpp
diff --git a/src/cpp/presents/net/PingRequest.h b/core/src/cpp/presents/net/PingRequest.h
similarity index 100%
rename from src/cpp/presents/net/PingRequest.h
rename to core/src/cpp/presents/net/PingRequest.h
diff --git a/src/cpp/presents/net/PongResponse.cpp b/core/src/cpp/presents/net/PongResponse.cpp
similarity index 100%
rename from src/cpp/presents/net/PongResponse.cpp
rename to core/src/cpp/presents/net/PongResponse.cpp
diff --git a/src/cpp/presents/net/PongResponse.h b/core/src/cpp/presents/net/PongResponse.h
similarity index 100%
rename from src/cpp/presents/net/PongResponse.h
rename to core/src/cpp/presents/net/PongResponse.h
diff --git a/src/cpp/presents/net/UpstreamMessage.cpp b/core/src/cpp/presents/net/UpstreamMessage.cpp
similarity index 100%
rename from src/cpp/presents/net/UpstreamMessage.cpp
rename to core/src/cpp/presents/net/UpstreamMessage.cpp
diff --git a/src/cpp/presents/net/UpstreamMessage.h b/core/src/cpp/presents/net/UpstreamMessage.h
similarity index 100%
rename from src/cpp/presents/net/UpstreamMessage.h
rename to core/src/cpp/presents/net/UpstreamMessage.h
diff --git a/src/cpp/presents/net/UsernamePasswordCreds.cpp b/core/src/cpp/presents/net/UsernamePasswordCreds.cpp
similarity index 100%
rename from src/cpp/presents/net/UsernamePasswordCreds.cpp
rename to core/src/cpp/presents/net/UsernamePasswordCreds.cpp
diff --git a/src/cpp/presents/net/UsernamePasswordCreds.h b/core/src/cpp/presents/net/UsernamePasswordCreds.h
similarity index 100%
rename from src/cpp/presents/net/UsernamePasswordCreds.h
rename to core/src/cpp/presents/net/UsernamePasswordCreds.h
diff --git a/src/cpp/presents/platform/CFSocketStream.cpp b/core/src/cpp/presents/platform/CFSocketStream.cpp
similarity index 100%
rename from src/cpp/presents/platform/CFSocketStream.cpp
rename to core/src/cpp/presents/platform/CFSocketStream.cpp
diff --git a/src/cpp/presents/platform/NSLog.mm b/core/src/cpp/presents/platform/NSLog.mm
similarity index 100%
rename from src/cpp/presents/platform/NSLog.mm
rename to core/src/cpp/presents/platform/NSLog.mm
diff --git a/src/cpp/presents/stable.h b/core/src/cpp/presents/stable.h
similarity index 100%
rename from src/cpp/presents/stable.h
rename to core/src/cpp/presents/stable.h
diff --git a/src/cpp/presents/streamers/StreamableStreamer.h b/core/src/cpp/presents/streamers/StreamableStreamer.h
similarity index 100%
rename from src/cpp/presents/streamers/StreamableStreamer.h
rename to core/src/cpp/presents/streamers/StreamableStreamer.h
diff --git a/src/cpp/presents/streamers/StringStreamer.cpp b/core/src/cpp/presents/streamers/StringStreamer.cpp
similarity index 100%
rename from src/cpp/presents/streamers/StringStreamer.cpp
rename to core/src/cpp/presents/streamers/StringStreamer.cpp
diff --git a/src/cpp/presents/streamers/StringStreamer.h b/core/src/cpp/presents/streamers/StringStreamer.h
similarity index 100%
rename from src/cpp/presents/streamers/StringStreamer.h
rename to core/src/cpp/presents/streamers/StringStreamer.h
diff --git a/src/cpp/presents/streamers/VectorStreamer.h b/core/src/cpp/presents/streamers/VectorStreamer.h
similarity index 100%
rename from src/cpp/presents/streamers/VectorStreamer.h
rename to core/src/cpp/presents/streamers/VectorStreamer.h
diff --git a/src/cpp/util/Name.cpp b/core/src/cpp/util/Name.cpp
similarity index 100%
rename from src/cpp/util/Name.cpp
rename to core/src/cpp/util/Name.cpp
diff --git a/src/cpp/util/Name.h b/core/src/cpp/util/Name.h
similarity index 100%
rename from src/cpp/util/Name.h
rename to core/src/cpp/util/Name.h
diff --git a/src/main/as/com/threerings/bureau/client/Agent.as b/core/src/main/as/com/threerings/bureau/client/Agent.as
similarity index 100%
rename from src/main/as/com/threerings/bureau/client/Agent.as
rename to core/src/main/as/com/threerings/bureau/client/Agent.as
diff --git a/src/main/as/com/threerings/bureau/client/BureauClient.as b/core/src/main/as/com/threerings/bureau/client/BureauClient.as
similarity index 100%
rename from src/main/as/com/threerings/bureau/client/BureauClient.as
rename to core/src/main/as/com/threerings/bureau/client/BureauClient.as
diff --git a/src/main/as/com/threerings/bureau/client/BureauDecoder.as b/core/src/main/as/com/threerings/bureau/client/BureauDecoder.as
similarity index 100%
rename from src/main/as/com/threerings/bureau/client/BureauDecoder.as
rename to core/src/main/as/com/threerings/bureau/client/BureauDecoder.as
diff --git a/src/main/as/com/threerings/bureau/client/BureauDirector.as b/core/src/main/as/com/threerings/bureau/client/BureauDirector.as
similarity index 100%
rename from src/main/as/com/threerings/bureau/client/BureauDirector.as
rename to core/src/main/as/com/threerings/bureau/client/BureauDirector.as
diff --git a/src/main/as/com/threerings/bureau/client/BureauReceiver.as b/core/src/main/as/com/threerings/bureau/client/BureauReceiver.as
similarity index 100%
rename from src/main/as/com/threerings/bureau/client/BureauReceiver.as
rename to core/src/main/as/com/threerings/bureau/client/BureauReceiver.as
diff --git a/src/main/as/com/threerings/bureau/client/BureauService.as b/core/src/main/as/com/threerings/bureau/client/BureauService.as
similarity index 100%
rename from src/main/as/com/threerings/bureau/client/BureauService.as
rename to core/src/main/as/com/threerings/bureau/client/BureauService.as
diff --git a/src/main/as/com/threerings/bureau/data/AgentObject.as b/core/src/main/as/com/threerings/bureau/data/AgentObject.as
similarity index 100%
rename from src/main/as/com/threerings/bureau/data/AgentObject.as
rename to core/src/main/as/com/threerings/bureau/data/AgentObject.as
diff --git a/src/main/as/com/threerings/bureau/data/BureauAuthName.as b/core/src/main/as/com/threerings/bureau/data/BureauAuthName.as
similarity index 100%
rename from src/main/as/com/threerings/bureau/data/BureauAuthName.as
rename to core/src/main/as/com/threerings/bureau/data/BureauAuthName.as
diff --git a/src/main/as/com/threerings/bureau/data/BureauClientObject.as b/core/src/main/as/com/threerings/bureau/data/BureauClientObject.as
similarity index 100%
rename from src/main/as/com/threerings/bureau/data/BureauClientObject.as
rename to core/src/main/as/com/threerings/bureau/data/BureauClientObject.as
diff --git a/src/main/as/com/threerings/bureau/data/BureauCodes.as b/core/src/main/as/com/threerings/bureau/data/BureauCodes.as
similarity index 100%
rename from src/main/as/com/threerings/bureau/data/BureauCodes.as
rename to core/src/main/as/com/threerings/bureau/data/BureauCodes.as
diff --git a/src/main/as/com/threerings/bureau/data/BureauCredentials.as b/core/src/main/as/com/threerings/bureau/data/BureauCredentials.as
similarity index 100%
rename from src/main/as/com/threerings/bureau/data/BureauCredentials.as
rename to core/src/main/as/com/threerings/bureau/data/BureauCredentials.as
diff --git a/src/main/as/com/threerings/bureau/data/BureauMarshaller.as b/core/src/main/as/com/threerings/bureau/data/BureauMarshaller.as
similarity index 100%
rename from src/main/as/com/threerings/bureau/data/BureauMarshaller.as
rename to core/src/main/as/com/threerings/bureau/data/BureauMarshaller.as
diff --git a/src/main/as/com/threerings/bureau/util/BureauContext.as b/core/src/main/as/com/threerings/bureau/util/BureauContext.as
similarity index 100%
rename from src/main/as/com/threerings/bureau/util/BureauContext.as
rename to core/src/main/as/com/threerings/bureau/util/BureauContext.as
diff --git a/src/main/as/com/threerings/crowd/chat/client/BroadcastHandler.as b/core/src/main/as/com/threerings/crowd/chat/client/BroadcastHandler.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/client/BroadcastHandler.as
rename to core/src/main/as/com/threerings/crowd/chat/client/BroadcastHandler.as
diff --git a/src/main/as/com/threerings/crowd/chat/client/ChannelSpeakService.as b/core/src/main/as/com/threerings/crowd/chat/client/ChannelSpeakService.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/client/ChannelSpeakService.as
rename to core/src/main/as/com/threerings/crowd/chat/client/ChannelSpeakService.as
diff --git a/src/main/as/com/threerings/crowd/chat/client/ChatCantStealFocus.as b/core/src/main/as/com/threerings/crowd/chat/client/ChatCantStealFocus.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/client/ChatCantStealFocus.as
rename to core/src/main/as/com/threerings/crowd/chat/client/ChatCantStealFocus.as
diff --git a/src/main/as/com/threerings/crowd/chat/client/ChatDirector.as b/core/src/main/as/com/threerings/crowd/chat/client/ChatDirector.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/client/ChatDirector.as
rename to core/src/main/as/com/threerings/crowd/chat/client/ChatDirector.as
diff --git a/src/main/as/com/threerings/crowd/chat/client/ChatDisplay.as b/core/src/main/as/com/threerings/crowd/chat/client/ChatDisplay.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/client/ChatDisplay.as
rename to core/src/main/as/com/threerings/crowd/chat/client/ChatDisplay.as
diff --git a/src/main/as/com/threerings/crowd/chat/client/ChatFilter.as b/core/src/main/as/com/threerings/crowd/chat/client/ChatFilter.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/client/ChatFilter.as
rename to core/src/main/as/com/threerings/crowd/chat/client/ChatFilter.as
diff --git a/src/main/as/com/threerings/crowd/chat/client/ChatService.as b/core/src/main/as/com/threerings/crowd/chat/client/ChatService.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/client/ChatService.as
rename to core/src/main/as/com/threerings/crowd/chat/client/ChatService.as
diff --git a/src/main/as/com/threerings/crowd/chat/client/ChatService_TellListener.as b/core/src/main/as/com/threerings/crowd/chat/client/ChatService_TellListener.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/client/ChatService_TellListener.as
rename to core/src/main/as/com/threerings/crowd/chat/client/ChatService_TellListener.as
diff --git a/src/main/as/com/threerings/crowd/chat/client/ChatSnooper.as b/core/src/main/as/com/threerings/crowd/chat/client/ChatSnooper.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/client/ChatSnooper.as
rename to core/src/main/as/com/threerings/crowd/chat/client/ChatSnooper.as
diff --git a/src/main/as/com/threerings/crowd/chat/client/ChatterObserver.as b/core/src/main/as/com/threerings/crowd/chat/client/ChatterObserver.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/client/ChatterObserver.as
rename to core/src/main/as/com/threerings/crowd/chat/client/ChatterObserver.as
diff --git a/src/main/as/com/threerings/crowd/chat/client/ChatterValidator.as b/core/src/main/as/com/threerings/crowd/chat/client/ChatterValidator.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/client/ChatterValidator.as
rename to core/src/main/as/com/threerings/crowd/chat/client/ChatterValidator.as
diff --git a/src/main/as/com/threerings/crowd/chat/client/ClearHandler.as b/core/src/main/as/com/threerings/crowd/chat/client/ClearHandler.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/client/ClearHandler.as
rename to core/src/main/as/com/threerings/crowd/chat/client/ClearHandler.as
diff --git a/src/main/as/com/threerings/crowd/chat/client/CommandHandler.as b/core/src/main/as/com/threerings/crowd/chat/client/CommandHandler.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/client/CommandHandler.as
rename to core/src/main/as/com/threerings/crowd/chat/client/CommandHandler.as
diff --git a/src/main/as/com/threerings/crowd/chat/client/CurseFilter.as b/core/src/main/as/com/threerings/crowd/chat/client/CurseFilter.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/client/CurseFilter.as
rename to core/src/main/as/com/threerings/crowd/chat/client/CurseFilter.as
diff --git a/src/main/as/com/threerings/crowd/chat/client/EmoteHandler.as b/core/src/main/as/com/threerings/crowd/chat/client/EmoteHandler.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/client/EmoteHandler.as
rename to core/src/main/as/com/threerings/crowd/chat/client/EmoteHandler.as
diff --git a/src/main/as/com/threerings/crowd/chat/client/HelpHandler.as b/core/src/main/as/com/threerings/crowd/chat/client/HelpHandler.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/client/HelpHandler.as
rename to core/src/main/as/com/threerings/crowd/chat/client/HelpHandler.as
diff --git a/src/main/as/com/threerings/crowd/chat/client/MuteDirector.as b/core/src/main/as/com/threerings/crowd/chat/client/MuteDirector.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/client/MuteDirector.as
rename to core/src/main/as/com/threerings/crowd/chat/client/MuteDirector.as
diff --git a/src/main/as/com/threerings/crowd/chat/client/MuteObserver.as b/core/src/main/as/com/threerings/crowd/chat/client/MuteObserver.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/client/MuteObserver.as
rename to core/src/main/as/com/threerings/crowd/chat/client/MuteObserver.as
diff --git a/src/main/as/com/threerings/crowd/chat/client/SpeakHandler.as b/core/src/main/as/com/threerings/crowd/chat/client/SpeakHandler.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/client/SpeakHandler.as
rename to core/src/main/as/com/threerings/crowd/chat/client/SpeakHandler.as
diff --git a/src/main/as/com/threerings/crowd/chat/client/SpeakService.as b/core/src/main/as/com/threerings/crowd/chat/client/SpeakService.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/client/SpeakService.as
rename to core/src/main/as/com/threerings/crowd/chat/client/SpeakService.as
diff --git a/src/main/as/com/threerings/crowd/chat/client/TellAdapter.as b/core/src/main/as/com/threerings/crowd/chat/client/TellAdapter.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/client/TellAdapter.as
rename to core/src/main/as/com/threerings/crowd/chat/client/TellAdapter.as
diff --git a/src/main/as/com/threerings/crowd/chat/client/TellHandler.as b/core/src/main/as/com/threerings/crowd/chat/client/TellHandler.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/client/TellHandler.as
rename to core/src/main/as/com/threerings/crowd/chat/client/TellHandler.as
diff --git a/src/main/as/com/threerings/crowd/chat/client/ThinkHandler.as b/core/src/main/as/com/threerings/crowd/chat/client/ThinkHandler.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/client/ThinkHandler.as
rename to core/src/main/as/com/threerings/crowd/chat/client/ThinkHandler.as
diff --git a/src/main/as/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.as b/core/src/main/as/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.as
rename to core/src/main/as/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.as
diff --git a/src/main/as/com/threerings/crowd/chat/data/ChatChannel.as b/core/src/main/as/com/threerings/crowd/chat/data/ChatChannel.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/data/ChatChannel.as
rename to core/src/main/as/com/threerings/crowd/chat/data/ChatChannel.as
diff --git a/src/main/as/com/threerings/crowd/chat/data/ChatCodes.as b/core/src/main/as/com/threerings/crowd/chat/data/ChatCodes.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/data/ChatCodes.as
rename to core/src/main/as/com/threerings/crowd/chat/data/ChatCodes.as
diff --git a/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller.as b/core/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/data/ChatMarshaller.as
rename to core/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller.as
diff --git a/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller_TellMarshaller.as b/core/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller_TellMarshaller.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/data/ChatMarshaller_TellMarshaller.as
rename to core/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller_TellMarshaller.as
diff --git a/src/main/as/com/threerings/crowd/chat/data/ChatMessage.as b/core/src/main/as/com/threerings/crowd/chat/data/ChatMessage.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/data/ChatMessage.as
rename to core/src/main/as/com/threerings/crowd/chat/data/ChatMessage.as
diff --git a/src/main/as/com/threerings/crowd/chat/data/SpeakMarshaller.as b/core/src/main/as/com/threerings/crowd/chat/data/SpeakMarshaller.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/data/SpeakMarshaller.as
rename to core/src/main/as/com/threerings/crowd/chat/data/SpeakMarshaller.as
diff --git a/src/main/as/com/threerings/crowd/chat/data/SystemMessage.as b/core/src/main/as/com/threerings/crowd/chat/data/SystemMessage.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/data/SystemMessage.as
rename to core/src/main/as/com/threerings/crowd/chat/data/SystemMessage.as
diff --git a/src/main/as/com/threerings/crowd/chat/data/TellFeedbackMessage.as b/core/src/main/as/com/threerings/crowd/chat/data/TellFeedbackMessage.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/data/TellFeedbackMessage.as
rename to core/src/main/as/com/threerings/crowd/chat/data/TellFeedbackMessage.as
diff --git a/src/main/as/com/threerings/crowd/chat/data/UserMessage.as b/core/src/main/as/com/threerings/crowd/chat/data/UserMessage.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/data/UserMessage.as
rename to core/src/main/as/com/threerings/crowd/chat/data/UserMessage.as
diff --git a/src/main/as/com/threerings/crowd/chat/data/UserSystemMessage.as b/core/src/main/as/com/threerings/crowd/chat/data/UserSystemMessage.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/chat/data/UserSystemMessage.as
rename to core/src/main/as/com/threerings/crowd/chat/data/UserSystemMessage.as
diff --git a/src/main/as/com/threerings/crowd/client/BodyService.as b/core/src/main/as/com/threerings/crowd/client/BodyService.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/client/BodyService.as
rename to core/src/main/as/com/threerings/crowd/client/BodyService.as
diff --git a/src/main/as/com/threerings/crowd/client/CrowdClient.as b/core/src/main/as/com/threerings/crowd/client/CrowdClient.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/client/CrowdClient.as
rename to core/src/main/as/com/threerings/crowd/client/CrowdClient.as
diff --git a/src/main/as/com/threerings/crowd/client/LocationAdapter.as b/core/src/main/as/com/threerings/crowd/client/LocationAdapter.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/client/LocationAdapter.as
rename to core/src/main/as/com/threerings/crowd/client/LocationAdapter.as
diff --git a/src/main/as/com/threerings/crowd/client/LocationDecoder.as b/core/src/main/as/com/threerings/crowd/client/LocationDecoder.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/client/LocationDecoder.as
rename to core/src/main/as/com/threerings/crowd/client/LocationDecoder.as
diff --git a/src/main/as/com/threerings/crowd/client/LocationDirector.as b/core/src/main/as/com/threerings/crowd/client/LocationDirector.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/client/LocationDirector.as
rename to core/src/main/as/com/threerings/crowd/client/LocationDirector.as
diff --git a/src/main/as/com/threerings/crowd/client/LocationDirector_FailureHandler.as b/core/src/main/as/com/threerings/crowd/client/LocationDirector_FailureHandler.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/client/LocationDirector_FailureHandler.as
rename to core/src/main/as/com/threerings/crowd/client/LocationDirector_FailureHandler.as
diff --git a/src/main/as/com/threerings/crowd/client/LocationObserver.as b/core/src/main/as/com/threerings/crowd/client/LocationObserver.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/client/LocationObserver.as
rename to core/src/main/as/com/threerings/crowd/client/LocationObserver.as
diff --git a/src/main/as/com/threerings/crowd/client/LocationReceiver.as b/core/src/main/as/com/threerings/crowd/client/LocationReceiver.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/client/LocationReceiver.as
rename to core/src/main/as/com/threerings/crowd/client/LocationReceiver.as
diff --git a/src/main/as/com/threerings/crowd/client/LocationService.as b/core/src/main/as/com/threerings/crowd/client/LocationService.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/client/LocationService.as
rename to core/src/main/as/com/threerings/crowd/client/LocationService.as
diff --git a/src/main/as/com/threerings/crowd/client/LocationService_MoveListener.as b/core/src/main/as/com/threerings/crowd/client/LocationService_MoveListener.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/client/LocationService_MoveListener.as
rename to core/src/main/as/com/threerings/crowd/client/LocationService_MoveListener.as
diff --git a/src/main/as/com/threerings/crowd/client/MoveAdapter.as b/core/src/main/as/com/threerings/crowd/client/MoveAdapter.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/client/MoveAdapter.as
rename to core/src/main/as/com/threerings/crowd/client/MoveAdapter.as
diff --git a/src/main/as/com/threerings/crowd/client/MoveFailedError.as b/core/src/main/as/com/threerings/crowd/client/MoveFailedError.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/client/MoveFailedError.as
rename to core/src/main/as/com/threerings/crowd/client/MoveFailedError.as
diff --git a/src/main/as/com/threerings/crowd/client/MoveVetoedError.as b/core/src/main/as/com/threerings/crowd/client/MoveVetoedError.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/client/MoveVetoedError.as
rename to core/src/main/as/com/threerings/crowd/client/MoveVetoedError.as
diff --git a/src/main/as/com/threerings/crowd/client/OccupantAdapter.as b/core/src/main/as/com/threerings/crowd/client/OccupantAdapter.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/client/OccupantAdapter.as
rename to core/src/main/as/com/threerings/crowd/client/OccupantAdapter.as
diff --git a/src/main/as/com/threerings/crowd/client/OccupantDirector.as b/core/src/main/as/com/threerings/crowd/client/OccupantDirector.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/client/OccupantDirector.as
rename to core/src/main/as/com/threerings/crowd/client/OccupantDirector.as
diff --git a/src/main/as/com/threerings/crowd/client/OccupantObserver.as b/core/src/main/as/com/threerings/crowd/client/OccupantObserver.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/client/OccupantObserver.as
rename to core/src/main/as/com/threerings/crowd/client/OccupantObserver.as
diff --git a/src/main/as/com/threerings/crowd/client/PlaceController.as b/core/src/main/as/com/threerings/crowd/client/PlaceController.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/client/PlaceController.as
rename to core/src/main/as/com/threerings/crowd/client/PlaceController.as
diff --git a/src/main/as/com/threerings/crowd/client/PlaceControllerDelegate.as b/core/src/main/as/com/threerings/crowd/client/PlaceControllerDelegate.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/client/PlaceControllerDelegate.as
rename to core/src/main/as/com/threerings/crowd/client/PlaceControllerDelegate.as
diff --git a/src/main/as/com/threerings/crowd/client/PlaceView.as b/core/src/main/as/com/threerings/crowd/client/PlaceView.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/client/PlaceView.as
rename to core/src/main/as/com/threerings/crowd/client/PlaceView.as
diff --git a/src/main/as/com/threerings/crowd/client/PlaceViewUtil.as b/core/src/main/as/com/threerings/crowd/client/PlaceViewUtil.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/client/PlaceViewUtil.as
rename to core/src/main/as/com/threerings/crowd/client/PlaceViewUtil.as
diff --git a/src/main/as/com/threerings/crowd/data/BodyMarshaller.as b/core/src/main/as/com/threerings/crowd/data/BodyMarshaller.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/data/BodyMarshaller.as
rename to core/src/main/as/com/threerings/crowd/data/BodyMarshaller.as
diff --git a/src/main/as/com/threerings/crowd/data/BodyObject.as b/core/src/main/as/com/threerings/crowd/data/BodyObject.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/data/BodyObject.as
rename to core/src/main/as/com/threerings/crowd/data/BodyObject.as
diff --git a/src/main/as/com/threerings/crowd/data/CrowdCodes.as b/core/src/main/as/com/threerings/crowd/data/CrowdCodes.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/data/CrowdCodes.as
rename to core/src/main/as/com/threerings/crowd/data/CrowdCodes.as
diff --git a/src/main/as/com/threerings/crowd/data/CrowdPermissionPolicy.as b/core/src/main/as/com/threerings/crowd/data/CrowdPermissionPolicy.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/data/CrowdPermissionPolicy.as
rename to core/src/main/as/com/threerings/crowd/data/CrowdPermissionPolicy.as
diff --git a/src/main/as/com/threerings/crowd/data/LocationCodes.as b/core/src/main/as/com/threerings/crowd/data/LocationCodes.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/data/LocationCodes.as
rename to core/src/main/as/com/threerings/crowd/data/LocationCodes.as
diff --git a/src/main/as/com/threerings/crowd/data/LocationMarshaller.as b/core/src/main/as/com/threerings/crowd/data/LocationMarshaller.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/data/LocationMarshaller.as
rename to core/src/main/as/com/threerings/crowd/data/LocationMarshaller.as
diff --git a/src/main/as/com/threerings/crowd/data/LocationMarshaller_MoveMarshaller.as b/core/src/main/as/com/threerings/crowd/data/LocationMarshaller_MoveMarshaller.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/data/LocationMarshaller_MoveMarshaller.as
rename to core/src/main/as/com/threerings/crowd/data/LocationMarshaller_MoveMarshaller.as
diff --git a/src/main/as/com/threerings/crowd/data/ManagerCaller.as b/core/src/main/as/com/threerings/crowd/data/ManagerCaller.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/data/ManagerCaller.as
rename to core/src/main/as/com/threerings/crowd/data/ManagerCaller.as
diff --git a/src/main/as/com/threerings/crowd/data/OccupantInfo.as b/core/src/main/as/com/threerings/crowd/data/OccupantInfo.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/data/OccupantInfo.as
rename to core/src/main/as/com/threerings/crowd/data/OccupantInfo.as
diff --git a/src/main/as/com/threerings/crowd/data/Place.as b/core/src/main/as/com/threerings/crowd/data/Place.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/data/Place.as
rename to core/src/main/as/com/threerings/crowd/data/Place.as
diff --git a/src/main/as/com/threerings/crowd/data/PlaceConfig.as b/core/src/main/as/com/threerings/crowd/data/PlaceConfig.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/data/PlaceConfig.as
rename to core/src/main/as/com/threerings/crowd/data/PlaceConfig.as
diff --git a/src/main/as/com/threerings/crowd/data/PlaceObject.as b/core/src/main/as/com/threerings/crowd/data/PlaceObject.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/data/PlaceObject.as
rename to core/src/main/as/com/threerings/crowd/data/PlaceObject.as
diff --git a/src/main/as/com/threerings/crowd/data/TokenRing.as b/core/src/main/as/com/threerings/crowd/data/TokenRing.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/data/TokenRing.as
rename to core/src/main/as/com/threerings/crowd/data/TokenRing.as
diff --git a/src/main/as/com/threerings/crowd/peer/data/CrowdClientInfo.as b/core/src/main/as/com/threerings/crowd/peer/data/CrowdClientInfo.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/peer/data/CrowdClientInfo.as
rename to core/src/main/as/com/threerings/crowd/peer/data/CrowdClientInfo.as
diff --git a/src/main/as/com/threerings/crowd/util/CrowdContext.as b/core/src/main/as/com/threerings/crowd/util/CrowdContext.as
similarity index 100%
rename from src/main/as/com/threerings/crowd/util/CrowdContext.as
rename to core/src/main/as/com/threerings/crowd/util/CrowdContext.as
diff --git a/src/main/as/com/threerings/io/ArrayMask.as b/core/src/main/as/com/threerings/io/ArrayMask.as
similarity index 100%
rename from src/main/as/com/threerings/io/ArrayMask.as
rename to core/src/main/as/com/threerings/io/ArrayMask.as
diff --git a/src/main/as/com/threerings/io/ClassMapping.as b/core/src/main/as/com/threerings/io/ClassMapping.as
similarity index 100%
rename from src/main/as/com/threerings/io/ClassMapping.as
rename to core/src/main/as/com/threerings/io/ClassMapping.as
diff --git a/src/main/as/com/threerings/io/FrameAvailableEvent.as b/core/src/main/as/com/threerings/io/FrameAvailableEvent.as
similarity index 100%
rename from src/main/as/com/threerings/io/FrameAvailableEvent.as
rename to core/src/main/as/com/threerings/io/FrameAvailableEvent.as
diff --git a/src/main/as/com/threerings/io/FrameReader.as b/core/src/main/as/com/threerings/io/FrameReader.as
similarity index 100%
rename from src/main/as/com/threerings/io/FrameReader.as
rename to core/src/main/as/com/threerings/io/FrameReader.as
diff --git a/src/main/as/com/threerings/io/ObjectInputStream.as b/core/src/main/as/com/threerings/io/ObjectInputStream.as
similarity index 100%
rename from src/main/as/com/threerings/io/ObjectInputStream.as
rename to core/src/main/as/com/threerings/io/ObjectInputStream.as
diff --git a/src/main/as/com/threerings/io/ObjectOutputStream.as b/core/src/main/as/com/threerings/io/ObjectOutputStream.as
similarity index 100%
rename from src/main/as/com/threerings/io/ObjectOutputStream.as
rename to core/src/main/as/com/threerings/io/ObjectOutputStream.as
diff --git a/src/main/as/com/threerings/io/SimpleStreamableObject.as b/core/src/main/as/com/threerings/io/SimpleStreamableObject.as
similarity index 100%
rename from src/main/as/com/threerings/io/SimpleStreamableObject.as
rename to core/src/main/as/com/threerings/io/SimpleStreamableObject.as
diff --git a/src/main/as/com/threerings/io/Streamable.as b/core/src/main/as/com/threerings/io/Streamable.as
similarity index 100%
rename from src/main/as/com/threerings/io/Streamable.as
rename to core/src/main/as/com/threerings/io/Streamable.as
diff --git a/src/main/as/com/threerings/io/Streamer.as b/core/src/main/as/com/threerings/io/Streamer.as
similarity index 100%
rename from src/main/as/com/threerings/io/Streamer.as
rename to core/src/main/as/com/threerings/io/Streamer.as
diff --git a/src/main/as/com/threerings/io/Translations.as b/core/src/main/as/com/threerings/io/Translations.as
similarity index 100%
rename from src/main/as/com/threerings/io/Translations.as
rename to core/src/main/as/com/threerings/io/Translations.as
diff --git a/src/main/as/com/threerings/io/TypedArray.as b/core/src/main/as/com/threerings/io/TypedArray.as
similarity index 100%
rename from src/main/as/com/threerings/io/TypedArray.as
rename to core/src/main/as/com/threerings/io/TypedArray.as
diff --git a/src/main/as/com/threerings/io/streamers/ArrayStreamer.as b/core/src/main/as/com/threerings/io/streamers/ArrayStreamer.as
similarity index 100%
rename from src/main/as/com/threerings/io/streamers/ArrayStreamer.as
rename to core/src/main/as/com/threerings/io/streamers/ArrayStreamer.as
diff --git a/src/main/as/com/threerings/io/streamers/ByteArrayStreamer.as b/core/src/main/as/com/threerings/io/streamers/ByteArrayStreamer.as
similarity index 100%
rename from src/main/as/com/threerings/io/streamers/ByteArrayStreamer.as
rename to core/src/main/as/com/threerings/io/streamers/ByteArrayStreamer.as
diff --git a/src/main/as/com/threerings/io/streamers/ByteEnumStreamer.as b/core/src/main/as/com/threerings/io/streamers/ByteEnumStreamer.as
similarity index 100%
rename from src/main/as/com/threerings/io/streamers/ByteEnumStreamer.as
rename to core/src/main/as/com/threerings/io/streamers/ByteEnumStreamer.as
diff --git a/src/main/as/com/threerings/io/streamers/DelegatingStreamer.as b/core/src/main/as/com/threerings/io/streamers/DelegatingStreamer.as
similarity index 100%
rename from src/main/as/com/threerings/io/streamers/DelegatingStreamer.as
rename to core/src/main/as/com/threerings/io/streamers/DelegatingStreamer.as
diff --git a/src/main/as/com/threerings/io/streamers/EnumStreamer.as b/core/src/main/as/com/threerings/io/streamers/EnumStreamer.as
similarity index 100%
rename from src/main/as/com/threerings/io/streamers/EnumStreamer.as
rename to core/src/main/as/com/threerings/io/streamers/EnumStreamer.as
diff --git a/src/main/as/com/threerings/io/streamers/MapStreamer.as b/core/src/main/as/com/threerings/io/streamers/MapStreamer.as
similarity index 100%
rename from src/main/as/com/threerings/io/streamers/MapStreamer.as
rename to core/src/main/as/com/threerings/io/streamers/MapStreamer.as
diff --git a/src/main/as/com/threerings/io/streamers/NumberStreamer.as b/core/src/main/as/com/threerings/io/streamers/NumberStreamer.as
similarity index 100%
rename from src/main/as/com/threerings/io/streamers/NumberStreamer.as
rename to core/src/main/as/com/threerings/io/streamers/NumberStreamer.as
diff --git a/src/main/as/com/threerings/io/streamers/SetStreamer.as b/core/src/main/as/com/threerings/io/streamers/SetStreamer.as
similarity index 100%
rename from src/main/as/com/threerings/io/streamers/SetStreamer.as
rename to core/src/main/as/com/threerings/io/streamers/SetStreamer.as
diff --git a/src/main/as/com/threerings/io/streamers/StringStreamer.as b/core/src/main/as/com/threerings/io/streamers/StringStreamer.as
similarity index 100%
rename from src/main/as/com/threerings/io/streamers/StringStreamer.as
rename to core/src/main/as/com/threerings/io/streamers/StringStreamer.as
diff --git a/src/main/as/com/threerings/presents/client/BasicDirector.as b/core/src/main/as/com/threerings/presents/client/BasicDirector.as
similarity index 100%
rename from src/main/as/com/threerings/presents/client/BasicDirector.as
rename to core/src/main/as/com/threerings/presents/client/BasicDirector.as
diff --git a/src/main/as/com/threerings/presents/client/Client.as b/core/src/main/as/com/threerings/presents/client/Client.as
similarity index 100%
rename from src/main/as/com/threerings/presents/client/Client.as
rename to core/src/main/as/com/threerings/presents/client/Client.as
diff --git a/src/main/as/com/threerings/presents/client/ClientAdapter.as b/core/src/main/as/com/threerings/presents/client/ClientAdapter.as
similarity index 100%
rename from src/main/as/com/threerings/presents/client/ClientAdapter.as
rename to core/src/main/as/com/threerings/presents/client/ClientAdapter.as
diff --git a/src/main/as/com/threerings/presents/client/ClientDObjectMgr.as b/core/src/main/as/com/threerings/presents/client/ClientDObjectMgr.as
similarity index 100%
rename from src/main/as/com/threerings/presents/client/ClientDObjectMgr.as
rename to core/src/main/as/com/threerings/presents/client/ClientDObjectMgr.as
diff --git a/src/main/as/com/threerings/presents/client/ClientEvent.as b/core/src/main/as/com/threerings/presents/client/ClientEvent.as
similarity index 100%
rename from src/main/as/com/threerings/presents/client/ClientEvent.as
rename to core/src/main/as/com/threerings/presents/client/ClientEvent.as
diff --git a/src/main/as/com/threerings/presents/client/ClientObserver.as b/core/src/main/as/com/threerings/presents/client/ClientObserver.as
similarity index 100%
rename from src/main/as/com/threerings/presents/client/ClientObserver.as
rename to core/src/main/as/com/threerings/presents/client/ClientObserver.as
diff --git a/src/main/as/com/threerings/presents/client/Communicator.as b/core/src/main/as/com/threerings/presents/client/Communicator.as
similarity index 100%
rename from src/main/as/com/threerings/presents/client/Communicator.as
rename to core/src/main/as/com/threerings/presents/client/Communicator.as
diff --git a/src/main/as/com/threerings/presents/client/ConfirmAdapter.as b/core/src/main/as/com/threerings/presents/client/ConfirmAdapter.as
similarity index 100%
rename from src/main/as/com/threerings/presents/client/ConfirmAdapter.as
rename to core/src/main/as/com/threerings/presents/client/ConfirmAdapter.as
diff --git a/src/main/as/com/threerings/presents/client/DeltaCalculator.as b/core/src/main/as/com/threerings/presents/client/DeltaCalculator.as
similarity index 100%
rename from src/main/as/com/threerings/presents/client/DeltaCalculator.as
rename to core/src/main/as/com/threerings/presents/client/DeltaCalculator.as
diff --git a/src/main/as/com/threerings/presents/client/InvocationAdapter.as b/core/src/main/as/com/threerings/presents/client/InvocationAdapter.as
similarity index 100%
rename from src/main/as/com/threerings/presents/client/InvocationAdapter.as
rename to core/src/main/as/com/threerings/presents/client/InvocationAdapter.as
diff --git a/src/main/as/com/threerings/presents/client/InvocationDecoder.as b/core/src/main/as/com/threerings/presents/client/InvocationDecoder.as
similarity index 100%
rename from src/main/as/com/threerings/presents/client/InvocationDecoder.as
rename to core/src/main/as/com/threerings/presents/client/InvocationDecoder.as
diff --git a/src/main/as/com/threerings/presents/client/InvocationDirector.as b/core/src/main/as/com/threerings/presents/client/InvocationDirector.as
similarity index 100%
rename from src/main/as/com/threerings/presents/client/InvocationDirector.as
rename to core/src/main/as/com/threerings/presents/client/InvocationDirector.as
diff --git a/src/main/as/com/threerings/presents/client/InvocationReceiver.as b/core/src/main/as/com/threerings/presents/client/InvocationReceiver.as
similarity index 100%
rename from src/main/as/com/threerings/presents/client/InvocationReceiver.as
rename to core/src/main/as/com/threerings/presents/client/InvocationReceiver.as
diff --git a/src/main/as/com/threerings/presents/client/InvocationReceiver_Registration.as b/core/src/main/as/com/threerings/presents/client/InvocationReceiver_Registration.as
similarity index 100%
rename from src/main/as/com/threerings/presents/client/InvocationReceiver_Registration.as
rename to core/src/main/as/com/threerings/presents/client/InvocationReceiver_Registration.as
diff --git a/src/main/as/com/threerings/presents/client/InvocationService.as b/core/src/main/as/com/threerings/presents/client/InvocationService.as
similarity index 100%
rename from src/main/as/com/threerings/presents/client/InvocationService.as
rename to core/src/main/as/com/threerings/presents/client/InvocationService.as
diff --git a/src/main/as/com/threerings/presents/client/InvocationService_ConfirmListener.as b/core/src/main/as/com/threerings/presents/client/InvocationService_ConfirmListener.as
similarity index 100%
rename from src/main/as/com/threerings/presents/client/InvocationService_ConfirmListener.as
rename to core/src/main/as/com/threerings/presents/client/InvocationService_ConfirmListener.as
diff --git a/src/main/as/com/threerings/presents/client/InvocationService_InvocationListener.as b/core/src/main/as/com/threerings/presents/client/InvocationService_InvocationListener.as
similarity index 100%
rename from src/main/as/com/threerings/presents/client/InvocationService_InvocationListener.as
rename to core/src/main/as/com/threerings/presents/client/InvocationService_InvocationListener.as
diff --git a/src/main/as/com/threerings/presents/client/InvocationService_ResultListener.as b/core/src/main/as/com/threerings/presents/client/InvocationService_ResultListener.as
similarity index 100%
rename from src/main/as/com/threerings/presents/client/InvocationService_ResultListener.as
rename to core/src/main/as/com/threerings/presents/client/InvocationService_ResultListener.as
diff --git a/src/main/as/com/threerings/presents/client/LogonError.as b/core/src/main/as/com/threerings/presents/client/LogonError.as
similarity index 100%
rename from src/main/as/com/threerings/presents/client/LogonError.as
rename to core/src/main/as/com/threerings/presents/client/LogonError.as
diff --git a/src/main/as/com/threerings/presents/client/PresentsPrefs.as b/core/src/main/as/com/threerings/presents/client/PresentsPrefs.as
similarity index 100%
rename from src/main/as/com/threerings/presents/client/PresentsPrefs.as
rename to core/src/main/as/com/threerings/presents/client/PresentsPrefs.as
diff --git a/src/main/as/com/threerings/presents/client/ResultAdapter.as b/core/src/main/as/com/threerings/presents/client/ResultAdapter.as
similarity index 100%
rename from src/main/as/com/threerings/presents/client/ResultAdapter.as
rename to core/src/main/as/com/threerings/presents/client/ResultAdapter.as
diff --git a/src/main/as/com/threerings/presents/client/ServerSwitcher.as b/core/src/main/as/com/threerings/presents/client/ServerSwitcher.as
similarity index 100%
rename from src/main/as/com/threerings/presents/client/ServerSwitcher.as
rename to core/src/main/as/com/threerings/presents/client/ServerSwitcher.as
diff --git a/src/main/as/com/threerings/presents/client/SessionObserver.as b/core/src/main/as/com/threerings/presents/client/SessionObserver.as
similarity index 100%
rename from src/main/as/com/threerings/presents/client/SessionObserver.as
rename to core/src/main/as/com/threerings/presents/client/SessionObserver.as
diff --git a/src/main/as/com/threerings/presents/client/TimeBaseService.as b/core/src/main/as/com/threerings/presents/client/TimeBaseService.as
similarity index 100%
rename from src/main/as/com/threerings/presents/client/TimeBaseService.as
rename to core/src/main/as/com/threerings/presents/client/TimeBaseService.as
diff --git a/src/main/as/com/threerings/presents/client/TimeBaseService_GotTimeBaseListener.as b/core/src/main/as/com/threerings/presents/client/TimeBaseService_GotTimeBaseListener.as
similarity index 100%
rename from src/main/as/com/threerings/presents/client/TimeBaseService_GotTimeBaseListener.as
rename to core/src/main/as/com/threerings/presents/client/TimeBaseService_GotTimeBaseListener.as
diff --git a/src/main/as/com/threerings/presents/data/AuthCodes.as b/core/src/main/as/com/threerings/presents/data/AuthCodes.as
similarity index 100%
rename from src/main/as/com/threerings/presents/data/AuthCodes.as
rename to core/src/main/as/com/threerings/presents/data/AuthCodes.as
diff --git a/src/main/as/com/threerings/presents/data/ClientObject.as b/core/src/main/as/com/threerings/presents/data/ClientObject.as
similarity index 100%
rename from src/main/as/com/threerings/presents/data/ClientObject.as
rename to core/src/main/as/com/threerings/presents/data/ClientObject.as
diff --git a/src/main/as/com/threerings/presents/data/ConMgrStats.as b/core/src/main/as/com/threerings/presents/data/ConMgrStats.as
similarity index 100%
rename from src/main/as/com/threerings/presents/data/ConMgrStats.as
rename to core/src/main/as/com/threerings/presents/data/ConMgrStats.as
diff --git a/src/main/as/com/threerings/presents/data/InvocationCodes.as b/core/src/main/as/com/threerings/presents/data/InvocationCodes.as
similarity index 100%
rename from src/main/as/com/threerings/presents/data/InvocationCodes.as
rename to core/src/main/as/com/threerings/presents/data/InvocationCodes.as
diff --git a/src/main/as/com/threerings/presents/data/InvocationMarshaller.as b/core/src/main/as/com/threerings/presents/data/InvocationMarshaller.as
similarity index 100%
rename from src/main/as/com/threerings/presents/data/InvocationMarshaller.as
rename to core/src/main/as/com/threerings/presents/data/InvocationMarshaller.as
diff --git a/src/main/as/com/threerings/presents/data/InvocationMarshaller_ConfirmMarshaller.as b/core/src/main/as/com/threerings/presents/data/InvocationMarshaller_ConfirmMarshaller.as
similarity index 100%
rename from src/main/as/com/threerings/presents/data/InvocationMarshaller_ConfirmMarshaller.as
rename to core/src/main/as/com/threerings/presents/data/InvocationMarshaller_ConfirmMarshaller.as
diff --git a/src/main/as/com/threerings/presents/data/InvocationMarshaller_ListenerMarshaller.as b/core/src/main/as/com/threerings/presents/data/InvocationMarshaller_ListenerMarshaller.as
similarity index 100%
rename from src/main/as/com/threerings/presents/data/InvocationMarshaller_ListenerMarshaller.as
rename to core/src/main/as/com/threerings/presents/data/InvocationMarshaller_ListenerMarshaller.as
diff --git a/src/main/as/com/threerings/presents/data/InvocationMarshaller_ResultMarshaller.as b/core/src/main/as/com/threerings/presents/data/InvocationMarshaller_ResultMarshaller.as
similarity index 100%
rename from src/main/as/com/threerings/presents/data/InvocationMarshaller_ResultMarshaller.as
rename to core/src/main/as/com/threerings/presents/data/InvocationMarshaller_ResultMarshaller.as
diff --git a/src/main/as/com/threerings/presents/data/Permission.as b/core/src/main/as/com/threerings/presents/data/Permission.as
similarity index 100%
rename from src/main/as/com/threerings/presents/data/Permission.as
rename to core/src/main/as/com/threerings/presents/data/Permission.as
diff --git a/src/main/as/com/threerings/presents/data/PermissionPolicy.as b/core/src/main/as/com/threerings/presents/data/PermissionPolicy.as
similarity index 100%
rename from src/main/as/com/threerings/presents/data/PermissionPolicy.as
rename to core/src/main/as/com/threerings/presents/data/PermissionPolicy.as
diff --git a/src/main/as/com/threerings/presents/data/TimeBaseMarshaller.as b/core/src/main/as/com/threerings/presents/data/TimeBaseMarshaller.as
similarity index 100%
rename from src/main/as/com/threerings/presents/data/TimeBaseMarshaller.as
rename to core/src/main/as/com/threerings/presents/data/TimeBaseMarshaller.as
diff --git a/src/main/as/com/threerings/presents/data/TimeBaseMarshaller_GotTimeBaseMarshaller.as b/core/src/main/as/com/threerings/presents/data/TimeBaseMarshaller_GotTimeBaseMarshaller.as
similarity index 100%
rename from src/main/as/com/threerings/presents/data/TimeBaseMarshaller_GotTimeBaseMarshaller.as
rename to core/src/main/as/com/threerings/presents/data/TimeBaseMarshaller_GotTimeBaseMarshaller.as
diff --git a/src/main/as/com/threerings/presents/dobj/AttributeChangeAdapter.as b/core/src/main/as/com/threerings/presents/dobj/AttributeChangeAdapter.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/AttributeChangeAdapter.as
rename to core/src/main/as/com/threerings/presents/dobj/AttributeChangeAdapter.as
diff --git a/src/main/as/com/threerings/presents/dobj/AttributeChangeListener.as b/core/src/main/as/com/threerings/presents/dobj/AttributeChangeListener.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/AttributeChangeListener.as
rename to core/src/main/as/com/threerings/presents/dobj/AttributeChangeListener.as
diff --git a/src/main/as/com/threerings/presents/dobj/AttributeChangedEvent.as b/core/src/main/as/com/threerings/presents/dobj/AttributeChangedEvent.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/AttributeChangedEvent.as
rename to core/src/main/as/com/threerings/presents/dobj/AttributeChangedEvent.as
diff --git a/src/main/as/com/threerings/presents/dobj/ChangeListener.as b/core/src/main/as/com/threerings/presents/dobj/ChangeListener.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/ChangeListener.as
rename to core/src/main/as/com/threerings/presents/dobj/ChangeListener.as
diff --git a/src/main/as/com/threerings/presents/dobj/CompoundEvent.as b/core/src/main/as/com/threerings/presents/dobj/CompoundEvent.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/CompoundEvent.as
rename to core/src/main/as/com/threerings/presents/dobj/CompoundEvent.as
diff --git a/src/main/as/com/threerings/presents/dobj/DEvent.as b/core/src/main/as/com/threerings/presents/dobj/DEvent.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/DEvent.as
rename to core/src/main/as/com/threerings/presents/dobj/DEvent.as
diff --git a/src/main/as/com/threerings/presents/dobj/DObject.as b/core/src/main/as/com/threerings/presents/dobj/DObject.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/DObject.as
rename to core/src/main/as/com/threerings/presents/dobj/DObject.as
diff --git a/src/main/as/com/threerings/presents/dobj/DObjectManager.as b/core/src/main/as/com/threerings/presents/dobj/DObjectManager.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/DObjectManager.as
rename to core/src/main/as/com/threerings/presents/dobj/DObjectManager.as
diff --git a/src/main/as/com/threerings/presents/dobj/DSet.as b/core/src/main/as/com/threerings/presents/dobj/DSet.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/DSet.as
rename to core/src/main/as/com/threerings/presents/dobj/DSet.as
diff --git a/src/main/as/com/threerings/presents/dobj/DSet_Entry.as b/core/src/main/as/com/threerings/presents/dobj/DSet_Entry.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/DSet_Entry.as
rename to core/src/main/as/com/threerings/presents/dobj/DSet_Entry.as
diff --git a/src/main/as/com/threerings/presents/dobj/DummyEntry.as b/core/src/main/as/com/threerings/presents/dobj/DummyEntry.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/DummyEntry.as
rename to core/src/main/as/com/threerings/presents/dobj/DummyEntry.as
diff --git a/src/main/as/com/threerings/presents/dobj/ElementUpdateListener.as b/core/src/main/as/com/threerings/presents/dobj/ElementUpdateListener.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/ElementUpdateListener.as
rename to core/src/main/as/com/threerings/presents/dobj/ElementUpdateListener.as
diff --git a/src/main/as/com/threerings/presents/dobj/ElementUpdatedEvent.as b/core/src/main/as/com/threerings/presents/dobj/ElementUpdatedEvent.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/ElementUpdatedEvent.as
rename to core/src/main/as/com/threerings/presents/dobj/ElementUpdatedEvent.as
diff --git a/src/main/as/com/threerings/presents/dobj/EntryAddedEvent.as b/core/src/main/as/com/threerings/presents/dobj/EntryAddedEvent.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/EntryAddedEvent.as
rename to core/src/main/as/com/threerings/presents/dobj/EntryAddedEvent.as
diff --git a/src/main/as/com/threerings/presents/dobj/EntryRemovedEvent.as b/core/src/main/as/com/threerings/presents/dobj/EntryRemovedEvent.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/EntryRemovedEvent.as
rename to core/src/main/as/com/threerings/presents/dobj/EntryRemovedEvent.as
diff --git a/src/main/as/com/threerings/presents/dobj/EntryUpdatedEvent.as b/core/src/main/as/com/threerings/presents/dobj/EntryUpdatedEvent.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/EntryUpdatedEvent.as
rename to core/src/main/as/com/threerings/presents/dobj/EntryUpdatedEvent.as
diff --git a/src/main/as/com/threerings/presents/dobj/EventAdapter.as b/core/src/main/as/com/threerings/presents/dobj/EventAdapter.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/EventAdapter.as
rename to core/src/main/as/com/threerings/presents/dobj/EventAdapter.as
diff --git a/src/main/as/com/threerings/presents/dobj/EventListener.as b/core/src/main/as/com/threerings/presents/dobj/EventListener.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/EventListener.as
rename to core/src/main/as/com/threerings/presents/dobj/EventListener.as
diff --git a/src/main/as/com/threerings/presents/dobj/InvocationNotificationEvent.as b/core/src/main/as/com/threerings/presents/dobj/InvocationNotificationEvent.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/InvocationNotificationEvent.as
rename to core/src/main/as/com/threerings/presents/dobj/InvocationNotificationEvent.as
diff --git a/src/main/as/com/threerings/presents/dobj/InvocationRequestEvent.as b/core/src/main/as/com/threerings/presents/dobj/InvocationRequestEvent.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/InvocationRequestEvent.as
rename to core/src/main/as/com/threerings/presents/dobj/InvocationRequestEvent.as
diff --git a/src/main/as/com/threerings/presents/dobj/InvocationResponseEvent.as b/core/src/main/as/com/threerings/presents/dobj/InvocationResponseEvent.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/InvocationResponseEvent.as
rename to core/src/main/as/com/threerings/presents/dobj/InvocationResponseEvent.as
diff --git a/src/main/as/com/threerings/presents/dobj/MessageAdapter.as b/core/src/main/as/com/threerings/presents/dobj/MessageAdapter.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/MessageAdapter.as
rename to core/src/main/as/com/threerings/presents/dobj/MessageAdapter.as
diff --git a/src/main/as/com/threerings/presents/dobj/MessageEvent.as b/core/src/main/as/com/threerings/presents/dobj/MessageEvent.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/MessageEvent.as
rename to core/src/main/as/com/threerings/presents/dobj/MessageEvent.as
diff --git a/src/main/as/com/threerings/presents/dobj/MessageListener.as b/core/src/main/as/com/threerings/presents/dobj/MessageListener.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/MessageListener.as
rename to core/src/main/as/com/threerings/presents/dobj/MessageListener.as
diff --git a/src/main/as/com/threerings/presents/dobj/NamedEvent.as b/core/src/main/as/com/threerings/presents/dobj/NamedEvent.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/NamedEvent.as
rename to core/src/main/as/com/threerings/presents/dobj/NamedEvent.as
diff --git a/src/main/as/com/threerings/presents/dobj/ObjectAccessError.as b/core/src/main/as/com/threerings/presents/dobj/ObjectAccessError.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/ObjectAccessError.as
rename to core/src/main/as/com/threerings/presents/dobj/ObjectAccessError.as
diff --git a/src/main/as/com/threerings/presents/dobj/ObjectAddedEvent.as b/core/src/main/as/com/threerings/presents/dobj/ObjectAddedEvent.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/ObjectAddedEvent.as
rename to core/src/main/as/com/threerings/presents/dobj/ObjectAddedEvent.as
diff --git a/src/main/as/com/threerings/presents/dobj/ObjectDeathAdapter.as b/core/src/main/as/com/threerings/presents/dobj/ObjectDeathAdapter.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/ObjectDeathAdapter.as
rename to core/src/main/as/com/threerings/presents/dobj/ObjectDeathAdapter.as
diff --git a/src/main/as/com/threerings/presents/dobj/ObjectDeathListener.as b/core/src/main/as/com/threerings/presents/dobj/ObjectDeathListener.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/ObjectDeathListener.as
rename to core/src/main/as/com/threerings/presents/dobj/ObjectDeathListener.as
diff --git a/src/main/as/com/threerings/presents/dobj/ObjectDestroyedEvent.as b/core/src/main/as/com/threerings/presents/dobj/ObjectDestroyedEvent.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/ObjectDestroyedEvent.as
rename to core/src/main/as/com/threerings/presents/dobj/ObjectDestroyedEvent.as
diff --git a/src/main/as/com/threerings/presents/dobj/ObjectRemovedEvent.as b/core/src/main/as/com/threerings/presents/dobj/ObjectRemovedEvent.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/ObjectRemovedEvent.as
rename to core/src/main/as/com/threerings/presents/dobj/ObjectRemovedEvent.as
diff --git a/src/main/as/com/threerings/presents/dobj/OidList.as b/core/src/main/as/com/threerings/presents/dobj/OidList.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/OidList.as
rename to core/src/main/as/com/threerings/presents/dobj/OidList.as
diff --git a/src/main/as/com/threerings/presents/dobj/OidListListener.as b/core/src/main/as/com/threerings/presents/dobj/OidListListener.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/OidListListener.as
rename to core/src/main/as/com/threerings/presents/dobj/OidListListener.as
diff --git a/src/main/as/com/threerings/presents/dobj/ServerMessageEvent.as b/core/src/main/as/com/threerings/presents/dobj/ServerMessageEvent.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/ServerMessageEvent.as
rename to core/src/main/as/com/threerings/presents/dobj/ServerMessageEvent.as
diff --git a/src/main/as/com/threerings/presents/dobj/SetAdapter.as b/core/src/main/as/com/threerings/presents/dobj/SetAdapter.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/SetAdapter.as
rename to core/src/main/as/com/threerings/presents/dobj/SetAdapter.as
diff --git a/src/main/as/com/threerings/presents/dobj/SetListener.as b/core/src/main/as/com/threerings/presents/dobj/SetListener.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/SetListener.as
rename to core/src/main/as/com/threerings/presents/dobj/SetListener.as
diff --git a/src/main/as/com/threerings/presents/dobj/Subscriber.as b/core/src/main/as/com/threerings/presents/dobj/Subscriber.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/Subscriber.as
rename to core/src/main/as/com/threerings/presents/dobj/Subscriber.as
diff --git a/src/main/as/com/threerings/presents/dobj/SubscriberAdapter.as b/core/src/main/as/com/threerings/presents/dobj/SubscriberAdapter.as
similarity index 100%
rename from src/main/as/com/threerings/presents/dobj/SubscriberAdapter.as
rename to core/src/main/as/com/threerings/presents/dobj/SubscriberAdapter.as
diff --git a/src/main/as/com/threerings/presents/net/AuthRequest.as b/core/src/main/as/com/threerings/presents/net/AuthRequest.as
similarity index 100%
rename from src/main/as/com/threerings/presents/net/AuthRequest.as
rename to core/src/main/as/com/threerings/presents/net/AuthRequest.as
diff --git a/src/main/as/com/threerings/presents/net/AuthResponse.as b/core/src/main/as/com/threerings/presents/net/AuthResponse.as
similarity index 100%
rename from src/main/as/com/threerings/presents/net/AuthResponse.as
rename to core/src/main/as/com/threerings/presents/net/AuthResponse.as
diff --git a/src/main/as/com/threerings/presents/net/AuthResponseData.as b/core/src/main/as/com/threerings/presents/net/AuthResponseData.as
similarity index 100%
rename from src/main/as/com/threerings/presents/net/AuthResponseData.as
rename to core/src/main/as/com/threerings/presents/net/AuthResponseData.as
diff --git a/src/main/as/com/threerings/presents/net/BootstrapData.as b/core/src/main/as/com/threerings/presents/net/BootstrapData.as
similarity index 100%
rename from src/main/as/com/threerings/presents/net/BootstrapData.as
rename to core/src/main/as/com/threerings/presents/net/BootstrapData.as
diff --git a/src/main/as/com/threerings/presents/net/BootstrapNotification.as b/core/src/main/as/com/threerings/presents/net/BootstrapNotification.as
similarity index 100%
rename from src/main/as/com/threerings/presents/net/BootstrapNotification.as
rename to core/src/main/as/com/threerings/presents/net/BootstrapNotification.as
diff --git a/src/main/as/com/threerings/presents/net/CompoundDownstreamMessage.as b/core/src/main/as/com/threerings/presents/net/CompoundDownstreamMessage.as
similarity index 100%
rename from src/main/as/com/threerings/presents/net/CompoundDownstreamMessage.as
rename to core/src/main/as/com/threerings/presents/net/CompoundDownstreamMessage.as
diff --git a/src/main/as/com/threerings/presents/net/CompoundUpstreamMessage.as b/core/src/main/as/com/threerings/presents/net/CompoundUpstreamMessage.as
similarity index 100%
rename from src/main/as/com/threerings/presents/net/CompoundUpstreamMessage.as
rename to core/src/main/as/com/threerings/presents/net/CompoundUpstreamMessage.as
diff --git a/src/main/as/com/threerings/presents/net/Credentials.as b/core/src/main/as/com/threerings/presents/net/Credentials.as
similarity index 100%
rename from src/main/as/com/threerings/presents/net/Credentials.as
rename to core/src/main/as/com/threerings/presents/net/Credentials.as
diff --git a/src/main/as/com/threerings/presents/net/Credentials_HasLanguage.as b/core/src/main/as/com/threerings/presents/net/Credentials_HasLanguage.as
similarity index 100%
rename from src/main/as/com/threerings/presents/net/Credentials_HasLanguage.as
rename to core/src/main/as/com/threerings/presents/net/Credentials_HasLanguage.as
diff --git a/src/main/as/com/threerings/presents/net/Credentials_HasMachineIdent.as b/core/src/main/as/com/threerings/presents/net/Credentials_HasMachineIdent.as
similarity index 100%
rename from src/main/as/com/threerings/presents/net/Credentials_HasMachineIdent.as
rename to core/src/main/as/com/threerings/presents/net/Credentials_HasMachineIdent.as
diff --git a/src/main/as/com/threerings/presents/net/DownstreamMessage.as b/core/src/main/as/com/threerings/presents/net/DownstreamMessage.as
similarity index 100%
rename from src/main/as/com/threerings/presents/net/DownstreamMessage.as
rename to core/src/main/as/com/threerings/presents/net/DownstreamMessage.as
diff --git a/src/main/as/com/threerings/presents/net/EventNotification.as b/core/src/main/as/com/threerings/presents/net/EventNotification.as
similarity index 100%
rename from src/main/as/com/threerings/presents/net/EventNotification.as
rename to core/src/main/as/com/threerings/presents/net/EventNotification.as
diff --git a/src/main/as/com/threerings/presents/net/FailureResponse.as b/core/src/main/as/com/threerings/presents/net/FailureResponse.as
similarity index 100%
rename from src/main/as/com/threerings/presents/net/FailureResponse.as
rename to core/src/main/as/com/threerings/presents/net/FailureResponse.as
diff --git a/src/main/as/com/threerings/presents/net/ForwardEventRequest.as b/core/src/main/as/com/threerings/presents/net/ForwardEventRequest.as
similarity index 100%
rename from src/main/as/com/threerings/presents/net/ForwardEventRequest.as
rename to core/src/main/as/com/threerings/presents/net/ForwardEventRequest.as
diff --git a/src/main/as/com/threerings/presents/net/LogoffRequest.as b/core/src/main/as/com/threerings/presents/net/LogoffRequest.as
similarity index 100%
rename from src/main/as/com/threerings/presents/net/LogoffRequest.as
rename to core/src/main/as/com/threerings/presents/net/LogoffRequest.as
diff --git a/src/main/as/com/threerings/presents/net/ObjectResponse.as b/core/src/main/as/com/threerings/presents/net/ObjectResponse.as
similarity index 100%
rename from src/main/as/com/threerings/presents/net/ObjectResponse.as
rename to core/src/main/as/com/threerings/presents/net/ObjectResponse.as
diff --git a/src/main/as/com/threerings/presents/net/PingRequest.as b/core/src/main/as/com/threerings/presents/net/PingRequest.as
similarity index 100%
rename from src/main/as/com/threerings/presents/net/PingRequest.as
rename to core/src/main/as/com/threerings/presents/net/PingRequest.as
diff --git a/src/main/as/com/threerings/presents/net/PongResponse.as b/core/src/main/as/com/threerings/presents/net/PongResponse.as
similarity index 100%
rename from src/main/as/com/threerings/presents/net/PongResponse.as
rename to core/src/main/as/com/threerings/presents/net/PongResponse.as
diff --git a/src/main/as/com/threerings/presents/net/ServiceCreds.as b/core/src/main/as/com/threerings/presents/net/ServiceCreds.as
similarity index 100%
rename from src/main/as/com/threerings/presents/net/ServiceCreds.as
rename to core/src/main/as/com/threerings/presents/net/ServiceCreds.as
diff --git a/src/main/as/com/threerings/presents/net/SubscribeRequest.as b/core/src/main/as/com/threerings/presents/net/SubscribeRequest.as
similarity index 100%
rename from src/main/as/com/threerings/presents/net/SubscribeRequest.as
rename to core/src/main/as/com/threerings/presents/net/SubscribeRequest.as
diff --git a/src/main/as/com/threerings/presents/net/ThrottleUpdatedMessage.as b/core/src/main/as/com/threerings/presents/net/ThrottleUpdatedMessage.as
similarity index 100%
rename from src/main/as/com/threerings/presents/net/ThrottleUpdatedMessage.as
rename to core/src/main/as/com/threerings/presents/net/ThrottleUpdatedMessage.as
diff --git a/src/main/as/com/threerings/presents/net/UnsubscribeRequest.as b/core/src/main/as/com/threerings/presents/net/UnsubscribeRequest.as
similarity index 100%
rename from src/main/as/com/threerings/presents/net/UnsubscribeRequest.as
rename to core/src/main/as/com/threerings/presents/net/UnsubscribeRequest.as
diff --git a/src/main/as/com/threerings/presents/net/UnsubscribeResponse.as b/core/src/main/as/com/threerings/presents/net/UnsubscribeResponse.as
similarity index 100%
rename from src/main/as/com/threerings/presents/net/UnsubscribeResponse.as
rename to core/src/main/as/com/threerings/presents/net/UnsubscribeResponse.as
diff --git a/src/main/as/com/threerings/presents/net/UpdateThrottleMessage.as b/core/src/main/as/com/threerings/presents/net/UpdateThrottleMessage.as
similarity index 100%
rename from src/main/as/com/threerings/presents/net/UpdateThrottleMessage.as
rename to core/src/main/as/com/threerings/presents/net/UpdateThrottleMessage.as
diff --git a/src/main/as/com/threerings/presents/net/UpstreamMessage.as b/core/src/main/as/com/threerings/presents/net/UpstreamMessage.as
similarity index 100%
rename from src/main/as/com/threerings/presents/net/UpstreamMessage.as
rename to core/src/main/as/com/threerings/presents/net/UpstreamMessage.as
diff --git a/src/main/as/com/threerings/presents/net/UsernamePasswordCreds.as b/core/src/main/as/com/threerings/presents/net/UsernamePasswordCreds.as
similarity index 100%
rename from src/main/as/com/threerings/presents/net/UsernamePasswordCreds.as
rename to core/src/main/as/com/threerings/presents/net/UsernamePasswordCreds.as
diff --git a/src/main/as/com/threerings/presents/peer/data/ClientInfo.as b/core/src/main/as/com/threerings/presents/peer/data/ClientInfo.as
similarity index 100%
rename from src/main/as/com/threerings/presents/peer/data/ClientInfo.as
rename to core/src/main/as/com/threerings/presents/peer/data/ClientInfo.as
diff --git a/src/main/as/com/threerings/presents/util/PresentsContext.as b/core/src/main/as/com/threerings/presents/util/PresentsContext.as
similarity index 100%
rename from src/main/as/com/threerings/presents/util/PresentsContext.as
rename to core/src/main/as/com/threerings/presents/util/PresentsContext.as
diff --git a/src/main/as/com/threerings/presents/util/SafeObjectManager.as b/core/src/main/as/com/threerings/presents/util/SafeObjectManager.as
similarity index 100%
rename from src/main/as/com/threerings/presents/util/SafeObjectManager.as
rename to core/src/main/as/com/threerings/presents/util/SafeObjectManager.as
diff --git a/src/main/as/com/threerings/presents/util/SafeSubscriber.as b/core/src/main/as/com/threerings/presents/util/SafeSubscriber.as
similarity index 100%
rename from src/main/as/com/threerings/presents/util/SafeSubscriber.as
rename to core/src/main/as/com/threerings/presents/util/SafeSubscriber.as
diff --git a/src/main/as/com/threerings/util/ArrayIterator.as b/core/src/main/as/com/threerings/util/ArrayIterator.as
similarity index 100%
rename from src/main/as/com/threerings/util/ArrayIterator.as
rename to core/src/main/as/com/threerings/util/ArrayIterator.as
diff --git a/src/main/as/com/threerings/util/Boxed.as b/core/src/main/as/com/threerings/util/Boxed.as
similarity index 100%
rename from src/main/as/com/threerings/util/Boxed.as
rename to core/src/main/as/com/threerings/util/Boxed.as
diff --git a/src/main/as/com/threerings/util/Byte.as b/core/src/main/as/com/threerings/util/Byte.as
similarity index 100%
rename from src/main/as/com/threerings/util/Byte.as
rename to core/src/main/as/com/threerings/util/Byte.as
diff --git a/src/main/as/com/threerings/util/EmbeddedSwfLoader.as b/core/src/main/as/com/threerings/util/EmbeddedSwfLoader.as
similarity index 100%
rename from src/main/as/com/threerings/util/EmbeddedSwfLoader.as
rename to core/src/main/as/com/threerings/util/EmbeddedSwfLoader.as
diff --git a/src/main/as/com/threerings/util/Float.as b/core/src/main/as/com/threerings/util/Float.as
similarity index 100%
rename from src/main/as/com/threerings/util/Float.as
rename to core/src/main/as/com/threerings/util/Float.as
diff --git a/src/main/as/com/threerings/util/Integer.as b/core/src/main/as/com/threerings/util/Integer.as
similarity index 100%
rename from src/main/as/com/threerings/util/Integer.as
rename to core/src/main/as/com/threerings/util/Integer.as
diff --git a/src/main/as/com/threerings/util/Iterator.as b/core/src/main/as/com/threerings/util/Iterator.as
similarity index 100%
rename from src/main/as/com/threerings/util/Iterator.as
rename to core/src/main/as/com/threerings/util/Iterator.as
diff --git a/src/main/as/com/threerings/util/Long.as b/core/src/main/as/com/threerings/util/Long.as
similarity index 100%
rename from src/main/as/com/threerings/util/Long.as
rename to core/src/main/as/com/threerings/util/Long.as
diff --git a/src/main/as/com/threerings/util/MessageBundle.as b/core/src/main/as/com/threerings/util/MessageBundle.as
similarity index 100%
rename from src/main/as/com/threerings/util/MessageBundle.as
rename to core/src/main/as/com/threerings/util/MessageBundle.as
diff --git a/src/main/as/com/threerings/util/MessageManager.as b/core/src/main/as/com/threerings/util/MessageManager.as
similarity index 100%
rename from src/main/as/com/threerings/util/MessageManager.as
rename to core/src/main/as/com/threerings/util/MessageManager.as
diff --git a/src/main/as/com/threerings/util/Name.as b/core/src/main/as/com/threerings/util/Name.as
similarity index 100%
rename from src/main/as/com/threerings/util/Name.as
rename to core/src/main/as/com/threerings/util/Name.as
diff --git a/src/main/as/com/threerings/util/ObjectMarshaller.as b/core/src/main/as/com/threerings/util/ObjectMarshaller.as
similarity index 100%
rename from src/main/as/com/threerings/util/ObjectMarshaller.as
rename to core/src/main/as/com/threerings/util/ObjectMarshaller.as
diff --git a/src/main/as/com/threerings/util/ResultAdapter.as b/core/src/main/as/com/threerings/util/ResultAdapter.as
similarity index 100%
rename from src/main/as/com/threerings/util/ResultAdapter.as
rename to core/src/main/as/com/threerings/util/ResultAdapter.as
diff --git a/src/main/as/com/threerings/util/ResultListener.as b/core/src/main/as/com/threerings/util/ResultListener.as
similarity index 100%
rename from src/main/as/com/threerings/util/ResultListener.as
rename to core/src/main/as/com/threerings/util/ResultListener.as
diff --git a/src/main/as/com/threerings/util/Short.as b/core/src/main/as/com/threerings/util/Short.as
similarity index 100%
rename from src/main/as/com/threerings/util/Short.as
rename to core/src/main/as/com/threerings/util/Short.as
diff --git a/src/main/as/com/threerings/util/StreamableArrayList.as b/core/src/main/as/com/threerings/util/StreamableArrayList.as
similarity index 100%
rename from src/main/as/com/threerings/util/StreamableArrayList.as
rename to core/src/main/as/com/threerings/util/StreamableArrayList.as
diff --git a/src/main/as/com/threerings/util/StreamableHashMap.as b/core/src/main/as/com/threerings/util/StreamableHashMap.as
similarity index 100%
rename from src/main/as/com/threerings/util/StreamableHashMap.as
rename to core/src/main/as/com/threerings/util/StreamableHashMap.as
diff --git a/src/main/as/com/threerings/util/TimeUtil.as b/core/src/main/as/com/threerings/util/TimeUtil.as
similarity index 100%
rename from src/main/as/com/threerings/util/TimeUtil.as
rename to core/src/main/as/com/threerings/util/TimeUtil.as
diff --git a/src/main/as/com/threerings/util/langBoolean.as b/core/src/main/as/com/threerings/util/langBoolean.as
similarity index 100%
rename from src/main/as/com/threerings/util/langBoolean.as
rename to core/src/main/as/com/threerings/util/langBoolean.as
diff --git a/src/main/java/com/threerings/NaryaLog.java b/core/src/main/java/com/threerings/NaryaLog.java
similarity index 100%
rename from src/main/java/com/threerings/NaryaLog.java
rename to core/src/main/java/com/threerings/NaryaLog.java
diff --git a/src/main/java/com/threerings/admin/Log.java b/core/src/main/java/com/threerings/admin/Log.java
similarity index 100%
rename from src/main/java/com/threerings/admin/Log.java
rename to core/src/main/java/com/threerings/admin/Log.java
diff --git a/src/main/java/com/threerings/admin/client/AdminService.java b/core/src/main/java/com/threerings/admin/client/AdminService.java
similarity index 100%
rename from src/main/java/com/threerings/admin/client/AdminService.java
rename to core/src/main/java/com/threerings/admin/client/AdminService.java
diff --git a/src/main/java/com/threerings/admin/client/AsStringFieldEditor.java b/core/src/main/java/com/threerings/admin/client/AsStringFieldEditor.java
similarity index 100%
rename from src/main/java/com/threerings/admin/client/AsStringFieldEditor.java
rename to core/src/main/java/com/threerings/admin/client/AsStringFieldEditor.java
diff --git a/src/main/java/com/threerings/admin/client/BooleanFieldEditor.java b/core/src/main/java/com/threerings/admin/client/BooleanFieldEditor.java
similarity index 100%
rename from src/main/java/com/threerings/admin/client/BooleanFieldEditor.java
rename to core/src/main/java/com/threerings/admin/client/BooleanFieldEditor.java
diff --git a/src/main/java/com/threerings/admin/client/ConfigEditorPanel.java b/core/src/main/java/com/threerings/admin/client/ConfigEditorPanel.java
similarity index 100%
rename from src/main/java/com/threerings/admin/client/ConfigEditorPanel.java
rename to core/src/main/java/com/threerings/admin/client/ConfigEditorPanel.java
diff --git a/src/main/java/com/threerings/admin/client/ConfigObjectManager.java b/core/src/main/java/com/threerings/admin/client/ConfigObjectManager.java
similarity index 100%
rename from src/main/java/com/threerings/admin/client/ConfigObjectManager.java
rename to core/src/main/java/com/threerings/admin/client/ConfigObjectManager.java
diff --git a/src/main/java/com/threerings/admin/client/DSetEditor.java b/core/src/main/java/com/threerings/admin/client/DSetEditor.java
similarity index 100%
rename from src/main/java/com/threerings/admin/client/DSetEditor.java
rename to core/src/main/java/com/threerings/admin/client/DSetEditor.java
diff --git a/src/main/java/com/threerings/admin/client/FieldEditor.java b/core/src/main/java/com/threerings/admin/client/FieldEditor.java
similarity index 100%
rename from src/main/java/com/threerings/admin/client/FieldEditor.java
rename to core/src/main/java/com/threerings/admin/client/FieldEditor.java
diff --git a/src/main/java/com/threerings/admin/client/ObjectEditorPanel.java b/core/src/main/java/com/threerings/admin/client/ObjectEditorPanel.java
similarity index 100%
rename from src/main/java/com/threerings/admin/client/ObjectEditorPanel.java
rename to core/src/main/java/com/threerings/admin/client/ObjectEditorPanel.java
diff --git a/src/main/java/com/threerings/admin/client/PulldownFieldEditor.java b/core/src/main/java/com/threerings/admin/client/PulldownFieldEditor.java
similarity index 100%
rename from src/main/java/com/threerings/admin/client/PulldownFieldEditor.java
rename to core/src/main/java/com/threerings/admin/client/PulldownFieldEditor.java
diff --git a/src/main/java/com/threerings/admin/client/TabbedDSetEditor.java b/core/src/main/java/com/threerings/admin/client/TabbedDSetEditor.java
similarity index 100%
rename from src/main/java/com/threerings/admin/client/TabbedDSetEditor.java
rename to core/src/main/java/com/threerings/admin/client/TabbedDSetEditor.java
diff --git a/src/main/java/com/threerings/admin/data/AdminCodes.java b/core/src/main/java/com/threerings/admin/data/AdminCodes.java
similarity index 100%
rename from src/main/java/com/threerings/admin/data/AdminCodes.java
rename to core/src/main/java/com/threerings/admin/data/AdminCodes.java
diff --git a/src/main/java/com/threerings/admin/data/AdminMarshaller.java b/core/src/main/java/com/threerings/admin/data/AdminMarshaller.java
similarity index 100%
rename from src/main/java/com/threerings/admin/data/AdminMarshaller.java
rename to core/src/main/java/com/threerings/admin/data/AdminMarshaller.java
diff --git a/src/main/java/com/threerings/admin/data/ConfigObject.java b/core/src/main/java/com/threerings/admin/data/ConfigObject.java
similarity index 100%
rename from src/main/java/com/threerings/admin/data/ConfigObject.java
rename to core/src/main/java/com/threerings/admin/data/ConfigObject.java
diff --git a/src/main/java/com/threerings/admin/server/AdminManager.java b/core/src/main/java/com/threerings/admin/server/AdminManager.java
similarity index 100%
rename from src/main/java/com/threerings/admin/server/AdminManager.java
rename to core/src/main/java/com/threerings/admin/server/AdminManager.java
diff --git a/src/main/java/com/threerings/admin/server/AdminProvider.java b/core/src/main/java/com/threerings/admin/server/AdminProvider.java
similarity index 100%
rename from src/main/java/com/threerings/admin/server/AdminProvider.java
rename to core/src/main/java/com/threerings/admin/server/AdminProvider.java
diff --git a/src/main/java/com/threerings/admin/server/ConfigRegistry.java b/core/src/main/java/com/threerings/admin/server/ConfigRegistry.java
similarity index 100%
rename from src/main/java/com/threerings/admin/server/ConfigRegistry.java
rename to core/src/main/java/com/threerings/admin/server/ConfigRegistry.java
diff --git a/src/main/java/com/threerings/admin/server/DatabaseConfigRegistry.java b/core/src/main/java/com/threerings/admin/server/DatabaseConfigRegistry.java
similarity index 100%
rename from src/main/java/com/threerings/admin/server/DatabaseConfigRegistry.java
rename to core/src/main/java/com/threerings/admin/server/DatabaseConfigRegistry.java
diff --git a/src/main/java/com/threerings/admin/server/PeeredDatabaseConfigRegistry.java b/core/src/main/java/com/threerings/admin/server/PeeredDatabaseConfigRegistry.java
similarity index 100%
rename from src/main/java/com/threerings/admin/server/PeeredDatabaseConfigRegistry.java
rename to core/src/main/java/com/threerings/admin/server/PeeredDatabaseConfigRegistry.java
diff --git a/src/main/java/com/threerings/admin/server/PrefsConfigRegistry.java b/core/src/main/java/com/threerings/admin/server/PrefsConfigRegistry.java
similarity index 100%
rename from src/main/java/com/threerings/admin/server/PrefsConfigRegistry.java
rename to core/src/main/java/com/threerings/admin/server/PrefsConfigRegistry.java
diff --git a/src/main/java/com/threerings/admin/server/persist/ConfigDatum.java b/core/src/main/java/com/threerings/admin/server/persist/ConfigDatum.java
similarity index 100%
rename from src/main/java/com/threerings/admin/server/persist/ConfigDatum.java
rename to core/src/main/java/com/threerings/admin/server/persist/ConfigDatum.java
diff --git a/src/main/java/com/threerings/admin/server/persist/ConfigRecord.java b/core/src/main/java/com/threerings/admin/server/persist/ConfigRecord.java
similarity index 100%
rename from src/main/java/com/threerings/admin/server/persist/ConfigRecord.java
rename to core/src/main/java/com/threerings/admin/server/persist/ConfigRecord.java
diff --git a/src/main/java/com/threerings/admin/server/persist/ConfigRepository.java b/core/src/main/java/com/threerings/admin/server/persist/ConfigRepository.java
similarity index 100%
rename from src/main/java/com/threerings/admin/server/persist/ConfigRepository.java
rename to core/src/main/java/com/threerings/admin/server/persist/ConfigRepository.java
diff --git a/src/main/java/com/threerings/admin/web/Admin.gwt.xml b/core/src/main/java/com/threerings/admin/web/Admin.gwt.xml
similarity index 100%
rename from src/main/java/com/threerings/admin/web/Admin.gwt.xml
rename to core/src/main/java/com/threerings/admin/web/Admin.gwt.xml
diff --git a/src/main/java/com/threerings/admin/web/client/ConfigEditorPanel.java b/core/src/main/java/com/threerings/admin/web/client/ConfigEditorPanel.java
similarity index 100%
rename from src/main/java/com/threerings/admin/web/client/ConfigEditorPanel.java
rename to core/src/main/java/com/threerings/admin/web/client/ConfigEditorPanel.java
diff --git a/src/main/java/com/threerings/admin/web/client/ConfigEditorTab.java b/core/src/main/java/com/threerings/admin/web/client/ConfigEditorTab.java
similarity index 100%
rename from src/main/java/com/threerings/admin/web/client/ConfigEditorTab.java
rename to core/src/main/java/com/threerings/admin/web/client/ConfigEditorTab.java
diff --git a/src/main/java/com/threerings/admin/web/client/ConfigFieldEditor.java b/core/src/main/java/com/threerings/admin/web/client/ConfigFieldEditor.java
similarity index 100%
rename from src/main/java/com/threerings/admin/web/client/ConfigFieldEditor.java
rename to core/src/main/java/com/threerings/admin/web/client/ConfigFieldEditor.java
diff --git a/src/main/java/com/threerings/admin/web/gwt/ConfigField.java b/core/src/main/java/com/threerings/admin/web/gwt/ConfigField.java
similarity index 100%
rename from src/main/java/com/threerings/admin/web/gwt/ConfigField.java
rename to core/src/main/java/com/threerings/admin/web/gwt/ConfigField.java
diff --git a/src/main/java/com/threerings/admin/web/gwt/ConfigService.java b/core/src/main/java/com/threerings/admin/web/gwt/ConfigService.java
similarity index 100%
rename from src/main/java/com/threerings/admin/web/gwt/ConfigService.java
rename to core/src/main/java/com/threerings/admin/web/gwt/ConfigService.java
diff --git a/src/main/java/com/threerings/admin/web/gwt/ConfigServiceAsync.java b/core/src/main/java/com/threerings/admin/web/gwt/ConfigServiceAsync.java
similarity index 100%
rename from src/main/java/com/threerings/admin/web/gwt/ConfigServiceAsync.java
rename to core/src/main/java/com/threerings/admin/web/gwt/ConfigServiceAsync.java
diff --git a/src/main/java/com/threerings/admin/web/server/ConfigServlet.java b/core/src/main/java/com/threerings/admin/web/server/ConfigServlet.java
similarity index 100%
rename from src/main/java/com/threerings/admin/web/server/ConfigServlet.java
rename to core/src/main/java/com/threerings/admin/web/server/ConfigServlet.java
diff --git a/src/main/java/com/threerings/bureau/Log.java b/core/src/main/java/com/threerings/bureau/Log.java
similarity index 100%
rename from src/main/java/com/threerings/bureau/Log.java
rename to core/src/main/java/com/threerings/bureau/Log.java
diff --git a/src/main/java/com/threerings/bureau/client/Agent.java b/core/src/main/java/com/threerings/bureau/client/Agent.java
similarity index 100%
rename from src/main/java/com/threerings/bureau/client/Agent.java
rename to core/src/main/java/com/threerings/bureau/client/Agent.java
diff --git a/src/main/java/com/threerings/bureau/client/BureauClient.java b/core/src/main/java/com/threerings/bureau/client/BureauClient.java
similarity index 100%
rename from src/main/java/com/threerings/bureau/client/BureauClient.java
rename to core/src/main/java/com/threerings/bureau/client/BureauClient.java
diff --git a/src/main/java/com/threerings/bureau/client/BureauDecoder.java b/core/src/main/java/com/threerings/bureau/client/BureauDecoder.java
similarity index 100%
rename from src/main/java/com/threerings/bureau/client/BureauDecoder.java
rename to core/src/main/java/com/threerings/bureau/client/BureauDecoder.java
diff --git a/src/main/java/com/threerings/bureau/client/BureauDirector.java b/core/src/main/java/com/threerings/bureau/client/BureauDirector.java
similarity index 100%
rename from src/main/java/com/threerings/bureau/client/BureauDirector.java
rename to core/src/main/java/com/threerings/bureau/client/BureauDirector.java
diff --git a/src/main/java/com/threerings/bureau/client/BureauReceiver.java b/core/src/main/java/com/threerings/bureau/client/BureauReceiver.java
similarity index 100%
rename from src/main/java/com/threerings/bureau/client/BureauReceiver.java
rename to core/src/main/java/com/threerings/bureau/client/BureauReceiver.java
diff --git a/src/main/java/com/threerings/bureau/client/BureauService.java b/core/src/main/java/com/threerings/bureau/client/BureauService.java
similarity index 100%
rename from src/main/java/com/threerings/bureau/client/BureauService.java
rename to core/src/main/java/com/threerings/bureau/client/BureauService.java
diff --git a/src/main/java/com/threerings/bureau/data/AgentObject.java b/core/src/main/java/com/threerings/bureau/data/AgentObject.java
similarity index 100%
rename from src/main/java/com/threerings/bureau/data/AgentObject.java
rename to core/src/main/java/com/threerings/bureau/data/AgentObject.java
diff --git a/src/main/java/com/threerings/bureau/data/BureauAuthName.java b/core/src/main/java/com/threerings/bureau/data/BureauAuthName.java
similarity index 100%
rename from src/main/java/com/threerings/bureau/data/BureauAuthName.java
rename to core/src/main/java/com/threerings/bureau/data/BureauAuthName.java
diff --git a/src/main/java/com/threerings/bureau/data/BureauClientObject.java b/core/src/main/java/com/threerings/bureau/data/BureauClientObject.java
similarity index 100%
rename from src/main/java/com/threerings/bureau/data/BureauClientObject.java
rename to core/src/main/java/com/threerings/bureau/data/BureauClientObject.java
diff --git a/src/main/java/com/threerings/bureau/data/BureauCodes.java b/core/src/main/java/com/threerings/bureau/data/BureauCodes.java
similarity index 100%
rename from src/main/java/com/threerings/bureau/data/BureauCodes.java
rename to core/src/main/java/com/threerings/bureau/data/BureauCodes.java
diff --git a/src/main/java/com/threerings/bureau/data/BureauCredentials.java b/core/src/main/java/com/threerings/bureau/data/BureauCredentials.java
similarity index 100%
rename from src/main/java/com/threerings/bureau/data/BureauCredentials.java
rename to core/src/main/java/com/threerings/bureau/data/BureauCredentials.java
diff --git a/src/main/java/com/threerings/bureau/data/BureauMarshaller.java b/core/src/main/java/com/threerings/bureau/data/BureauMarshaller.java
similarity index 100%
rename from src/main/java/com/threerings/bureau/data/BureauMarshaller.java
rename to core/src/main/java/com/threerings/bureau/data/BureauMarshaller.java
diff --git a/src/main/java/com/threerings/bureau/server/BureauClientResolver.java b/core/src/main/java/com/threerings/bureau/server/BureauClientResolver.java
similarity index 100%
rename from src/main/java/com/threerings/bureau/server/BureauClientResolver.java
rename to core/src/main/java/com/threerings/bureau/server/BureauClientResolver.java
diff --git a/src/main/java/com/threerings/bureau/server/BureauProvider.java b/core/src/main/java/com/threerings/bureau/server/BureauProvider.java
similarity index 100%
rename from src/main/java/com/threerings/bureau/server/BureauProvider.java
rename to core/src/main/java/com/threerings/bureau/server/BureauProvider.java
diff --git a/src/main/java/com/threerings/bureau/server/BureauRegistry.java b/core/src/main/java/com/threerings/bureau/server/BureauRegistry.java
similarity index 100%
rename from src/main/java/com/threerings/bureau/server/BureauRegistry.java
rename to core/src/main/java/com/threerings/bureau/server/BureauRegistry.java
diff --git a/src/main/java/com/threerings/bureau/server/BureauSender.java b/core/src/main/java/com/threerings/bureau/server/BureauSender.java
similarity index 100%
rename from src/main/java/com/threerings/bureau/server/BureauSender.java
rename to core/src/main/java/com/threerings/bureau/server/BureauSender.java
diff --git a/src/main/java/com/threerings/bureau/server/BureauSession.java b/core/src/main/java/com/threerings/bureau/server/BureauSession.java
similarity index 100%
rename from src/main/java/com/threerings/bureau/server/BureauSession.java
rename to core/src/main/java/com/threerings/bureau/server/BureauSession.java
diff --git a/src/main/java/com/threerings/bureau/util/BureauContext.java b/core/src/main/java/com/threerings/bureau/util/BureauContext.java
similarity index 100%
rename from src/main/java/com/threerings/bureau/util/BureauContext.java
rename to core/src/main/java/com/threerings/bureau/util/BureauContext.java
diff --git a/src/main/java/com/threerings/bureau/util/BureauLogRedirector.java b/core/src/main/java/com/threerings/bureau/util/BureauLogRedirector.java
similarity index 100%
rename from src/main/java/com/threerings/bureau/util/BureauLogRedirector.java
rename to core/src/main/java/com/threerings/bureau/util/BureauLogRedirector.java
diff --git a/src/main/java/com/threerings/crowd/Log.java b/core/src/main/java/com/threerings/crowd/Log.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/Log.java
rename to core/src/main/java/com/threerings/crowd/Log.java
diff --git a/src/main/java/com/threerings/crowd/chat/client/ChannelSpeakService.java b/core/src/main/java/com/threerings/crowd/chat/client/ChannelSpeakService.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/client/ChannelSpeakService.java
rename to core/src/main/java/com/threerings/crowd/chat/client/ChannelSpeakService.java
diff --git a/src/main/java/com/threerings/crowd/chat/client/ChatDirector.java b/core/src/main/java/com/threerings/crowd/chat/client/ChatDirector.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/client/ChatDirector.java
rename to core/src/main/java/com/threerings/crowd/chat/client/ChatDirector.java
diff --git a/src/main/java/com/threerings/crowd/chat/client/ChatDisplay.java b/core/src/main/java/com/threerings/crowd/chat/client/ChatDisplay.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/client/ChatDisplay.java
rename to core/src/main/java/com/threerings/crowd/chat/client/ChatDisplay.java
diff --git a/src/main/java/com/threerings/crowd/chat/client/ChatFilter.java b/core/src/main/java/com/threerings/crowd/chat/client/ChatFilter.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/client/ChatFilter.java
rename to core/src/main/java/com/threerings/crowd/chat/client/ChatFilter.java
diff --git a/src/main/java/com/threerings/crowd/chat/client/ChatService.java b/core/src/main/java/com/threerings/crowd/chat/client/ChatService.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/client/ChatService.java
rename to core/src/main/java/com/threerings/crowd/chat/client/ChatService.java
diff --git a/src/main/java/com/threerings/crowd/chat/client/CurseFilter.java b/core/src/main/java/com/threerings/crowd/chat/client/CurseFilter.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/client/CurseFilter.java
rename to core/src/main/java/com/threerings/crowd/chat/client/CurseFilter.java
diff --git a/src/main/java/com/threerings/crowd/chat/client/HistoryList.java b/core/src/main/java/com/threerings/crowd/chat/client/HistoryList.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/client/HistoryList.java
rename to core/src/main/java/com/threerings/crowd/chat/client/HistoryList.java
diff --git a/src/main/java/com/threerings/crowd/chat/client/MuteDirector.java b/core/src/main/java/com/threerings/crowd/chat/client/MuteDirector.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/client/MuteDirector.java
rename to core/src/main/java/com/threerings/crowd/chat/client/MuteDirector.java
diff --git a/src/main/java/com/threerings/crowd/chat/client/SpeakService.java b/core/src/main/java/com/threerings/crowd/chat/client/SpeakService.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/client/SpeakService.java
rename to core/src/main/java/com/threerings/crowd/chat/client/SpeakService.java
diff --git a/src/main/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java b/core/src/main/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java
rename to core/src/main/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java
diff --git a/src/main/java/com/threerings/crowd/chat/data/ChatChannel.java b/core/src/main/java/com/threerings/crowd/chat/data/ChatChannel.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/data/ChatChannel.java
rename to core/src/main/java/com/threerings/crowd/chat/data/ChatChannel.java
diff --git a/src/main/java/com/threerings/crowd/chat/data/ChatCodes.java b/core/src/main/java/com/threerings/crowd/chat/data/ChatCodes.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/data/ChatCodes.java
rename to core/src/main/java/com/threerings/crowd/chat/data/ChatCodes.java
diff --git a/src/main/java/com/threerings/crowd/chat/data/ChatMarshaller.java b/core/src/main/java/com/threerings/crowd/chat/data/ChatMarshaller.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/data/ChatMarshaller.java
rename to core/src/main/java/com/threerings/crowd/chat/data/ChatMarshaller.java
diff --git a/src/main/java/com/threerings/crowd/chat/data/ChatMessage.java b/core/src/main/java/com/threerings/crowd/chat/data/ChatMessage.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/data/ChatMessage.java
rename to core/src/main/java/com/threerings/crowd/chat/data/ChatMessage.java
diff --git a/src/main/java/com/threerings/crowd/chat/data/KeepNoHistory.java b/core/src/main/java/com/threerings/crowd/chat/data/KeepNoHistory.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/data/KeepNoHistory.java
rename to core/src/main/java/com/threerings/crowd/chat/data/KeepNoHistory.java
diff --git a/src/main/java/com/threerings/crowd/chat/data/SpeakMarshaller.java b/core/src/main/java/com/threerings/crowd/chat/data/SpeakMarshaller.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/data/SpeakMarshaller.java
rename to core/src/main/java/com/threerings/crowd/chat/data/SpeakMarshaller.java
diff --git a/src/main/java/com/threerings/crowd/chat/data/SpeakObject.java b/core/src/main/java/com/threerings/crowd/chat/data/SpeakObject.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/data/SpeakObject.java
rename to core/src/main/java/com/threerings/crowd/chat/data/SpeakObject.java
diff --git a/src/main/java/com/threerings/crowd/chat/data/SystemMessage.java b/core/src/main/java/com/threerings/crowd/chat/data/SystemMessage.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/data/SystemMessage.java
rename to core/src/main/java/com/threerings/crowd/chat/data/SystemMessage.java
diff --git a/src/main/java/com/threerings/crowd/chat/data/TellFeedbackMessage.java b/core/src/main/java/com/threerings/crowd/chat/data/TellFeedbackMessage.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/data/TellFeedbackMessage.java
rename to core/src/main/java/com/threerings/crowd/chat/data/TellFeedbackMessage.java
diff --git a/src/main/java/com/threerings/crowd/chat/data/UserMessage.java b/core/src/main/java/com/threerings/crowd/chat/data/UserMessage.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/data/UserMessage.java
rename to core/src/main/java/com/threerings/crowd/chat/data/UserMessage.java
diff --git a/src/main/java/com/threerings/crowd/chat/data/UserSystemMessage.java b/core/src/main/java/com/threerings/crowd/chat/data/UserSystemMessage.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/data/UserSystemMessage.java
rename to core/src/main/java/com/threerings/crowd/chat/data/UserSystemMessage.java
diff --git a/src/main/java/com/threerings/crowd/chat/server/ChannelSpeakProvider.java b/core/src/main/java/com/threerings/crowd/chat/server/ChannelSpeakProvider.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/server/ChannelSpeakProvider.java
rename to core/src/main/java/com/threerings/crowd/chat/server/ChannelSpeakProvider.java
diff --git a/src/main/java/com/threerings/crowd/chat/server/ChatChannelManager.java b/core/src/main/java/com/threerings/crowd/chat/server/ChatChannelManager.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/server/ChatChannelManager.java
rename to core/src/main/java/com/threerings/crowd/chat/server/ChatChannelManager.java
diff --git a/src/main/java/com/threerings/crowd/chat/server/ChatHistory.java b/core/src/main/java/com/threerings/crowd/chat/server/ChatHistory.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/server/ChatHistory.java
rename to core/src/main/java/com/threerings/crowd/chat/server/ChatHistory.java
diff --git a/src/main/java/com/threerings/crowd/chat/server/ChatProvider.java b/core/src/main/java/com/threerings/crowd/chat/server/ChatProvider.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/server/ChatProvider.java
rename to core/src/main/java/com/threerings/crowd/chat/server/ChatProvider.java
diff --git a/src/main/java/com/threerings/crowd/chat/server/SpeakHandler.java b/core/src/main/java/com/threerings/crowd/chat/server/SpeakHandler.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/server/SpeakHandler.java
rename to core/src/main/java/com/threerings/crowd/chat/server/SpeakHandler.java
diff --git a/src/main/java/com/threerings/crowd/chat/server/SpeakProvider.java b/core/src/main/java/com/threerings/crowd/chat/server/SpeakProvider.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/server/SpeakProvider.java
rename to core/src/main/java/com/threerings/crowd/chat/server/SpeakProvider.java
diff --git a/src/main/java/com/threerings/crowd/chat/server/SpeakUtil.java b/core/src/main/java/com/threerings/crowd/chat/server/SpeakUtil.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/chat/server/SpeakUtil.java
rename to core/src/main/java/com/threerings/crowd/chat/server/SpeakUtil.java
diff --git a/src/main/java/com/threerings/crowd/client/BodyService.java b/core/src/main/java/com/threerings/crowd/client/BodyService.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/client/BodyService.java
rename to core/src/main/java/com/threerings/crowd/client/BodyService.java
diff --git a/src/main/java/com/threerings/crowd/client/LocationAdapter.java b/core/src/main/java/com/threerings/crowd/client/LocationAdapter.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/client/LocationAdapter.java
rename to core/src/main/java/com/threerings/crowd/client/LocationAdapter.java
diff --git a/src/main/java/com/threerings/crowd/client/LocationDecoder.java b/core/src/main/java/com/threerings/crowd/client/LocationDecoder.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/client/LocationDecoder.java
rename to core/src/main/java/com/threerings/crowd/client/LocationDecoder.java
diff --git a/src/main/java/com/threerings/crowd/client/LocationDirector.java b/core/src/main/java/com/threerings/crowd/client/LocationDirector.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/client/LocationDirector.java
rename to core/src/main/java/com/threerings/crowd/client/LocationDirector.java
diff --git a/src/main/java/com/threerings/crowd/client/LocationObserver.java b/core/src/main/java/com/threerings/crowd/client/LocationObserver.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/client/LocationObserver.java
rename to core/src/main/java/com/threerings/crowd/client/LocationObserver.java
diff --git a/src/main/java/com/threerings/crowd/client/LocationReceiver.java b/core/src/main/java/com/threerings/crowd/client/LocationReceiver.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/client/LocationReceiver.java
rename to core/src/main/java/com/threerings/crowd/client/LocationReceiver.java
diff --git a/src/main/java/com/threerings/crowd/client/LocationService.java b/core/src/main/java/com/threerings/crowd/client/LocationService.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/client/LocationService.java
rename to core/src/main/java/com/threerings/crowd/client/LocationService.java
diff --git a/src/main/java/com/threerings/crowd/client/MoveFailedException.java b/core/src/main/java/com/threerings/crowd/client/MoveFailedException.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/client/MoveFailedException.java
rename to core/src/main/java/com/threerings/crowd/client/MoveFailedException.java
diff --git a/src/main/java/com/threerings/crowd/client/MoveVetoedException.java b/core/src/main/java/com/threerings/crowd/client/MoveVetoedException.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/client/MoveVetoedException.java
rename to core/src/main/java/com/threerings/crowd/client/MoveVetoedException.java
diff --git a/src/main/java/com/threerings/crowd/client/OccupantAdapter.java b/core/src/main/java/com/threerings/crowd/client/OccupantAdapter.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/client/OccupantAdapter.java
rename to core/src/main/java/com/threerings/crowd/client/OccupantAdapter.java
diff --git a/src/main/java/com/threerings/crowd/client/OccupantDirector.java b/core/src/main/java/com/threerings/crowd/client/OccupantDirector.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/client/OccupantDirector.java
rename to core/src/main/java/com/threerings/crowd/client/OccupantDirector.java
diff --git a/src/main/java/com/threerings/crowd/client/OccupantObserver.java b/core/src/main/java/com/threerings/crowd/client/OccupantObserver.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/client/OccupantObserver.java
rename to core/src/main/java/com/threerings/crowd/client/OccupantObserver.java
diff --git a/src/main/java/com/threerings/crowd/client/PlaceController.java b/core/src/main/java/com/threerings/crowd/client/PlaceController.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/client/PlaceController.java
rename to core/src/main/java/com/threerings/crowd/client/PlaceController.java
diff --git a/src/main/java/com/threerings/crowd/client/PlaceControllerDelegate.java b/core/src/main/java/com/threerings/crowd/client/PlaceControllerDelegate.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/client/PlaceControllerDelegate.java
rename to core/src/main/java/com/threerings/crowd/client/PlaceControllerDelegate.java
diff --git a/src/main/java/com/threerings/crowd/client/PlacePanel.java b/core/src/main/java/com/threerings/crowd/client/PlacePanel.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/client/PlacePanel.java
rename to core/src/main/java/com/threerings/crowd/client/PlacePanel.java
diff --git a/src/main/java/com/threerings/crowd/client/PlaceView.java b/core/src/main/java/com/threerings/crowd/client/PlaceView.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/client/PlaceView.java
rename to core/src/main/java/com/threerings/crowd/client/PlaceView.java
diff --git a/src/main/java/com/threerings/crowd/client/PlaceViewUtil.java b/core/src/main/java/com/threerings/crowd/client/PlaceViewUtil.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/client/PlaceViewUtil.java
rename to core/src/main/java/com/threerings/crowd/client/PlaceViewUtil.java
diff --git a/src/main/java/com/threerings/crowd/client/TestClient.java b/core/src/main/java/com/threerings/crowd/client/TestClient.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/client/TestClient.java
rename to core/src/main/java/com/threerings/crowd/client/TestClient.java
diff --git a/src/main/java/com/threerings/crowd/data/BodyMarshaller.java b/core/src/main/java/com/threerings/crowd/data/BodyMarshaller.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/data/BodyMarshaller.java
rename to core/src/main/java/com/threerings/crowd/data/BodyMarshaller.java
diff --git a/src/main/java/com/threerings/crowd/data/BodyObject.java b/core/src/main/java/com/threerings/crowd/data/BodyObject.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/data/BodyObject.java
rename to core/src/main/java/com/threerings/crowd/data/BodyObject.java
diff --git a/src/main/java/com/threerings/crowd/data/CrowdCodes.java b/core/src/main/java/com/threerings/crowd/data/CrowdCodes.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/data/CrowdCodes.java
rename to core/src/main/java/com/threerings/crowd/data/CrowdCodes.java
diff --git a/src/main/java/com/threerings/crowd/data/LocationCodes.java b/core/src/main/java/com/threerings/crowd/data/LocationCodes.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/data/LocationCodes.java
rename to core/src/main/java/com/threerings/crowd/data/LocationCodes.java
diff --git a/src/main/java/com/threerings/crowd/data/LocationMarshaller.java b/core/src/main/java/com/threerings/crowd/data/LocationMarshaller.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/data/LocationMarshaller.java
rename to core/src/main/java/com/threerings/crowd/data/LocationMarshaller.java
diff --git a/src/main/java/com/threerings/crowd/data/OccupantInfo.java b/core/src/main/java/com/threerings/crowd/data/OccupantInfo.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/data/OccupantInfo.java
rename to core/src/main/java/com/threerings/crowd/data/OccupantInfo.java
diff --git a/src/main/java/com/threerings/crowd/data/Place.java b/core/src/main/java/com/threerings/crowd/data/Place.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/data/Place.java
rename to core/src/main/java/com/threerings/crowd/data/Place.java
diff --git a/src/main/java/com/threerings/crowd/data/PlaceConfig.java b/core/src/main/java/com/threerings/crowd/data/PlaceConfig.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/data/PlaceConfig.java
rename to core/src/main/java/com/threerings/crowd/data/PlaceConfig.java
diff --git a/src/main/java/com/threerings/crowd/data/PlaceObject.java b/core/src/main/java/com/threerings/crowd/data/PlaceObject.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/data/PlaceObject.java
rename to core/src/main/java/com/threerings/crowd/data/PlaceObject.java
diff --git a/src/main/java/com/threerings/crowd/data/TokenRing.java b/core/src/main/java/com/threerings/crowd/data/TokenRing.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/data/TokenRing.java
rename to core/src/main/java/com/threerings/crowd/data/TokenRing.java
diff --git a/src/main/java/com/threerings/crowd/package.html b/core/src/main/java/com/threerings/crowd/package.html
similarity index 100%
rename from src/main/java/com/threerings/crowd/package.html
rename to core/src/main/java/com/threerings/crowd/package.html
diff --git a/src/main/java/com/threerings/crowd/peer/client/CrowdPeerService.java b/core/src/main/java/com/threerings/crowd/peer/client/CrowdPeerService.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/peer/client/CrowdPeerService.java
rename to core/src/main/java/com/threerings/crowd/peer/client/CrowdPeerService.java
diff --git a/src/main/java/com/threerings/crowd/peer/data/CrowdClientInfo.java b/core/src/main/java/com/threerings/crowd/peer/data/CrowdClientInfo.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/peer/data/CrowdClientInfo.java
rename to core/src/main/java/com/threerings/crowd/peer/data/CrowdClientInfo.java
diff --git a/src/main/java/com/threerings/crowd/peer/data/CrowdNodeObject.java b/core/src/main/java/com/threerings/crowd/peer/data/CrowdNodeObject.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/peer/data/CrowdNodeObject.java
rename to core/src/main/java/com/threerings/crowd/peer/data/CrowdNodeObject.java
diff --git a/src/main/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java b/core/src/main/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java
rename to core/src/main/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java
diff --git a/src/main/java/com/threerings/crowd/peer/server/CrowdPeerManager.java b/core/src/main/java/com/threerings/crowd/peer/server/CrowdPeerManager.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/peer/server/CrowdPeerManager.java
rename to core/src/main/java/com/threerings/crowd/peer/server/CrowdPeerManager.java
diff --git a/src/main/java/com/threerings/crowd/peer/server/CrowdPeerProvider.java b/core/src/main/java/com/threerings/crowd/peer/server/CrowdPeerProvider.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/peer/server/CrowdPeerProvider.java
rename to core/src/main/java/com/threerings/crowd/peer/server/CrowdPeerProvider.java
diff --git a/src/main/java/com/threerings/crowd/server/BodyLocal.java b/core/src/main/java/com/threerings/crowd/server/BodyLocal.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/server/BodyLocal.java
rename to core/src/main/java/com/threerings/crowd/server/BodyLocal.java
diff --git a/src/main/java/com/threerings/crowd/server/BodyLocator.java b/core/src/main/java/com/threerings/crowd/server/BodyLocator.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/server/BodyLocator.java
rename to core/src/main/java/com/threerings/crowd/server/BodyLocator.java
diff --git a/src/main/java/com/threerings/crowd/server/BodyManager.java b/core/src/main/java/com/threerings/crowd/server/BodyManager.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/server/BodyManager.java
rename to core/src/main/java/com/threerings/crowd/server/BodyManager.java
diff --git a/src/main/java/com/threerings/crowd/server/BodyProvider.java b/core/src/main/java/com/threerings/crowd/server/BodyProvider.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/server/BodyProvider.java
rename to core/src/main/java/com/threerings/crowd/server/BodyProvider.java
diff --git a/src/main/java/com/threerings/crowd/server/CrowdClientResolver.java b/core/src/main/java/com/threerings/crowd/server/CrowdClientResolver.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/server/CrowdClientResolver.java
rename to core/src/main/java/com/threerings/crowd/server/CrowdClientResolver.java
diff --git a/src/main/java/com/threerings/crowd/server/CrowdObjectAccess.java b/core/src/main/java/com/threerings/crowd/server/CrowdObjectAccess.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/server/CrowdObjectAccess.java
rename to core/src/main/java/com/threerings/crowd/server/CrowdObjectAccess.java
diff --git a/src/main/java/com/threerings/crowd/server/CrowdServer.java b/core/src/main/java/com/threerings/crowd/server/CrowdServer.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/server/CrowdServer.java
rename to core/src/main/java/com/threerings/crowd/server/CrowdServer.java
diff --git a/src/main/java/com/threerings/crowd/server/CrowdSession.java b/core/src/main/java/com/threerings/crowd/server/CrowdSession.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/server/CrowdSession.java
rename to core/src/main/java/com/threerings/crowd/server/CrowdSession.java
diff --git a/src/main/java/com/threerings/crowd/server/LocationManager.java b/core/src/main/java/com/threerings/crowd/server/LocationManager.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/server/LocationManager.java
rename to core/src/main/java/com/threerings/crowd/server/LocationManager.java
diff --git a/src/main/java/com/threerings/crowd/server/LocationProvider.java b/core/src/main/java/com/threerings/crowd/server/LocationProvider.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/server/LocationProvider.java
rename to core/src/main/java/com/threerings/crowd/server/LocationProvider.java
diff --git a/src/main/java/com/threerings/crowd/server/LocationSender.java b/core/src/main/java/com/threerings/crowd/server/LocationSender.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/server/LocationSender.java
rename to core/src/main/java/com/threerings/crowd/server/LocationSender.java
diff --git a/src/main/java/com/threerings/crowd/server/OccupantOp.java b/core/src/main/java/com/threerings/crowd/server/OccupantOp.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/server/OccupantOp.java
rename to core/src/main/java/com/threerings/crowd/server/OccupantOp.java
diff --git a/src/main/java/com/threerings/crowd/server/PlaceManager.java b/core/src/main/java/com/threerings/crowd/server/PlaceManager.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/server/PlaceManager.java
rename to core/src/main/java/com/threerings/crowd/server/PlaceManager.java
diff --git a/src/main/java/com/threerings/crowd/server/PlaceManagerDelegate.java b/core/src/main/java/com/threerings/crowd/server/PlaceManagerDelegate.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/server/PlaceManagerDelegate.java
rename to core/src/main/java/com/threerings/crowd/server/PlaceManagerDelegate.java
diff --git a/src/main/java/com/threerings/crowd/server/PlaceRegistry.java b/core/src/main/java/com/threerings/crowd/server/PlaceRegistry.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/server/PlaceRegistry.java
rename to core/src/main/java/com/threerings/crowd/server/PlaceRegistry.java
diff --git a/src/main/java/com/threerings/crowd/util/CrowdContext.java b/core/src/main/java/com/threerings/crowd/util/CrowdContext.java
similarity index 100%
rename from src/main/java/com/threerings/crowd/util/CrowdContext.java
rename to core/src/main/java/com/threerings/crowd/util/CrowdContext.java
diff --git a/src/main/java/com/threerings/io/ArrayMask.java b/core/src/main/java/com/threerings/io/ArrayMask.java
similarity index 100%
rename from src/main/java/com/threerings/io/ArrayMask.java
rename to core/src/main/java/com/threerings/io/ArrayMask.java
diff --git a/src/main/java/com/threerings/io/BasicStreamers.java b/core/src/main/java/com/threerings/io/BasicStreamers.java
similarity index 100%
rename from src/main/java/com/threerings/io/BasicStreamers.java
rename to core/src/main/java/com/threerings/io/BasicStreamers.java
diff --git a/src/main/java/com/threerings/io/ByteBufferInputStream.java b/core/src/main/java/com/threerings/io/ByteBufferInputStream.java
similarity index 100%
rename from src/main/java/com/threerings/io/ByteBufferInputStream.java
rename to core/src/main/java/com/threerings/io/ByteBufferInputStream.java
diff --git a/src/main/java/com/threerings/io/ByteBufferOutputStream.java b/core/src/main/java/com/threerings/io/ByteBufferOutputStream.java
similarity index 100%
rename from src/main/java/com/threerings/io/ByteBufferOutputStream.java
rename to core/src/main/java/com/threerings/io/ByteBufferOutputStream.java
diff --git a/src/main/java/com/threerings/io/ClassMapping.java b/core/src/main/java/com/threerings/io/ClassMapping.java
similarity index 100%
rename from src/main/java/com/threerings/io/ClassMapping.java
rename to core/src/main/java/com/threerings/io/ClassMapping.java
diff --git a/src/main/java/com/threerings/io/FieldMarshaller.java b/core/src/main/java/com/threerings/io/FieldMarshaller.java
similarity index 100%
rename from src/main/java/com/threerings/io/FieldMarshaller.java
rename to core/src/main/java/com/threerings/io/FieldMarshaller.java
diff --git a/src/main/java/com/threerings/io/FramedInputStream.java b/core/src/main/java/com/threerings/io/FramedInputStream.java
similarity index 100%
rename from src/main/java/com/threerings/io/FramedInputStream.java
rename to core/src/main/java/com/threerings/io/FramedInputStream.java
diff --git a/src/main/java/com/threerings/io/FramingOutputStream.java b/core/src/main/java/com/threerings/io/FramingOutputStream.java
similarity index 100%
rename from src/main/java/com/threerings/io/FramingOutputStream.java
rename to core/src/main/java/com/threerings/io/FramingOutputStream.java
diff --git a/src/main/java/com/threerings/io/Intern.java b/core/src/main/java/com/threerings/io/Intern.java
similarity index 100%
rename from src/main/java/com/threerings/io/Intern.java
rename to core/src/main/java/com/threerings/io/Intern.java
diff --git a/src/main/java/com/threerings/io/NotStreamable.java b/core/src/main/java/com/threerings/io/NotStreamable.java
similarity index 100%
rename from src/main/java/com/threerings/io/NotStreamable.java
rename to core/src/main/java/com/threerings/io/NotStreamable.java
diff --git a/src/main/java/com/threerings/io/ObjectInputStream.java b/core/src/main/java/com/threerings/io/ObjectInputStream.java
similarity index 100%
rename from src/main/java/com/threerings/io/ObjectInputStream.java
rename to core/src/main/java/com/threerings/io/ObjectInputStream.java
diff --git a/src/main/java/com/threerings/io/ObjectOutputStream.java b/core/src/main/java/com/threerings/io/ObjectOutputStream.java
similarity index 100%
rename from src/main/java/com/threerings/io/ObjectOutputStream.java
rename to core/src/main/java/com/threerings/io/ObjectOutputStream.java
diff --git a/src/main/java/com/threerings/io/SimpleStreamableObject.java b/core/src/main/java/com/threerings/io/SimpleStreamableObject.java
similarity index 100%
rename from src/main/java/com/threerings/io/SimpleStreamableObject.java
rename to core/src/main/java/com/threerings/io/SimpleStreamableObject.java
diff --git a/src/main/java/com/threerings/io/Streamable.java b/core/src/main/java/com/threerings/io/Streamable.java
similarity index 100%
rename from src/main/java/com/threerings/io/Streamable.java
rename to core/src/main/java/com/threerings/io/Streamable.java
diff --git a/src/main/java/com/threerings/io/Streamer.java b/core/src/main/java/com/threerings/io/Streamer.java
similarity index 100%
rename from src/main/java/com/threerings/io/Streamer.java
rename to core/src/main/java/com/threerings/io/Streamer.java
diff --git a/src/main/java/com/threerings/io/UnreliableObjectInputStream.java b/core/src/main/java/com/threerings/io/UnreliableObjectInputStream.java
similarity index 100%
rename from src/main/java/com/threerings/io/UnreliableObjectInputStream.java
rename to core/src/main/java/com/threerings/io/UnreliableObjectInputStream.java
diff --git a/src/main/java/com/threerings/io/UnreliableObjectOutputStream.java b/core/src/main/java/com/threerings/io/UnreliableObjectOutputStream.java
similarity index 100%
rename from src/main/java/com/threerings/io/UnreliableObjectOutputStream.java
rename to core/src/main/java/com/threerings/io/UnreliableObjectOutputStream.java
diff --git a/src/main/java/com/threerings/nio/PolicyServer.java b/core/src/main/java/com/threerings/nio/PolicyServer.java
similarity index 100%
rename from src/main/java/com/threerings/nio/PolicyServer.java
rename to core/src/main/java/com/threerings/nio/PolicyServer.java
diff --git a/src/main/java/com/threerings/nio/SelectorIterable.java b/core/src/main/java/com/threerings/nio/SelectorIterable.java
similarity index 100%
rename from src/main/java/com/threerings/nio/SelectorIterable.java
rename to core/src/main/java/com/threerings/nio/SelectorIterable.java
diff --git a/src/main/java/com/threerings/nio/conman/ConMgrStats.java b/core/src/main/java/com/threerings/nio/conman/ConMgrStats.java
similarity index 100%
rename from src/main/java/com/threerings/nio/conman/ConMgrStats.java
rename to core/src/main/java/com/threerings/nio/conman/ConMgrStats.java
diff --git a/src/main/java/com/threerings/nio/conman/Connection.java b/core/src/main/java/com/threerings/nio/conman/Connection.java
similarity index 100%
rename from src/main/java/com/threerings/nio/conman/Connection.java
rename to core/src/main/java/com/threerings/nio/conman/Connection.java
diff --git a/src/main/java/com/threerings/nio/conman/ConnectionManager.java b/core/src/main/java/com/threerings/nio/conman/ConnectionManager.java
similarity index 100%
rename from src/main/java/com/threerings/nio/conman/ConnectionManager.java
rename to core/src/main/java/com/threerings/nio/conman/ConnectionManager.java
diff --git a/src/main/java/com/threerings/nio/conman/NetEventHandler.java b/core/src/main/java/com/threerings/nio/conman/NetEventHandler.java
similarity index 100%
rename from src/main/java/com/threerings/nio/conman/NetEventHandler.java
rename to core/src/main/java/com/threerings/nio/conman/NetEventHandler.java
diff --git a/src/main/java/com/threerings/nio/conman/ServerSocketChannelAcceptor.java b/core/src/main/java/com/threerings/nio/conman/ServerSocketChannelAcceptor.java
similarity index 100%
rename from src/main/java/com/threerings/nio/conman/ServerSocketChannelAcceptor.java
rename to core/src/main/java/com/threerings/nio/conman/ServerSocketChannelAcceptor.java
diff --git a/src/main/java/com/threerings/presents/Log.java b/core/src/main/java/com/threerings/presents/Log.java
similarity index 100%
rename from src/main/java/com/threerings/presents/Log.java
rename to core/src/main/java/com/threerings/presents/Log.java
diff --git a/src/main/java/com/threerings/presents/annotation/AnyThread.java b/core/src/main/java/com/threerings/presents/annotation/AnyThread.java
similarity index 100%
rename from src/main/java/com/threerings/presents/annotation/AnyThread.java
rename to core/src/main/java/com/threerings/presents/annotation/AnyThread.java
diff --git a/src/main/java/com/threerings/presents/annotation/AuthInvoker.java b/core/src/main/java/com/threerings/presents/annotation/AuthInvoker.java
similarity index 100%
rename from src/main/java/com/threerings/presents/annotation/AuthInvoker.java
rename to core/src/main/java/com/threerings/presents/annotation/AuthInvoker.java
diff --git a/src/main/java/com/threerings/presents/annotation/BlockingThread.java b/core/src/main/java/com/threerings/presents/annotation/BlockingThread.java
similarity index 100%
rename from src/main/java/com/threerings/presents/annotation/BlockingThread.java
rename to core/src/main/java/com/threerings/presents/annotation/BlockingThread.java
diff --git a/src/main/java/com/threerings/presents/annotation/EventQueue.java b/core/src/main/java/com/threerings/presents/annotation/EventQueue.java
similarity index 100%
rename from src/main/java/com/threerings/presents/annotation/EventQueue.java
rename to core/src/main/java/com/threerings/presents/annotation/EventQueue.java
diff --git a/src/main/java/com/threerings/presents/annotation/EventThread.java b/core/src/main/java/com/threerings/presents/annotation/EventThread.java
similarity index 100%
rename from src/main/java/com/threerings/presents/annotation/EventThread.java
rename to core/src/main/java/com/threerings/presents/annotation/EventThread.java
diff --git a/src/main/java/com/threerings/presents/annotation/MainInvoker.java b/core/src/main/java/com/threerings/presents/annotation/MainInvoker.java
similarity index 100%
rename from src/main/java/com/threerings/presents/annotation/MainInvoker.java
rename to core/src/main/java/com/threerings/presents/annotation/MainInvoker.java
diff --git a/src/main/java/com/threerings/presents/annotation/PeerInvoker.java b/core/src/main/java/com/threerings/presents/annotation/PeerInvoker.java
similarity index 100%
rename from src/main/java/com/threerings/presents/annotation/PeerInvoker.java
rename to core/src/main/java/com/threerings/presents/annotation/PeerInvoker.java
diff --git a/src/main/java/com/threerings/presents/annotation/TransportHint.java b/core/src/main/java/com/threerings/presents/annotation/TransportHint.java
similarity index 100%
rename from src/main/java/com/threerings/presents/annotation/TransportHint.java
rename to core/src/main/java/com/threerings/presents/annotation/TransportHint.java
diff --git a/src/main/java/com/threerings/presents/client/BasicDirector.java b/core/src/main/java/com/threerings/presents/client/BasicDirector.java
similarity index 100%
rename from src/main/java/com/threerings/presents/client/BasicDirector.java
rename to core/src/main/java/com/threerings/presents/client/BasicDirector.java
diff --git a/src/main/java/com/threerings/presents/client/BlockingCommunicator.java b/core/src/main/java/com/threerings/presents/client/BlockingCommunicator.java
similarity index 100%
rename from src/main/java/com/threerings/presents/client/BlockingCommunicator.java
rename to core/src/main/java/com/threerings/presents/client/BlockingCommunicator.java
diff --git a/src/main/java/com/threerings/presents/client/Client.java b/core/src/main/java/com/threerings/presents/client/Client.java
similarity index 100%
rename from src/main/java/com/threerings/presents/client/Client.java
rename to core/src/main/java/com/threerings/presents/client/Client.java
diff --git a/src/main/java/com/threerings/presents/client/ClientAdapter.java b/core/src/main/java/com/threerings/presents/client/ClientAdapter.java
similarity index 100%
rename from src/main/java/com/threerings/presents/client/ClientAdapter.java
rename to core/src/main/java/com/threerings/presents/client/ClientAdapter.java
diff --git a/src/main/java/com/threerings/presents/client/ClientCommunicator.java b/core/src/main/java/com/threerings/presents/client/ClientCommunicator.java
similarity index 100%
rename from src/main/java/com/threerings/presents/client/ClientCommunicator.java
rename to core/src/main/java/com/threerings/presents/client/ClientCommunicator.java
diff --git a/src/main/java/com/threerings/presents/client/ClientDObjectMgr.java b/core/src/main/java/com/threerings/presents/client/ClientDObjectMgr.java
similarity index 100%
rename from src/main/java/com/threerings/presents/client/ClientDObjectMgr.java
rename to core/src/main/java/com/threerings/presents/client/ClientDObjectMgr.java
diff --git a/src/main/java/com/threerings/presents/client/ClientObjectInputStream.java b/core/src/main/java/com/threerings/presents/client/ClientObjectInputStream.java
similarity index 100%
rename from src/main/java/com/threerings/presents/client/ClientObjectInputStream.java
rename to core/src/main/java/com/threerings/presents/client/ClientObjectInputStream.java
diff --git a/src/main/java/com/threerings/presents/client/ClientObserver.java b/core/src/main/java/com/threerings/presents/client/ClientObserver.java
similarity index 100%
rename from src/main/java/com/threerings/presents/client/ClientObserver.java
rename to core/src/main/java/com/threerings/presents/client/ClientObserver.java
diff --git a/src/main/java/com/threerings/presents/client/Communicator.java b/core/src/main/java/com/threerings/presents/client/Communicator.java
similarity index 100%
rename from src/main/java/com/threerings/presents/client/Communicator.java
rename to core/src/main/java/com/threerings/presents/client/Communicator.java
diff --git a/src/main/java/com/threerings/presents/client/DeltaCalculator.java b/core/src/main/java/com/threerings/presents/client/DeltaCalculator.java
similarity index 100%
rename from src/main/java/com/threerings/presents/client/DeltaCalculator.java
rename to core/src/main/java/com/threerings/presents/client/DeltaCalculator.java
diff --git a/src/main/java/com/threerings/presents/client/InvocationDecoder.java b/core/src/main/java/com/threerings/presents/client/InvocationDecoder.java
similarity index 100%
rename from src/main/java/com/threerings/presents/client/InvocationDecoder.java
rename to core/src/main/java/com/threerings/presents/client/InvocationDecoder.java
diff --git a/src/main/java/com/threerings/presents/client/InvocationDirector.java b/core/src/main/java/com/threerings/presents/client/InvocationDirector.java
similarity index 100%
rename from src/main/java/com/threerings/presents/client/InvocationDirector.java
rename to core/src/main/java/com/threerings/presents/client/InvocationDirector.java
diff --git a/src/main/java/com/threerings/presents/client/InvocationReceiver.java b/core/src/main/java/com/threerings/presents/client/InvocationReceiver.java
similarity index 100%
rename from src/main/java/com/threerings/presents/client/InvocationReceiver.java
rename to core/src/main/java/com/threerings/presents/client/InvocationReceiver.java
diff --git a/src/main/java/com/threerings/presents/client/InvocationService.java b/core/src/main/java/com/threerings/presents/client/InvocationService.java
similarity index 100%
rename from src/main/java/com/threerings/presents/client/InvocationService.java
rename to core/src/main/java/com/threerings/presents/client/InvocationService.java
diff --git a/src/main/java/com/threerings/presents/client/LoggingListener.java b/core/src/main/java/com/threerings/presents/client/LoggingListener.java
similarity index 100%
rename from src/main/java/com/threerings/presents/client/LoggingListener.java
rename to core/src/main/java/com/threerings/presents/client/LoggingListener.java
diff --git a/src/main/java/com/threerings/presents/client/LogonException.java b/core/src/main/java/com/threerings/presents/client/LogonException.java
similarity index 100%
rename from src/main/java/com/threerings/presents/client/LogonException.java
rename to core/src/main/java/com/threerings/presents/client/LogonException.java
diff --git a/src/main/java/com/threerings/presents/client/MessageTracker.java b/core/src/main/java/com/threerings/presents/client/MessageTracker.java
similarity index 100%
rename from src/main/java/com/threerings/presents/client/MessageTracker.java
rename to core/src/main/java/com/threerings/presents/client/MessageTracker.java
diff --git a/src/main/java/com/threerings/presents/client/ObserverOps.java b/core/src/main/java/com/threerings/presents/client/ObserverOps.java
similarity index 100%
rename from src/main/java/com/threerings/presents/client/ObserverOps.java
rename to core/src/main/java/com/threerings/presents/client/ObserverOps.java
diff --git a/src/main/java/com/threerings/presents/client/PresentsPrefs.java b/core/src/main/java/com/threerings/presents/client/PresentsPrefs.java
similarity index 100%
rename from src/main/java/com/threerings/presents/client/PresentsPrefs.java
rename to core/src/main/java/com/threerings/presents/client/PresentsPrefs.java
diff --git a/src/main/java/com/threerings/presents/client/RegistrationService.java b/core/src/main/java/com/threerings/presents/client/RegistrationService.java
similarity index 100%
rename from src/main/java/com/threerings/presents/client/RegistrationService.java
rename to core/src/main/java/com/threerings/presents/client/RegistrationService.java
diff --git a/src/main/java/com/threerings/presents/client/SessionObserver.java b/core/src/main/java/com/threerings/presents/client/SessionObserver.java
similarity index 100%
rename from src/main/java/com/threerings/presents/client/SessionObserver.java
rename to core/src/main/java/com/threerings/presents/client/SessionObserver.java
diff --git a/src/main/java/com/threerings/presents/client/TimeBaseService.java b/core/src/main/java/com/threerings/presents/client/TimeBaseService.java
similarity index 100%
rename from src/main/java/com/threerings/presents/client/TimeBaseService.java
rename to core/src/main/java/com/threerings/presents/client/TimeBaseService.java
diff --git a/src/main/java/com/threerings/presents/data/AuthCodes.java b/core/src/main/java/com/threerings/presents/data/AuthCodes.java
similarity index 100%
rename from src/main/java/com/threerings/presents/data/AuthCodes.java
rename to core/src/main/java/com/threerings/presents/data/AuthCodes.java
diff --git a/src/main/java/com/threerings/presents/data/ClientObject.java b/core/src/main/java/com/threerings/presents/data/ClientObject.java
similarity index 100%
rename from src/main/java/com/threerings/presents/data/ClientObject.java
rename to core/src/main/java/com/threerings/presents/data/ClientObject.java
diff --git a/src/main/java/com/threerings/presents/data/InvocationCodes.java b/core/src/main/java/com/threerings/presents/data/InvocationCodes.java
similarity index 100%
rename from src/main/java/com/threerings/presents/data/InvocationCodes.java
rename to core/src/main/java/com/threerings/presents/data/InvocationCodes.java
diff --git a/src/main/java/com/threerings/presents/data/InvocationMarshaller.java b/core/src/main/java/com/threerings/presents/data/InvocationMarshaller.java
similarity index 100%
rename from src/main/java/com/threerings/presents/data/InvocationMarshaller.java
rename to core/src/main/java/com/threerings/presents/data/InvocationMarshaller.java
diff --git a/src/main/java/com/threerings/presents/data/InvocationObject.java b/core/src/main/java/com/threerings/presents/data/InvocationObject.java
similarity index 100%
rename from src/main/java/com/threerings/presents/data/InvocationObject.java
rename to core/src/main/java/com/threerings/presents/data/InvocationObject.java
diff --git a/src/main/java/com/threerings/presents/data/Permission.java b/core/src/main/java/com/threerings/presents/data/Permission.java
similarity index 100%
rename from src/main/java/com/threerings/presents/data/Permission.java
rename to core/src/main/java/com/threerings/presents/data/Permission.java
diff --git a/src/main/java/com/threerings/presents/data/PresentsConMgrStats.java b/core/src/main/java/com/threerings/presents/data/PresentsConMgrStats.java
similarity index 100%
rename from src/main/java/com/threerings/presents/data/PresentsConMgrStats.java
rename to core/src/main/java/com/threerings/presents/data/PresentsConMgrStats.java
diff --git a/src/main/java/com/threerings/presents/data/RegistrationMarshaller.java b/core/src/main/java/com/threerings/presents/data/RegistrationMarshaller.java
similarity index 100%
rename from src/main/java/com/threerings/presents/data/RegistrationMarshaller.java
rename to core/src/main/java/com/threerings/presents/data/RegistrationMarshaller.java
diff --git a/src/main/java/com/threerings/presents/data/TimeBaseCodes.java b/core/src/main/java/com/threerings/presents/data/TimeBaseCodes.java
similarity index 100%
rename from src/main/java/com/threerings/presents/data/TimeBaseCodes.java
rename to core/src/main/java/com/threerings/presents/data/TimeBaseCodes.java
diff --git a/src/main/java/com/threerings/presents/data/TimeBaseMarshaller.java b/core/src/main/java/com/threerings/presents/data/TimeBaseMarshaller.java
similarity index 100%
rename from src/main/java/com/threerings/presents/data/TimeBaseMarshaller.java
rename to core/src/main/java/com/threerings/presents/data/TimeBaseMarshaller.java
diff --git a/src/main/java/com/threerings/presents/data/TimeBaseObject.java b/core/src/main/java/com/threerings/presents/data/TimeBaseObject.java
similarity index 100%
rename from src/main/java/com/threerings/presents/data/TimeBaseObject.java
rename to core/src/main/java/com/threerings/presents/data/TimeBaseObject.java
diff --git a/src/main/java/com/threerings/presents/dobj/AccessController.java b/core/src/main/java/com/threerings/presents/dobj/AccessController.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/AccessController.java
rename to core/src/main/java/com/threerings/presents/dobj/AccessController.java
diff --git a/src/main/java/com/threerings/presents/dobj/Accessor.java b/core/src/main/java/com/threerings/presents/dobj/Accessor.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/Accessor.java
rename to core/src/main/java/com/threerings/presents/dobj/Accessor.java
diff --git a/src/main/java/com/threerings/presents/dobj/AttributeChangeListener.java b/core/src/main/java/com/threerings/presents/dobj/AttributeChangeListener.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/AttributeChangeListener.java
rename to core/src/main/java/com/threerings/presents/dobj/AttributeChangeListener.java
diff --git a/src/main/java/com/threerings/presents/dobj/AttributeChangedEvent.java b/core/src/main/java/com/threerings/presents/dobj/AttributeChangedEvent.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/AttributeChangedEvent.java
rename to core/src/main/java/com/threerings/presents/dobj/AttributeChangedEvent.java
diff --git a/src/main/java/com/threerings/presents/dobj/ChangeListener.java b/core/src/main/java/com/threerings/presents/dobj/ChangeListener.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/ChangeListener.java
rename to core/src/main/java/com/threerings/presents/dobj/ChangeListener.java
diff --git a/src/main/java/com/threerings/presents/dobj/CompoundEvent.java b/core/src/main/java/com/threerings/presents/dobj/CompoundEvent.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/CompoundEvent.java
rename to core/src/main/java/com/threerings/presents/dobj/CompoundEvent.java
diff --git a/src/main/java/com/threerings/presents/dobj/DEvent.java b/core/src/main/java/com/threerings/presents/dobj/DEvent.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/DEvent.java
rename to core/src/main/java/com/threerings/presents/dobj/DEvent.java
diff --git a/src/main/java/com/threerings/presents/dobj/DObject.java b/core/src/main/java/com/threerings/presents/dobj/DObject.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/DObject.java
rename to core/src/main/java/com/threerings/presents/dobj/DObject.java
diff --git a/src/main/java/com/threerings/presents/dobj/DObjectManager.java b/core/src/main/java/com/threerings/presents/dobj/DObjectManager.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/DObjectManager.java
rename to core/src/main/java/com/threerings/presents/dobj/DObjectManager.java
diff --git a/src/main/java/com/threerings/presents/dobj/DSet.java b/core/src/main/java/com/threerings/presents/dobj/DSet.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/DSet.java
rename to core/src/main/java/com/threerings/presents/dobj/DSet.java
diff --git a/src/main/java/com/threerings/presents/dobj/DynamicListener.java b/core/src/main/java/com/threerings/presents/dobj/DynamicListener.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/DynamicListener.java
rename to core/src/main/java/com/threerings/presents/dobj/DynamicListener.java
diff --git a/src/main/java/com/threerings/presents/dobj/ElementUpdateListener.java b/core/src/main/java/com/threerings/presents/dobj/ElementUpdateListener.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/ElementUpdateListener.java
rename to core/src/main/java/com/threerings/presents/dobj/ElementUpdateListener.java
diff --git a/src/main/java/com/threerings/presents/dobj/ElementUpdatedEvent.java b/core/src/main/java/com/threerings/presents/dobj/ElementUpdatedEvent.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/ElementUpdatedEvent.java
rename to core/src/main/java/com/threerings/presents/dobj/ElementUpdatedEvent.java
diff --git a/src/main/java/com/threerings/presents/dobj/EntryAddedEvent.java b/core/src/main/java/com/threerings/presents/dobj/EntryAddedEvent.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/EntryAddedEvent.java
rename to core/src/main/java/com/threerings/presents/dobj/EntryAddedEvent.java
diff --git a/src/main/java/com/threerings/presents/dobj/EntryEvent.java b/core/src/main/java/com/threerings/presents/dobj/EntryEvent.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/EntryEvent.java
rename to core/src/main/java/com/threerings/presents/dobj/EntryEvent.java
diff --git a/src/main/java/com/threerings/presents/dobj/EntryRemovedEvent.java b/core/src/main/java/com/threerings/presents/dobj/EntryRemovedEvent.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/EntryRemovedEvent.java
rename to core/src/main/java/com/threerings/presents/dobj/EntryRemovedEvent.java
diff --git a/src/main/java/com/threerings/presents/dobj/EntryUpdatedEvent.java b/core/src/main/java/com/threerings/presents/dobj/EntryUpdatedEvent.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/EntryUpdatedEvent.java
rename to core/src/main/java/com/threerings/presents/dobj/EntryUpdatedEvent.java
diff --git a/src/main/java/com/threerings/presents/dobj/EventListener.java b/core/src/main/java/com/threerings/presents/dobj/EventListener.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/EventListener.java
rename to core/src/main/java/com/threerings/presents/dobj/EventListener.java
diff --git a/src/main/java/com/threerings/presents/dobj/InvocationNotificationEvent.java b/core/src/main/java/com/threerings/presents/dobj/InvocationNotificationEvent.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/InvocationNotificationEvent.java
rename to core/src/main/java/com/threerings/presents/dobj/InvocationNotificationEvent.java
diff --git a/src/main/java/com/threerings/presents/dobj/InvocationRequestEvent.java b/core/src/main/java/com/threerings/presents/dobj/InvocationRequestEvent.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/InvocationRequestEvent.java
rename to core/src/main/java/com/threerings/presents/dobj/InvocationRequestEvent.java
diff --git a/src/main/java/com/threerings/presents/dobj/InvocationResponseEvent.java b/core/src/main/java/com/threerings/presents/dobj/InvocationResponseEvent.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/InvocationResponseEvent.java
rename to core/src/main/java/com/threerings/presents/dobj/InvocationResponseEvent.java
diff --git a/src/main/java/com/threerings/presents/dobj/MessageEvent.java b/core/src/main/java/com/threerings/presents/dobj/MessageEvent.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/MessageEvent.java
rename to core/src/main/java/com/threerings/presents/dobj/MessageEvent.java
diff --git a/src/main/java/com/threerings/presents/dobj/MessageListener.java b/core/src/main/java/com/threerings/presents/dobj/MessageListener.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/MessageListener.java
rename to core/src/main/java/com/threerings/presents/dobj/MessageListener.java
diff --git a/src/main/java/com/threerings/presents/dobj/NamedAttributeListener.java b/core/src/main/java/com/threerings/presents/dobj/NamedAttributeListener.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/NamedAttributeListener.java
rename to core/src/main/java/com/threerings/presents/dobj/NamedAttributeListener.java
diff --git a/src/main/java/com/threerings/presents/dobj/NamedElementUpdateListener.java b/core/src/main/java/com/threerings/presents/dobj/NamedElementUpdateListener.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/NamedElementUpdateListener.java
rename to core/src/main/java/com/threerings/presents/dobj/NamedElementUpdateListener.java
diff --git a/src/main/java/com/threerings/presents/dobj/NamedEvent.java b/core/src/main/java/com/threerings/presents/dobj/NamedEvent.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/NamedEvent.java
rename to core/src/main/java/com/threerings/presents/dobj/NamedEvent.java
diff --git a/src/main/java/com/threerings/presents/dobj/NamedSetAdapter.java b/core/src/main/java/com/threerings/presents/dobj/NamedSetAdapter.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/NamedSetAdapter.java
rename to core/src/main/java/com/threerings/presents/dobj/NamedSetAdapter.java
diff --git a/src/main/java/com/threerings/presents/dobj/NoSuchObjectException.java b/core/src/main/java/com/threerings/presents/dobj/NoSuchObjectException.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/NoSuchObjectException.java
rename to core/src/main/java/com/threerings/presents/dobj/NoSuchObjectException.java
diff --git a/src/main/java/com/threerings/presents/dobj/ObjectAccessException.java b/core/src/main/java/com/threerings/presents/dobj/ObjectAccessException.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/ObjectAccessException.java
rename to core/src/main/java/com/threerings/presents/dobj/ObjectAccessException.java
diff --git a/src/main/java/com/threerings/presents/dobj/ObjectAddedEvent.java b/core/src/main/java/com/threerings/presents/dobj/ObjectAddedEvent.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/ObjectAddedEvent.java
rename to core/src/main/java/com/threerings/presents/dobj/ObjectAddedEvent.java
diff --git a/src/main/java/com/threerings/presents/dobj/ObjectDeathListener.java b/core/src/main/java/com/threerings/presents/dobj/ObjectDeathListener.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/ObjectDeathListener.java
rename to core/src/main/java/com/threerings/presents/dobj/ObjectDeathListener.java
diff --git a/src/main/java/com/threerings/presents/dobj/ObjectDestroyedEvent.java b/core/src/main/java/com/threerings/presents/dobj/ObjectDestroyedEvent.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/ObjectDestroyedEvent.java
rename to core/src/main/java/com/threerings/presents/dobj/ObjectDestroyedEvent.java
diff --git a/src/main/java/com/threerings/presents/dobj/ObjectRemovedEvent.java b/core/src/main/java/com/threerings/presents/dobj/ObjectRemovedEvent.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/ObjectRemovedEvent.java
rename to core/src/main/java/com/threerings/presents/dobj/ObjectRemovedEvent.java
diff --git a/src/main/java/com/threerings/presents/dobj/OidList.java b/core/src/main/java/com/threerings/presents/dobj/OidList.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/OidList.java
rename to core/src/main/java/com/threerings/presents/dobj/OidList.java
diff --git a/src/main/java/com/threerings/presents/dobj/OidListListener.java b/core/src/main/java/com/threerings/presents/dobj/OidListListener.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/OidListListener.java
rename to core/src/main/java/com/threerings/presents/dobj/OidListListener.java
diff --git a/src/main/java/com/threerings/presents/dobj/ProxySubscriber.java b/core/src/main/java/com/threerings/presents/dobj/ProxySubscriber.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/ProxySubscriber.java
rename to core/src/main/java/com/threerings/presents/dobj/ProxySubscriber.java
diff --git a/src/main/java/com/threerings/presents/dobj/ReleaseLockEvent.java b/core/src/main/java/com/threerings/presents/dobj/ReleaseLockEvent.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/ReleaseLockEvent.java
rename to core/src/main/java/com/threerings/presents/dobj/ReleaseLockEvent.java
diff --git a/src/main/java/com/threerings/presents/dobj/RootDObjectManager.java b/core/src/main/java/com/threerings/presents/dobj/RootDObjectManager.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/RootDObjectManager.java
rename to core/src/main/java/com/threerings/presents/dobj/RootDObjectManager.java
diff --git a/src/main/java/com/threerings/presents/dobj/ServerMessageEvent.java b/core/src/main/java/com/threerings/presents/dobj/ServerMessageEvent.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/ServerMessageEvent.java
rename to core/src/main/java/com/threerings/presents/dobj/ServerMessageEvent.java
diff --git a/src/main/java/com/threerings/presents/dobj/SetAdapter.java b/core/src/main/java/com/threerings/presents/dobj/SetAdapter.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/SetAdapter.java
rename to core/src/main/java/com/threerings/presents/dobj/SetAdapter.java
diff --git a/src/main/java/com/threerings/presents/dobj/SetListener.java b/core/src/main/java/com/threerings/presents/dobj/SetListener.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/SetListener.java
rename to core/src/main/java/com/threerings/presents/dobj/SetListener.java
diff --git a/src/main/java/com/threerings/presents/dobj/SimpleEntry.java b/core/src/main/java/com/threerings/presents/dobj/SimpleEntry.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/SimpleEntry.java
rename to core/src/main/java/com/threerings/presents/dobj/SimpleEntry.java
diff --git a/src/main/java/com/threerings/presents/dobj/Subscriber.java b/core/src/main/java/com/threerings/presents/dobj/Subscriber.java
similarity index 100%
rename from src/main/java/com/threerings/presents/dobj/Subscriber.java
rename to core/src/main/java/com/threerings/presents/dobj/Subscriber.java
diff --git a/src/main/java/com/threerings/presents/net/AESAuthRequest.java b/core/src/main/java/com/threerings/presents/net/AESAuthRequest.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/AESAuthRequest.java
rename to core/src/main/java/com/threerings/presents/net/AESAuthRequest.java
diff --git a/src/main/java/com/threerings/presents/net/AuthRequest.java b/core/src/main/java/com/threerings/presents/net/AuthRequest.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/AuthRequest.java
rename to core/src/main/java/com/threerings/presents/net/AuthRequest.java
diff --git a/src/main/java/com/threerings/presents/net/AuthResponse.java b/core/src/main/java/com/threerings/presents/net/AuthResponse.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/AuthResponse.java
rename to core/src/main/java/com/threerings/presents/net/AuthResponse.java
diff --git a/src/main/java/com/threerings/presents/net/AuthResponseData.java b/core/src/main/java/com/threerings/presents/net/AuthResponseData.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/AuthResponseData.java
rename to core/src/main/java/com/threerings/presents/net/AuthResponseData.java
diff --git a/src/main/java/com/threerings/presents/net/BootstrapData.java b/core/src/main/java/com/threerings/presents/net/BootstrapData.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/BootstrapData.java
rename to core/src/main/java/com/threerings/presents/net/BootstrapData.java
diff --git a/src/main/java/com/threerings/presents/net/BootstrapNotification.java b/core/src/main/java/com/threerings/presents/net/BootstrapNotification.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/BootstrapNotification.java
rename to core/src/main/java/com/threerings/presents/net/BootstrapNotification.java
diff --git a/src/main/java/com/threerings/presents/net/CompoundDownstreamMessage.java b/core/src/main/java/com/threerings/presents/net/CompoundDownstreamMessage.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/CompoundDownstreamMessage.java
rename to core/src/main/java/com/threerings/presents/net/CompoundDownstreamMessage.java
diff --git a/src/main/java/com/threerings/presents/net/CompoundUpstreamMessage.java b/core/src/main/java/com/threerings/presents/net/CompoundUpstreamMessage.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/CompoundUpstreamMessage.java
rename to core/src/main/java/com/threerings/presents/net/CompoundUpstreamMessage.java
diff --git a/src/main/java/com/threerings/presents/net/Credentials.java b/core/src/main/java/com/threerings/presents/net/Credentials.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/Credentials.java
rename to core/src/main/java/com/threerings/presents/net/Credentials.java
diff --git a/src/main/java/com/threerings/presents/net/DownstreamMessage.java b/core/src/main/java/com/threerings/presents/net/DownstreamMessage.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/DownstreamMessage.java
rename to core/src/main/java/com/threerings/presents/net/DownstreamMessage.java
diff --git a/src/main/java/com/threerings/presents/net/EventNotification.java b/core/src/main/java/com/threerings/presents/net/EventNotification.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/EventNotification.java
rename to core/src/main/java/com/threerings/presents/net/EventNotification.java
diff --git a/src/main/java/com/threerings/presents/net/FailureResponse.java b/core/src/main/java/com/threerings/presents/net/FailureResponse.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/FailureResponse.java
rename to core/src/main/java/com/threerings/presents/net/FailureResponse.java
diff --git a/src/main/java/com/threerings/presents/net/ForwardEventRequest.java b/core/src/main/java/com/threerings/presents/net/ForwardEventRequest.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/ForwardEventRequest.java
rename to core/src/main/java/com/threerings/presents/net/ForwardEventRequest.java
diff --git a/src/main/java/com/threerings/presents/net/LogoffRequest.java b/core/src/main/java/com/threerings/presents/net/LogoffRequest.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/LogoffRequest.java
rename to core/src/main/java/com/threerings/presents/net/LogoffRequest.java
diff --git a/src/main/java/com/threerings/presents/net/Message.java b/core/src/main/java/com/threerings/presents/net/Message.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/Message.java
rename to core/src/main/java/com/threerings/presents/net/Message.java
diff --git a/src/main/java/com/threerings/presents/net/ObjectResponse.java b/core/src/main/java/com/threerings/presents/net/ObjectResponse.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/ObjectResponse.java
rename to core/src/main/java/com/threerings/presents/net/ObjectResponse.java
diff --git a/src/main/java/com/threerings/presents/net/PingRequest.java b/core/src/main/java/com/threerings/presents/net/PingRequest.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/PingRequest.java
rename to core/src/main/java/com/threerings/presents/net/PingRequest.java
diff --git a/src/main/java/com/threerings/presents/net/PongResponse.java b/core/src/main/java/com/threerings/presents/net/PongResponse.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/PongResponse.java
rename to core/src/main/java/com/threerings/presents/net/PongResponse.java
diff --git a/src/main/java/com/threerings/presents/net/PublicKeyCredentials.java b/core/src/main/java/com/threerings/presents/net/PublicKeyCredentials.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/PublicKeyCredentials.java
rename to core/src/main/java/com/threerings/presents/net/PublicKeyCredentials.java
diff --git a/src/main/java/com/threerings/presents/net/SecureRequest.java b/core/src/main/java/com/threerings/presents/net/SecureRequest.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/SecureRequest.java
rename to core/src/main/java/com/threerings/presents/net/SecureRequest.java
diff --git a/src/main/java/com/threerings/presents/net/SecureResponse.java b/core/src/main/java/com/threerings/presents/net/SecureResponse.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/SecureResponse.java
rename to core/src/main/java/com/threerings/presents/net/SecureResponse.java
diff --git a/src/main/java/com/threerings/presents/net/ServiceCreds.java b/core/src/main/java/com/threerings/presents/net/ServiceCreds.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/ServiceCreds.java
rename to core/src/main/java/com/threerings/presents/net/ServiceCreds.java
diff --git a/src/main/java/com/threerings/presents/net/SubscribeRequest.java b/core/src/main/java/com/threerings/presents/net/SubscribeRequest.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/SubscribeRequest.java
rename to core/src/main/java/com/threerings/presents/net/SubscribeRequest.java
diff --git a/src/main/java/com/threerings/presents/net/ThrottleUpdatedMessage.java b/core/src/main/java/com/threerings/presents/net/ThrottleUpdatedMessage.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/ThrottleUpdatedMessage.java
rename to core/src/main/java/com/threerings/presents/net/ThrottleUpdatedMessage.java
diff --git a/src/main/java/com/threerings/presents/net/TransmitDatagramsRequest.java b/core/src/main/java/com/threerings/presents/net/TransmitDatagramsRequest.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/TransmitDatagramsRequest.java
rename to core/src/main/java/com/threerings/presents/net/TransmitDatagramsRequest.java
diff --git a/src/main/java/com/threerings/presents/net/Transport.java b/core/src/main/java/com/threerings/presents/net/Transport.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/Transport.java
rename to core/src/main/java/com/threerings/presents/net/Transport.java
diff --git a/src/main/java/com/threerings/presents/net/UnsubscribeRequest.java b/core/src/main/java/com/threerings/presents/net/UnsubscribeRequest.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/UnsubscribeRequest.java
rename to core/src/main/java/com/threerings/presents/net/UnsubscribeRequest.java
diff --git a/src/main/java/com/threerings/presents/net/UnsubscribeResponse.java b/core/src/main/java/com/threerings/presents/net/UnsubscribeResponse.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/UnsubscribeResponse.java
rename to core/src/main/java/com/threerings/presents/net/UnsubscribeResponse.java
diff --git a/src/main/java/com/threerings/presents/net/UpdateThrottleMessage.java b/core/src/main/java/com/threerings/presents/net/UpdateThrottleMessage.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/UpdateThrottleMessage.java
rename to core/src/main/java/com/threerings/presents/net/UpdateThrottleMessage.java
diff --git a/src/main/java/com/threerings/presents/net/UpstreamMessage.java b/core/src/main/java/com/threerings/presents/net/UpstreamMessage.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/UpstreamMessage.java
rename to core/src/main/java/com/threerings/presents/net/UpstreamMessage.java
diff --git a/src/main/java/com/threerings/presents/net/UsernamePasswordCreds.java b/core/src/main/java/com/threerings/presents/net/UsernamePasswordCreds.java
similarity index 100%
rename from src/main/java/com/threerings/presents/net/UsernamePasswordCreds.java
rename to core/src/main/java/com/threerings/presents/net/UsernamePasswordCreds.java
diff --git a/src/main/java/com/threerings/presents/package.html b/core/src/main/java/com/threerings/presents/package.html
similarity index 100%
rename from src/main/java/com/threerings/presents/package.html
rename to core/src/main/java/com/threerings/presents/package.html
diff --git a/src/main/java/com/threerings/presents/peer/client/PeerService.java b/core/src/main/java/com/threerings/presents/peer/client/PeerService.java
similarity index 100%
rename from src/main/java/com/threerings/presents/peer/client/PeerService.java
rename to core/src/main/java/com/threerings/presents/peer/client/PeerService.java
diff --git a/src/main/java/com/threerings/presents/peer/data/ClientInfo.java b/core/src/main/java/com/threerings/presents/peer/data/ClientInfo.java
similarity index 100%
rename from src/main/java/com/threerings/presents/peer/data/ClientInfo.java
rename to core/src/main/java/com/threerings/presents/peer/data/ClientInfo.java
diff --git a/src/main/java/com/threerings/presents/peer/data/DObjectAddress.java b/core/src/main/java/com/threerings/presents/peer/data/DObjectAddress.java
similarity index 100%
rename from src/main/java/com/threerings/presents/peer/data/DObjectAddress.java
rename to core/src/main/java/com/threerings/presents/peer/data/DObjectAddress.java
diff --git a/src/main/java/com/threerings/presents/peer/data/NodeObject.java b/core/src/main/java/com/threerings/presents/peer/data/NodeObject.java
similarity index 100%
rename from src/main/java/com/threerings/presents/peer/data/NodeObject.java
rename to core/src/main/java/com/threerings/presents/peer/data/NodeObject.java
diff --git a/src/main/java/com/threerings/presents/peer/data/PeerAuthName.java b/core/src/main/java/com/threerings/presents/peer/data/PeerAuthName.java
similarity index 100%
rename from src/main/java/com/threerings/presents/peer/data/PeerAuthName.java
rename to core/src/main/java/com/threerings/presents/peer/data/PeerAuthName.java
diff --git a/src/main/java/com/threerings/presents/peer/data/PeerMarshaller.java b/core/src/main/java/com/threerings/presents/peer/data/PeerMarshaller.java
similarity index 100%
rename from src/main/java/com/threerings/presents/peer/data/PeerMarshaller.java
rename to core/src/main/java/com/threerings/presents/peer/data/PeerMarshaller.java
diff --git a/src/main/java/com/threerings/presents/peer/net/PeerBootstrapData.java b/core/src/main/java/com/threerings/presents/peer/net/PeerBootstrapData.java
similarity index 100%
rename from src/main/java/com/threerings/presents/peer/net/PeerBootstrapData.java
rename to core/src/main/java/com/threerings/presents/peer/net/PeerBootstrapData.java
diff --git a/src/main/java/com/threerings/presents/peer/net/PeerCreds.java b/core/src/main/java/com/threerings/presents/peer/net/PeerCreds.java
similarity index 100%
rename from src/main/java/com/threerings/presents/peer/net/PeerCreds.java
rename to core/src/main/java/com/threerings/presents/peer/net/PeerCreds.java
diff --git a/src/main/java/com/threerings/presents/peer/server/EHCachePeerCoordinator.java b/core/src/main/java/com/threerings/presents/peer/server/EHCachePeerCoordinator.java
similarity index 100%
rename from src/main/java/com/threerings/presents/peer/server/EHCachePeerCoordinator.java
rename to core/src/main/java/com/threerings/presents/peer/server/EHCachePeerCoordinator.java
diff --git a/src/main/java/com/threerings/presents/peer/server/NodeRequestsListener.java b/core/src/main/java/com/threerings/presents/peer/server/NodeRequestsListener.java
similarity index 100%
rename from src/main/java/com/threerings/presents/peer/server/NodeRequestsListener.java
rename to core/src/main/java/com/threerings/presents/peer/server/NodeRequestsListener.java
diff --git a/src/main/java/com/threerings/presents/peer/server/PeerClientResolver.java b/core/src/main/java/com/threerings/presents/peer/server/PeerClientResolver.java
similarity index 100%
rename from src/main/java/com/threerings/presents/peer/server/PeerClientResolver.java
rename to core/src/main/java/com/threerings/presents/peer/server/PeerClientResolver.java
diff --git a/src/main/java/com/threerings/presents/peer/server/PeerManager.java b/core/src/main/java/com/threerings/presents/peer/server/PeerManager.java
similarity index 100%
rename from src/main/java/com/threerings/presents/peer/server/PeerManager.java
rename to core/src/main/java/com/threerings/presents/peer/server/PeerManager.java
diff --git a/src/main/java/com/threerings/presents/peer/server/PeerNode.java b/core/src/main/java/com/threerings/presents/peer/server/PeerNode.java
similarity index 100%
rename from src/main/java/com/threerings/presents/peer/server/PeerNode.java
rename to core/src/main/java/com/threerings/presents/peer/server/PeerNode.java
diff --git a/src/main/java/com/threerings/presents/peer/server/PeerProvider.java b/core/src/main/java/com/threerings/presents/peer/server/PeerProvider.java
similarity index 100%
rename from src/main/java/com/threerings/presents/peer/server/PeerProvider.java
rename to core/src/main/java/com/threerings/presents/peer/server/PeerProvider.java
diff --git a/src/main/java/com/threerings/presents/peer/server/PeerSession.java b/core/src/main/java/com/threerings/presents/peer/server/PeerSession.java
similarity index 100%
rename from src/main/java/com/threerings/presents/peer/server/PeerSession.java
rename to core/src/main/java/com/threerings/presents/peer/server/PeerSession.java
diff --git a/src/main/java/com/threerings/presents/peer/server/persist/NodeRecord.java b/core/src/main/java/com/threerings/presents/peer/server/persist/NodeRecord.java
similarity index 100%
rename from src/main/java/com/threerings/presents/peer/server/persist/NodeRecord.java
rename to core/src/main/java/com/threerings/presents/peer/server/persist/NodeRecord.java
diff --git a/src/main/java/com/threerings/presents/peer/server/persist/NodeRepository.java b/core/src/main/java/com/threerings/presents/peer/server/persist/NodeRepository.java
similarity index 100%
rename from src/main/java/com/threerings/presents/peer/server/persist/NodeRepository.java
rename to core/src/main/java/com/threerings/presents/peer/server/persist/NodeRepository.java
diff --git a/src/main/java/com/threerings/presents/peer/util/PeerUtil.java b/core/src/main/java/com/threerings/presents/peer/util/PeerUtil.java
similarity index 100%
rename from src/main/java/com/threerings/presents/peer/util/PeerUtil.java
rename to core/src/main/java/com/threerings/presents/peer/util/PeerUtil.java
diff --git a/src/main/java/com/threerings/presents/server/AbstractSignalHandler.java b/core/src/main/java/com/threerings/presents/server/AbstractSignalHandler.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/AbstractSignalHandler.java
rename to core/src/main/java/com/threerings/presents/server/AbstractSignalHandler.java
diff --git a/src/main/java/com/threerings/presents/server/Authenticator.java b/core/src/main/java/com/threerings/presents/server/Authenticator.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/Authenticator.java
rename to core/src/main/java/com/threerings/presents/server/Authenticator.java
diff --git a/src/main/java/com/threerings/presents/server/ChainedAuthenticator.java b/core/src/main/java/com/threerings/presents/server/ChainedAuthenticator.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/ChainedAuthenticator.java
rename to core/src/main/java/com/threerings/presents/server/ChainedAuthenticator.java
diff --git a/src/main/java/com/threerings/presents/server/ClientLocal.java b/core/src/main/java/com/threerings/presents/server/ClientLocal.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/ClientLocal.java
rename to core/src/main/java/com/threerings/presents/server/ClientLocal.java
diff --git a/src/main/java/com/threerings/presents/server/ClientManager.java b/core/src/main/java/com/threerings/presents/server/ClientManager.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/ClientManager.java
rename to core/src/main/java/com/threerings/presents/server/ClientManager.java
diff --git a/src/main/java/com/threerings/presents/server/ClientResolutionListener.java b/core/src/main/java/com/threerings/presents/server/ClientResolutionListener.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/ClientResolutionListener.java
rename to core/src/main/java/com/threerings/presents/server/ClientResolutionListener.java
diff --git a/src/main/java/com/threerings/presents/server/ClientResolver.java b/core/src/main/java/com/threerings/presents/server/ClientResolver.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/ClientResolver.java
rename to core/src/main/java/com/threerings/presents/server/ClientResolver.java
diff --git a/src/main/java/com/threerings/presents/server/DummyAuthenticator.java b/core/src/main/java/com/threerings/presents/server/DummyAuthenticator.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/DummyAuthenticator.java
rename to core/src/main/java/com/threerings/presents/server/DummyAuthenticator.java
diff --git a/src/main/java/com/threerings/presents/server/InvocationDispatcher.java b/core/src/main/java/com/threerings/presents/server/InvocationDispatcher.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/InvocationDispatcher.java
rename to core/src/main/java/com/threerings/presents/server/InvocationDispatcher.java
diff --git a/src/main/java/com/threerings/presents/server/InvocationException.java b/core/src/main/java/com/threerings/presents/server/InvocationException.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/InvocationException.java
rename to core/src/main/java/com/threerings/presents/server/InvocationException.java
diff --git a/src/main/java/com/threerings/presents/server/InvocationManager.java b/core/src/main/java/com/threerings/presents/server/InvocationManager.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/InvocationManager.java
rename to core/src/main/java/com/threerings/presents/server/InvocationManager.java
diff --git a/src/main/java/com/threerings/presents/server/InvocationProvider.java b/core/src/main/java/com/threerings/presents/server/InvocationProvider.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/InvocationProvider.java
rename to core/src/main/java/com/threerings/presents/server/InvocationProvider.java
diff --git a/src/main/java/com/threerings/presents/server/InvocationSender.java b/core/src/main/java/com/threerings/presents/server/InvocationSender.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/InvocationSender.java
rename to core/src/main/java/com/threerings/presents/server/InvocationSender.java
diff --git a/src/main/java/com/threerings/presents/server/LocalDObjectMgr.java b/core/src/main/java/com/threerings/presents/server/LocalDObjectMgr.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/LocalDObjectMgr.java
rename to core/src/main/java/com/threerings/presents/server/LocalDObjectMgr.java
diff --git a/src/main/java/com/threerings/presents/server/PresentsAuthInvoker.java b/core/src/main/java/com/threerings/presents/server/PresentsAuthInvoker.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/PresentsAuthInvoker.java
rename to core/src/main/java/com/threerings/presents/server/PresentsAuthInvoker.java
diff --git a/src/main/java/com/threerings/presents/server/PresentsDObjectMgr.java b/core/src/main/java/com/threerings/presents/server/PresentsDObjectMgr.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/PresentsDObjectMgr.java
rename to core/src/main/java/com/threerings/presents/server/PresentsDObjectMgr.java
diff --git a/src/main/java/com/threerings/presents/server/PresentsInvoker.java b/core/src/main/java/com/threerings/presents/server/PresentsInvoker.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/PresentsInvoker.java
rename to core/src/main/java/com/threerings/presents/server/PresentsInvoker.java
diff --git a/src/main/java/com/threerings/presents/server/PresentsObjectAccess.java b/core/src/main/java/com/threerings/presents/server/PresentsObjectAccess.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/PresentsObjectAccess.java
rename to core/src/main/java/com/threerings/presents/server/PresentsObjectAccess.java
diff --git a/src/main/java/com/threerings/presents/server/PresentsServer.java b/core/src/main/java/com/threerings/presents/server/PresentsServer.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/PresentsServer.java
rename to core/src/main/java/com/threerings/presents/server/PresentsServer.java
diff --git a/src/main/java/com/threerings/presents/server/PresentsSession.java b/core/src/main/java/com/threerings/presents/server/PresentsSession.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/PresentsSession.java
rename to core/src/main/java/com/threerings/presents/server/PresentsSession.java
diff --git a/src/main/java/com/threerings/presents/server/RebootManager.java b/core/src/main/java/com/threerings/presents/server/RebootManager.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/RebootManager.java
rename to core/src/main/java/com/threerings/presents/server/RebootManager.java
diff --git a/src/main/java/com/threerings/presents/server/RegistrationManager.java b/core/src/main/java/com/threerings/presents/server/RegistrationManager.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/RegistrationManager.java
rename to core/src/main/java/com/threerings/presents/server/RegistrationManager.java
diff --git a/src/main/java/com/threerings/presents/server/RegistrationProvider.java b/core/src/main/java/com/threerings/presents/server/RegistrationProvider.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/RegistrationProvider.java
rename to core/src/main/java/com/threerings/presents/server/RegistrationProvider.java
diff --git a/src/main/java/com/threerings/presents/server/Rejector.java b/core/src/main/java/com/threerings/presents/server/Rejector.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/Rejector.java
rename to core/src/main/java/com/threerings/presents/server/Rejector.java
diff --git a/src/main/java/com/threerings/presents/server/ReportManager.java b/core/src/main/java/com/threerings/presents/server/ReportManager.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/ReportManager.java
rename to core/src/main/java/com/threerings/presents/server/ReportManager.java
diff --git a/src/main/java/com/threerings/presents/server/ReportingInvoker.java b/core/src/main/java/com/threerings/presents/server/ReportingInvoker.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/ReportingInvoker.java
rename to core/src/main/java/com/threerings/presents/server/ReportingInvoker.java
diff --git a/src/main/java/com/threerings/presents/server/ServiceAuthenticator.java b/core/src/main/java/com/threerings/presents/server/ServiceAuthenticator.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/ServiceAuthenticator.java
rename to core/src/main/java/com/threerings/presents/server/ServiceAuthenticator.java
diff --git a/src/main/java/com/threerings/presents/server/SessionFactory.java b/core/src/main/java/com/threerings/presents/server/SessionFactory.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/SessionFactory.java
rename to core/src/main/java/com/threerings/presents/server/SessionFactory.java
diff --git a/src/main/java/com/threerings/presents/server/ShutdownManager.java b/core/src/main/java/com/threerings/presents/server/ShutdownManager.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/ShutdownManager.java
rename to core/src/main/java/com/threerings/presents/server/ShutdownManager.java
diff --git a/src/main/java/com/threerings/presents/server/SignalReceiver.java b/core/src/main/java/com/threerings/presents/server/SignalReceiver.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/SignalReceiver.java
rename to core/src/main/java/com/threerings/presents/server/SignalReceiver.java
diff --git a/src/main/java/com/threerings/presents/server/SunSignalHandler.java b/core/src/main/java/com/threerings/presents/server/SunSignalHandler.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/SunSignalHandler.java
rename to core/src/main/java/com/threerings/presents/server/SunSignalHandler.java
diff --git a/src/main/java/com/threerings/presents/server/TimeBaseProvider.java b/core/src/main/java/com/threerings/presents/server/TimeBaseProvider.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/TimeBaseProvider.java
rename to core/src/main/java/com/threerings/presents/server/TimeBaseProvider.java
diff --git a/src/main/java/com/threerings/presents/server/net/AuthingConnection.java b/core/src/main/java/com/threerings/presents/server/net/AuthingConnection.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/net/AuthingConnection.java
rename to core/src/main/java/com/threerings/presents/server/net/AuthingConnection.java
diff --git a/src/main/java/com/threerings/presents/server/net/DatagramChannelReader.java b/core/src/main/java/com/threerings/presents/server/net/DatagramChannelReader.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/net/DatagramChannelReader.java
rename to core/src/main/java/com/threerings/presents/server/net/DatagramChannelReader.java
diff --git a/src/main/java/com/threerings/presents/server/net/PresentsConnection.java b/core/src/main/java/com/threerings/presents/server/net/PresentsConnection.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/net/PresentsConnection.java
rename to core/src/main/java/com/threerings/presents/server/net/PresentsConnection.java
diff --git a/src/main/java/com/threerings/presents/server/net/PresentsConnectionManager.java b/core/src/main/java/com/threerings/presents/server/net/PresentsConnectionManager.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/net/PresentsConnectionManager.java
rename to core/src/main/java/com/threerings/presents/server/net/PresentsConnectionManager.java
diff --git a/src/main/java/com/threerings/presents/server/net/ServerCommunicator.java b/core/src/main/java/com/threerings/presents/server/net/ServerCommunicator.java
similarity index 100%
rename from src/main/java/com/threerings/presents/server/net/ServerCommunicator.java
rename to core/src/main/java/com/threerings/presents/server/net/ServerCommunicator.java
diff --git a/src/main/java/com/threerings/presents/util/ClassUtil.java b/core/src/main/java/com/threerings/presents/util/ClassUtil.java
similarity index 100%
rename from src/main/java/com/threerings/presents/util/ClassUtil.java
rename to core/src/main/java/com/threerings/presents/util/ClassUtil.java
diff --git a/src/main/java/com/threerings/presents/util/ConfirmAdapter.java b/core/src/main/java/com/threerings/presents/util/ConfirmAdapter.java
similarity index 100%
rename from src/main/java/com/threerings/presents/util/ConfirmAdapter.java
rename to core/src/main/java/com/threerings/presents/util/ConfirmAdapter.java
diff --git a/src/main/java/com/threerings/presents/util/DatagramSequencer.java b/core/src/main/java/com/threerings/presents/util/DatagramSequencer.java
similarity index 100%
rename from src/main/java/com/threerings/presents/util/DatagramSequencer.java
rename to core/src/main/java/com/threerings/presents/util/DatagramSequencer.java
diff --git a/src/main/java/com/threerings/presents/util/FutureResult.java b/core/src/main/java/com/threerings/presents/util/FutureResult.java
similarity index 100%
rename from src/main/java/com/threerings/presents/util/FutureResult.java
rename to core/src/main/java/com/threerings/presents/util/FutureResult.java
diff --git a/src/main/java/com/threerings/presents/util/IgnoreConfirmAdapter.java b/core/src/main/java/com/threerings/presents/util/IgnoreConfirmAdapter.java
similarity index 100%
rename from src/main/java/com/threerings/presents/util/IgnoreConfirmAdapter.java
rename to core/src/main/java/com/threerings/presents/util/IgnoreConfirmAdapter.java
diff --git a/src/main/java/com/threerings/presents/util/InvocationAdapter.java b/core/src/main/java/com/threerings/presents/util/InvocationAdapter.java
similarity index 100%
rename from src/main/java/com/threerings/presents/util/InvocationAdapter.java
rename to core/src/main/java/com/threerings/presents/util/InvocationAdapter.java
diff --git a/src/main/java/com/threerings/presents/util/PersistingUnit.java b/core/src/main/java/com/threerings/presents/util/PersistingUnit.java
similarity index 100%
rename from src/main/java/com/threerings/presents/util/PersistingUnit.java
rename to core/src/main/java/com/threerings/presents/util/PersistingUnit.java
diff --git a/src/main/java/com/threerings/presents/util/PresentsContext.java b/core/src/main/java/com/threerings/presents/util/PresentsContext.java
similarity index 100%
rename from src/main/java/com/threerings/presents/util/PresentsContext.java
rename to core/src/main/java/com/threerings/presents/util/PresentsContext.java
diff --git a/src/main/java/com/threerings/presents/util/ResultAdapter.java b/core/src/main/java/com/threerings/presents/util/ResultAdapter.java
similarity index 100%
rename from src/main/java/com/threerings/presents/util/ResultAdapter.java
rename to core/src/main/java/com/threerings/presents/util/ResultAdapter.java
diff --git a/src/main/java/com/threerings/presents/util/ResultListenerList.java b/core/src/main/java/com/threerings/presents/util/ResultListenerList.java
similarity index 100%
rename from src/main/java/com/threerings/presents/util/ResultListenerList.java
rename to core/src/main/java/com/threerings/presents/util/ResultListenerList.java
diff --git a/src/main/java/com/threerings/presents/util/SafeSubscriber.java b/core/src/main/java/com/threerings/presents/util/SafeSubscriber.java
similarity index 100%
rename from src/main/java/com/threerings/presents/util/SafeSubscriber.java
rename to core/src/main/java/com/threerings/presents/util/SafeSubscriber.java
diff --git a/src/main/java/com/threerings/presents/util/SecureUtil.java b/core/src/main/java/com/threerings/presents/util/SecureUtil.java
similarity index 100%
rename from src/main/java/com/threerings/presents/util/SecureUtil.java
rename to core/src/main/java/com/threerings/presents/util/SecureUtil.java
diff --git a/src/main/java/com/threerings/util/ActionScript.java b/core/src/main/java/com/threerings/util/ActionScript.java
similarity index 100%
rename from src/main/java/com/threerings/util/ActionScript.java
rename to core/src/main/java/com/threerings/util/ActionScript.java
diff --git a/src/main/java/com/threerings/util/Equalable.java b/core/src/main/java/com/threerings/util/Equalable.java
similarity index 100%
rename from src/main/java/com/threerings/util/Equalable.java
rename to core/src/main/java/com/threerings/util/Equalable.java
diff --git a/src/main/java/com/threerings/util/Hashable.java b/core/src/main/java/com/threerings/util/Hashable.java
similarity index 100%
rename from src/main/java/com/threerings/util/Hashable.java
rename to core/src/main/java/com/threerings/util/Hashable.java
diff --git a/src/main/java/com/threerings/util/Name.java b/core/src/main/java/com/threerings/util/Name.java
similarity index 100%
rename from src/main/java/com/threerings/util/Name.java
rename to core/src/main/java/com/threerings/util/Name.java
diff --git a/src/main/java/com/threerings/util/RandomUtil.java b/core/src/main/java/com/threerings/util/RandomUtil.java
similarity index 100%
rename from src/main/java/com/threerings/util/RandomUtil.java
rename to core/src/main/java/com/threerings/util/RandomUtil.java
diff --git a/src/main/java/com/threerings/util/Resulting.java b/core/src/main/java/com/threerings/util/Resulting.java
similarity index 100%
rename from src/main/java/com/threerings/util/Resulting.java
rename to core/src/main/java/com/threerings/util/Resulting.java
diff --git a/src/main/java/com/threerings/util/StreamableArrayIntSet.java b/core/src/main/java/com/threerings/util/StreamableArrayIntSet.java
similarity index 100%
rename from src/main/java/com/threerings/util/StreamableArrayIntSet.java
rename to core/src/main/java/com/threerings/util/StreamableArrayIntSet.java
diff --git a/src/main/java/com/threerings/util/StreamableArrayList.java b/core/src/main/java/com/threerings/util/StreamableArrayList.java
similarity index 100%
rename from src/main/java/com/threerings/util/StreamableArrayList.java
rename to core/src/main/java/com/threerings/util/StreamableArrayList.java
diff --git a/src/main/java/com/threerings/util/StreamableEnumSet.java b/core/src/main/java/com/threerings/util/StreamableEnumSet.java
similarity index 100%
rename from src/main/java/com/threerings/util/StreamableEnumSet.java
rename to core/src/main/java/com/threerings/util/StreamableEnumSet.java
diff --git a/src/main/java/com/threerings/util/StreamableHashIntMap.java b/core/src/main/java/com/threerings/util/StreamableHashIntMap.java
similarity index 100%
rename from src/main/java/com/threerings/util/StreamableHashIntMap.java
rename to core/src/main/java/com/threerings/util/StreamableHashIntMap.java
diff --git a/src/main/java/com/threerings/util/StreamableHashMap.java b/core/src/main/java/com/threerings/util/StreamableHashMap.java
similarity index 100%
rename from src/main/java/com/threerings/util/StreamableHashMap.java
rename to core/src/main/java/com/threerings/util/StreamableHashMap.java
diff --git a/src/main/java/com/threerings/util/StreamableHashSet.java b/core/src/main/java/com/threerings/util/StreamableHashSet.java
similarity index 100%
rename from src/main/java/com/threerings/util/StreamableHashSet.java
rename to core/src/main/java/com/threerings/util/StreamableHashSet.java
diff --git a/src/main/java/com/threerings/util/StreamableIntIntMap.java b/core/src/main/java/com/threerings/util/StreamableIntIntMap.java
similarity index 100%
rename from src/main/java/com/threerings/util/StreamableIntIntMap.java
rename to core/src/main/java/com/threerings/util/StreamableIntIntMap.java
diff --git a/src/main/java/com/threerings/util/StreamablePoint.java b/core/src/main/java/com/threerings/util/StreamablePoint.java
similarity index 100%
rename from src/main/java/com/threerings/util/StreamablePoint.java
rename to core/src/main/java/com/threerings/util/StreamablePoint.java
diff --git a/src/main/java/com/threerings/util/StreamableRectangle.java b/core/src/main/java/com/threerings/util/StreamableRectangle.java
similarity index 100%
rename from src/main/java/com/threerings/util/StreamableRectangle.java
rename to core/src/main/java/com/threerings/util/StreamableRectangle.java
diff --git a/src/main/java/com/threerings/util/StreamableTuple.java b/core/src/main/java/com/threerings/util/StreamableTuple.java
similarity index 100%
rename from src/main/java/com/threerings/util/StreamableTuple.java
rename to core/src/main/java/com/threerings/util/StreamableTuple.java
diff --git a/src/main/java/com/threerings/web/Base.gwt.xml b/core/src/main/java/com/threerings/web/Base.gwt.xml
similarity index 100%
rename from src/main/java/com/threerings/web/Base.gwt.xml
rename to core/src/main/java/com/threerings/web/Base.gwt.xml
diff --git a/src/main/java/com/threerings/web/gwt/ServiceException.java b/core/src/main/java/com/threerings/web/gwt/ServiceException.java
similarity index 100%
rename from src/main/java/com/threerings/web/gwt/ServiceException.java
rename to core/src/main/java/com/threerings/web/gwt/ServiceException.java
diff --git a/src/main/java/com/threerings/web/server/ServletWaiter.java b/core/src/main/java/com/threerings/web/server/ServletWaiter.java
similarity index 100%
rename from src/main/java/com/threerings/web/server/ServletWaiter.java
rename to core/src/main/java/com/threerings/web/server/ServletWaiter.java
diff --git a/src/main/resources/com/threerings/presents/tools.properties b/core/src/main/resources/com/threerings/presents/tools.properties
similarity index 100%
rename from src/main/resources/com/threerings/presents/tools.properties
rename to core/src/main/resources/com/threerings/presents/tools.properties
diff --git a/src/test/java/com/threerings/bureau/client/TestClient.java b/core/src/test/java/com/threerings/bureau/client/TestClient.java
similarity index 100%
rename from src/test/java/com/threerings/bureau/client/TestClient.java
rename to core/src/test/java/com/threerings/bureau/client/TestClient.java
diff --git a/src/test/java/com/threerings/bureau/server/RegistryTester.java b/core/src/test/java/com/threerings/bureau/server/RegistryTester.java
similarity index 100%
rename from src/test/java/com/threerings/bureau/server/RegistryTester.java
rename to core/src/test/java/com/threerings/bureau/server/RegistryTester.java
diff --git a/src/test/java/com/threerings/bureau/server/TestServer.java b/core/src/test/java/com/threerings/bureau/server/TestServer.java
similarity index 100%
rename from src/test/java/com/threerings/bureau/server/TestServer.java
rename to core/src/test/java/com/threerings/bureau/server/TestServer.java
diff --git a/src/test/java/com/threerings/crowd/client/JabberApp.java b/core/src/test/java/com/threerings/crowd/client/JabberApp.java
similarity index 100%
rename from src/test/java/com/threerings/crowd/client/JabberApp.java
rename to core/src/test/java/com/threerings/crowd/client/JabberApp.java
diff --git a/src/test/java/com/threerings/crowd/client/JabberClient.java b/core/src/test/java/com/threerings/crowd/client/JabberClient.java
similarity index 100%
rename from src/test/java/com/threerings/crowd/client/JabberClient.java
rename to core/src/test/java/com/threerings/crowd/client/JabberClient.java
diff --git a/src/test/java/com/threerings/crowd/client/JabberController.java b/core/src/test/java/com/threerings/crowd/client/JabberController.java
similarity index 100%
rename from src/test/java/com/threerings/crowd/client/JabberController.java
rename to core/src/test/java/com/threerings/crowd/client/JabberController.java
diff --git a/src/test/java/com/threerings/crowd/client/JabberPanel.java b/core/src/test/java/com/threerings/crowd/client/JabberPanel.java
similarity index 100%
rename from src/test/java/com/threerings/crowd/client/JabberPanel.java
rename to core/src/test/java/com/threerings/crowd/client/JabberPanel.java
diff --git a/src/test/java/com/threerings/crowd/data/JabberConfig.java b/core/src/test/java/com/threerings/crowd/data/JabberConfig.java
similarity index 100%
rename from src/test/java/com/threerings/crowd/data/JabberConfig.java
rename to core/src/test/java/com/threerings/crowd/data/JabberConfig.java
diff --git a/src/test/java/com/threerings/crowd/server/JabberServer.java b/core/src/test/java/com/threerings/crowd/server/JabberServer.java
similarity index 100%
rename from src/test/java/com/threerings/crowd/server/JabberServer.java
rename to core/src/test/java/com/threerings/crowd/server/JabberServer.java
diff --git a/src/test/java/com/threerings/io/ASStreamableSubset.java b/core/src/test/java/com/threerings/io/ASStreamableSubset.java
similarity index 100%
rename from src/test/java/com/threerings/io/ASStreamableSubset.java
rename to core/src/test/java/com/threerings/io/ASStreamableSubset.java
diff --git a/src/test/java/com/threerings/io/FrameTest.java b/core/src/test/java/com/threerings/io/FrameTest.java
similarity index 100%
rename from src/test/java/com/threerings/io/FrameTest.java
rename to core/src/test/java/com/threerings/io/FrameTest.java
diff --git a/src/test/java/com/threerings/io/StreamableTest.java b/core/src/test/java/com/threerings/io/StreamableTest.java
similarity index 100%
rename from src/test/java/com/threerings/io/StreamableTest.java
rename to core/src/test/java/com/threerings/io/StreamableTest.java
diff --git a/src/test/java/com/threerings/presents/client/TestClient.java b/core/src/test/java/com/threerings/presents/client/TestClient.java
similarity index 100%
rename from src/test/java/com/threerings/presents/client/TestClient.java
rename to core/src/test/java/com/threerings/presents/client/TestClient.java
diff --git a/src/test/java/com/threerings/presents/client/TestDecoder.java b/core/src/test/java/com/threerings/presents/client/TestDecoder.java
similarity index 100%
rename from src/test/java/com/threerings/presents/client/TestDecoder.java
rename to core/src/test/java/com/threerings/presents/client/TestDecoder.java
diff --git a/src/test/java/com/threerings/presents/client/TestReceiver.java b/core/src/test/java/com/threerings/presents/client/TestReceiver.java
similarity index 100%
rename from src/test/java/com/threerings/presents/client/TestReceiver.java
rename to core/src/test/java/com/threerings/presents/client/TestReceiver.java
diff --git a/src/test/java/com/threerings/presents/client/TestService.java b/core/src/test/java/com/threerings/presents/client/TestService.java
similarity index 100%
rename from src/test/java/com/threerings/presents/client/TestService.java
rename to core/src/test/java/com/threerings/presents/client/TestService.java
diff --git a/src/test/java/com/threerings/presents/data/TestMarshaller.java b/core/src/test/java/com/threerings/presents/data/TestMarshaller.java
similarity index 100%
rename from src/test/java/com/threerings/presents/data/TestMarshaller.java
rename to core/src/test/java/com/threerings/presents/data/TestMarshaller.java
diff --git a/src/test/java/com/threerings/presents/data/TestObject.java b/core/src/test/java/com/threerings/presents/data/TestObject.java
similarity index 100%
rename from src/test/java/com/threerings/presents/data/TestObject.java
rename to core/src/test/java/com/threerings/presents/data/TestObject.java
diff --git a/src/test/java/com/threerings/presents/dobj/DSetTest.java b/core/src/test/java/com/threerings/presents/dobj/DSetTest.java
similarity index 100%
rename from src/test/java/com/threerings/presents/dobj/DSetTest.java
rename to core/src/test/java/com/threerings/presents/dobj/DSetTest.java
diff --git a/src/test/java/com/threerings/presents/dobj/LocalAttrTest.java b/core/src/test/java/com/threerings/presents/dobj/LocalAttrTest.java
similarity index 100%
rename from src/test/java/com/threerings/presents/dobj/LocalAttrTest.java
rename to core/src/test/java/com/threerings/presents/dobj/LocalAttrTest.java
diff --git a/src/test/java/com/threerings/presents/peer/server/PeerTest.java b/core/src/test/java/com/threerings/presents/peer/server/PeerTest.java
similarity index 100%
rename from src/test/java/com/threerings/presents/peer/server/PeerTest.java
rename to core/src/test/java/com/threerings/presents/peer/server/PeerTest.java
diff --git a/src/test/java/com/threerings/presents/peer/server/PeerTestGroup.java b/core/src/test/java/com/threerings/presents/peer/server/PeerTestGroup.java
similarity index 100%
rename from src/test/java/com/threerings/presents/peer/server/PeerTestGroup.java
rename to core/src/test/java/com/threerings/presents/peer/server/PeerTestGroup.java
diff --git a/src/test/java/com/threerings/presents/peer/server/TestPeerManager.java b/core/src/test/java/com/threerings/presents/peer/server/TestPeerManager.java
similarity index 100%
rename from src/test/java/com/threerings/presents/peer/server/TestPeerManager.java
rename to core/src/test/java/com/threerings/presents/peer/server/TestPeerManager.java
diff --git a/src/test/java/com/threerings/presents/server/DOMTest.java b/core/src/test/java/com/threerings/presents/server/DOMTest.java
similarity index 100%
rename from src/test/java/com/threerings/presents/server/DOMTest.java
rename to core/src/test/java/com/threerings/presents/server/DOMTest.java
diff --git a/src/test/java/com/threerings/presents/server/DestroyedRefTest.java b/core/src/test/java/com/threerings/presents/server/DestroyedRefTest.java
similarity index 100%
rename from src/test/java/com/threerings/presents/server/DestroyedRefTest.java
rename to core/src/test/java/com/threerings/presents/server/DestroyedRefTest.java
diff --git a/src/test/java/com/threerings/presents/server/OMgrIntervalTest.java b/core/src/test/java/com/threerings/presents/server/OMgrIntervalTest.java
similarity index 100%
rename from src/test/java/com/threerings/presents/server/OMgrIntervalTest.java
rename to core/src/test/java/com/threerings/presents/server/OMgrIntervalTest.java
diff --git a/src/test/java/com/threerings/presents/server/PresentsTestBase.java b/core/src/test/java/com/threerings/presents/server/PresentsTestBase.java
similarity index 100%
rename from src/test/java/com/threerings/presents/server/PresentsTestBase.java
rename to core/src/test/java/com/threerings/presents/server/PresentsTestBase.java
diff --git a/src/test/java/com/threerings/presents/server/RefTest.java b/core/src/test/java/com/threerings/presents/server/RefTest.java
similarity index 100%
rename from src/test/java/com/threerings/presents/server/RefTest.java
rename to core/src/test/java/com/threerings/presents/server/RefTest.java
diff --git a/src/test/java/com/threerings/presents/server/TestManager.java b/core/src/test/java/com/threerings/presents/server/TestManager.java
similarity index 100%
rename from src/test/java/com/threerings/presents/server/TestManager.java
rename to core/src/test/java/com/threerings/presents/server/TestManager.java
diff --git a/src/test/java/com/threerings/presents/server/TestProvider.java b/core/src/test/java/com/threerings/presents/server/TestProvider.java
similarity index 100%
rename from src/test/java/com/threerings/presents/server/TestProvider.java
rename to core/src/test/java/com/threerings/presents/server/TestProvider.java
diff --git a/src/test/java/com/threerings/presents/server/TestSender.java b/core/src/test/java/com/threerings/presents/server/TestSender.java
similarity index 100%
rename from src/test/java/com/threerings/presents/server/TestSender.java
rename to core/src/test/java/com/threerings/presents/server/TestSender.java
diff --git a/src/test/java/com/threerings/presents/server/TestServer.java b/core/src/test/java/com/threerings/presents/server/TestServer.java
similarity index 100%
rename from src/test/java/com/threerings/presents/server/TestServer.java
rename to core/src/test/java/com/threerings/presents/server/TestServer.java
diff --git a/src/test/java/com/threerings/util/MessageBundleTest.java b/core/src/test/java/com/threerings/util/MessageBundleTest.java
similarity index 100%
rename from src/test/java/com/threerings/util/MessageBundleTest.java
rename to core/src/test/java/com/threerings/util/MessageBundleTest.java
diff --git a/src/test/resources/config/presents/server.properties b/core/src/test/resources/config/presents/server.properties
similarity index 100%
rename from src/test/resources/config/presents/server.properties
rename to core/src/test/resources/config/presents/server.properties
diff --git a/src/test/resources/i18n/messages.properties b/core/src/test/resources/i18n/messages.properties
similarity index 100%
rename from src/test/resources/i18n/messages.properties
rename to core/src/test/resources/i18n/messages.properties
diff --git a/pom.xml b/pom.xml
index 65dd29cf3..737af9dde 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,11 +8,11 @@
com.threerings
- narya
- jar
+ narya-parent
+ pom
1.11-SNAPSHOT
- Narya
+ Narya Parent
Facilities for making networked multiplayer games.
http://github.com/threerings/narya/
@@ -41,82 +41,10 @@
http://github.com/threerings/narya/
-
-
-
- com.threerings
- ooo-util
- 1.1
-
-
- com.google.inject
- guice
- 2.0
-
-
- javax.annotation
- jsr250-api
- 1.0
-
-
-
-
- com.samskivert
- jmustache
- 1.4
- true
-
-
- com.samskivert
- depot
- 1.5
- true
-
-
- com.google.gwt
- gwt-user
- 2.4.0
- true
-
-
- javassist
- javassist
- 3.8.0.GA
- true
-
-
- net.sf.ehcache
- ehcache
- 1.6.0
- true
-
-
- com.threerings
- gwt-utils
- 1.5
- true
-
-
-
-
- org.apache.ant
- ant
- 1.7.1
- provided
-
-
- junit
- junit
- 4.10
- test
-
-
- org.hsqldb
- hsqldb
- 2.0.0
- test
-
-
+
+ core
+ tools
+
diff --git a/tools/pom.xml b/tools/pom.xml
new file mode 100644
index 000000000..19d912f47
--- /dev/null
+++ b/tools/pom.xml
@@ -0,0 +1,46 @@
+
+
+ 4.0.0
+
+ com.threerings
+ narya-parent
+ 1.11-SNAPSHOT
+
+
+ narya-tools
+ jar
+ Narya Tools
+
+
+
+
+ com.threerings
+ narya
+ ${project.version}
+
+
+ com.samskivert
+ jmustache
+ 1.4
+
+
+ javassist
+ javassist
+ 3.8.0.GA
+
+
+
+
+ org.apache.ant
+ ant
+ 1.7.1
+ provided
+
+
+ junit
+ junit
+ 4.10
+ test
+
+
+
diff --git a/src/main/java/com/threerings/presents/tools/ActionScriptUtils.java b/tools/src/main/java/com/threerings/presents/tools/ActionScriptUtils.java
similarity index 100%
rename from src/main/java/com/threerings/presents/tools/ActionScriptUtils.java
rename to tools/src/main/java/com/threerings/presents/tools/ActionScriptUtils.java
diff --git a/src/main/java/com/threerings/presents/tools/GenActionScriptStreamableTask.java b/tools/src/main/java/com/threerings/presents/tools/GenActionScriptStreamableTask.java
similarity index 100%
rename from src/main/java/com/threerings/presents/tools/GenActionScriptStreamableTask.java
rename to tools/src/main/java/com/threerings/presents/tools/GenActionScriptStreamableTask.java
diff --git a/src/main/java/com/threerings/presents/tools/GenDObjectTask.java b/tools/src/main/java/com/threerings/presents/tools/GenDObjectTask.java
similarity index 100%
rename from src/main/java/com/threerings/presents/tools/GenDObjectTask.java
rename to tools/src/main/java/com/threerings/presents/tools/GenDObjectTask.java
diff --git a/src/main/java/com/threerings/presents/tools/GenReceiverTask.java b/tools/src/main/java/com/threerings/presents/tools/GenReceiverTask.java
similarity index 100%
rename from src/main/java/com/threerings/presents/tools/GenReceiverTask.java
rename to tools/src/main/java/com/threerings/presents/tools/GenReceiverTask.java
diff --git a/src/main/java/com/threerings/presents/tools/GenServiceTask.java b/tools/src/main/java/com/threerings/presents/tools/GenServiceTask.java
similarity index 100%
rename from src/main/java/com/threerings/presents/tools/GenServiceTask.java
rename to tools/src/main/java/com/threerings/presents/tools/GenServiceTask.java
diff --git a/src/main/java/com/threerings/presents/tools/GenStreamableTask.java b/tools/src/main/java/com/threerings/presents/tools/GenStreamableTask.java
similarity index 100%
rename from src/main/java/com/threerings/presents/tools/GenStreamableTask.java
rename to tools/src/main/java/com/threerings/presents/tools/GenStreamableTask.java
diff --git a/src/main/java/com/threerings/presents/tools/GenTask.java b/tools/src/main/java/com/threerings/presents/tools/GenTask.java
similarity index 100%
rename from src/main/java/com/threerings/presents/tools/GenTask.java
rename to tools/src/main/java/com/threerings/presents/tools/GenTask.java
diff --git a/src/main/java/com/threerings/presents/tools/GenUtil.java b/tools/src/main/java/com/threerings/presents/tools/GenUtil.java
similarity index 100%
rename from src/main/java/com/threerings/presents/tools/GenUtil.java
rename to tools/src/main/java/com/threerings/presents/tools/GenUtil.java
diff --git a/src/main/java/com/threerings/presents/tools/GeneratedSourceMerger.java b/tools/src/main/java/com/threerings/presents/tools/GeneratedSourceMerger.java
similarity index 100%
rename from src/main/java/com/threerings/presents/tools/GeneratedSourceMerger.java
rename to tools/src/main/java/com/threerings/presents/tools/GeneratedSourceMerger.java
diff --git a/src/main/java/com/threerings/presents/tools/ImportSet.java b/tools/src/main/java/com/threerings/presents/tools/ImportSet.java
similarity index 100%
rename from src/main/java/com/threerings/presents/tools/ImportSet.java
rename to tools/src/main/java/com/threerings/presents/tools/ImportSet.java
diff --git a/src/main/java/com/threerings/presents/tools/InstrumentStreamableTask.java b/tools/src/main/java/com/threerings/presents/tools/InstrumentStreamableTask.java
similarity index 100%
rename from src/main/java/com/threerings/presents/tools/InstrumentStreamableTask.java
rename to tools/src/main/java/com/threerings/presents/tools/InstrumentStreamableTask.java
diff --git a/src/main/java/com/threerings/presents/tools/InvocationTask.java b/tools/src/main/java/com/threerings/presents/tools/InvocationTask.java
similarity index 100%
rename from src/main/java/com/threerings/presents/tools/InvocationTask.java
rename to tools/src/main/java/com/threerings/presents/tools/InvocationTask.java
diff --git a/src/main/java/com/threerings/presents/tools/KeyPairGen.java b/tools/src/main/java/com/threerings/presents/tools/KeyPairGen.java
similarity index 100%
rename from src/main/java/com/threerings/presents/tools/KeyPairGen.java
rename to tools/src/main/java/com/threerings/presents/tools/KeyPairGen.java
diff --git a/src/main/java/com/threerings/presents/tools/SourceFile.java b/tools/src/main/java/com/threerings/presents/tools/SourceFile.java
similarity index 100%
rename from src/main/java/com/threerings/presents/tools/SourceFile.java
rename to tools/src/main/java/com/threerings/presents/tools/SourceFile.java
diff --git a/src/main/java/com/threerings/presents/tools/StreamableClassRequirements.java b/tools/src/main/java/com/threerings/presents/tools/StreamableClassRequirements.java
similarity index 100%
rename from src/main/java/com/threerings/presents/tools/StreamableClassRequirements.java
rename to tools/src/main/java/com/threerings/presents/tools/StreamableClassRequirements.java
diff --git a/src/main/java/com/threerings/presents/tools/cpp/CPPArgBuilder.java b/tools/src/main/java/com/threerings/presents/tools/cpp/CPPArgBuilder.java
similarity index 100%
rename from src/main/java/com/threerings/presents/tools/cpp/CPPArgBuilder.java
rename to tools/src/main/java/com/threerings/presents/tools/cpp/CPPArgBuilder.java
diff --git a/src/main/java/com/threerings/presents/tools/cpp/CPPField.java b/tools/src/main/java/com/threerings/presents/tools/cpp/CPPField.java
similarity index 100%
rename from src/main/java/com/threerings/presents/tools/cpp/CPPField.java
rename to tools/src/main/java/com/threerings/presents/tools/cpp/CPPField.java
diff --git a/src/main/java/com/threerings/presents/tools/cpp/CPPType.java b/tools/src/main/java/com/threerings/presents/tools/cpp/CPPType.java
similarity index 100%
rename from src/main/java/com/threerings/presents/tools/cpp/CPPType.java
rename to tools/src/main/java/com/threerings/presents/tools/cpp/CPPType.java
diff --git a/src/main/java/com/threerings/presents/tools/cpp/CPPUtil.java b/tools/src/main/java/com/threerings/presents/tools/cpp/CPPUtil.java
similarity index 100%
rename from src/main/java/com/threerings/presents/tools/cpp/CPPUtil.java
rename to tools/src/main/java/com/threerings/presents/tools/cpp/CPPUtil.java
diff --git a/src/main/java/com/threerings/presents/tools/cpp/GenCPPReceiverTask.java b/tools/src/main/java/com/threerings/presents/tools/cpp/GenCPPReceiverTask.java
similarity index 100%
rename from src/main/java/com/threerings/presents/tools/cpp/GenCPPReceiverTask.java
rename to tools/src/main/java/com/threerings/presents/tools/cpp/GenCPPReceiverTask.java
diff --git a/src/main/java/com/threerings/presents/tools/cpp/GenCPPServiceTask.java b/tools/src/main/java/com/threerings/presents/tools/cpp/GenCPPServiceTask.java
similarity index 100%
rename from src/main/java/com/threerings/presents/tools/cpp/GenCPPServiceTask.java
rename to tools/src/main/java/com/threerings/presents/tools/cpp/GenCPPServiceTask.java
diff --git a/src/main/java/com/threerings/presents/tools/cpp/GenCPPStreamableTask.java b/tools/src/main/java/com/threerings/presents/tools/cpp/GenCPPStreamableTask.java
similarity index 100%
rename from src/main/java/com/threerings/presents/tools/cpp/GenCPPStreamableTask.java
rename to tools/src/main/java/com/threerings/presents/tools/cpp/GenCPPStreamableTask.java
diff --git a/src/main/java/com/threerings/presents/tools/cpp/MethodDescriptor.java b/tools/src/main/java/com/threerings/presents/tools/cpp/MethodDescriptor.java
similarity index 100%
rename from src/main/java/com/threerings/presents/tools/cpp/MethodDescriptor.java
rename to tools/src/main/java/com/threerings/presents/tools/cpp/MethodDescriptor.java
diff --git a/src/main/resources/com/threerings/presents/tools/cpp/decoder_cpp.mustache b/tools/src/main/resources/com/threerings/presents/tools/cpp/decoder_cpp.mustache
similarity index 100%
rename from src/main/resources/com/threerings/presents/tools/cpp/decoder_cpp.mustache
rename to tools/src/main/resources/com/threerings/presents/tools/cpp/decoder_cpp.mustache
diff --git a/src/main/resources/com/threerings/presents/tools/cpp/decoder_h.mustache b/tools/src/main/resources/com/threerings/presents/tools/cpp/decoder_h.mustache
similarity index 100%
rename from src/main/resources/com/threerings/presents/tools/cpp/decoder_h.mustache
rename to tools/src/main/resources/com/threerings/presents/tools/cpp/decoder_h.mustache
diff --git a/src/main/resources/com/threerings/presents/tools/cpp/marshaller_cpp.mustache b/tools/src/main/resources/com/threerings/presents/tools/cpp/marshaller_cpp.mustache
similarity index 100%
rename from src/main/resources/com/threerings/presents/tools/cpp/marshaller_cpp.mustache
rename to tools/src/main/resources/com/threerings/presents/tools/cpp/marshaller_cpp.mustache
diff --git a/src/main/resources/com/threerings/presents/tools/cpp/marshaller_h.mustache b/tools/src/main/resources/com/threerings/presents/tools/cpp/marshaller_h.mustache
similarity index 100%
rename from src/main/resources/com/threerings/presents/tools/cpp/marshaller_h.mustache
rename to tools/src/main/resources/com/threerings/presents/tools/cpp/marshaller_h.mustache
diff --git a/src/main/resources/com/threerings/presents/tools/cpp/receiver_h.mustache b/tools/src/main/resources/com/threerings/presents/tools/cpp/receiver_h.mustache
similarity index 100%
rename from src/main/resources/com/threerings/presents/tools/cpp/receiver_h.mustache
rename to tools/src/main/resources/com/threerings/presents/tools/cpp/receiver_h.mustache
diff --git a/src/main/resources/com/threerings/presents/tools/cpp/streamable_cpp.mustache b/tools/src/main/resources/com/threerings/presents/tools/cpp/streamable_cpp.mustache
similarity index 100%
rename from src/main/resources/com/threerings/presents/tools/cpp/streamable_cpp.mustache
rename to tools/src/main/resources/com/threerings/presents/tools/cpp/streamable_cpp.mustache
diff --git a/src/main/resources/com/threerings/presents/tools/cpp/streamable_h.mustache b/tools/src/main/resources/com/threerings/presents/tools/cpp/streamable_h.mustache
similarity index 100%
rename from src/main/resources/com/threerings/presents/tools/cpp/streamable_h.mustache
rename to tools/src/main/resources/com/threerings/presents/tools/cpp/streamable_h.mustache
diff --git a/src/main/resources/com/threerings/presents/tools/decoder.tmpl b/tools/src/main/resources/com/threerings/presents/tools/decoder.tmpl
similarity index 100%
rename from src/main/resources/com/threerings/presents/tools/decoder.tmpl
rename to tools/src/main/resources/com/threerings/presents/tools/decoder.tmpl
diff --git a/src/main/resources/com/threerings/presents/tools/decoder_as.tmpl b/tools/src/main/resources/com/threerings/presents/tools/decoder_as.tmpl
similarity index 100%
rename from src/main/resources/com/threerings/presents/tools/decoder_as.tmpl
rename to tools/src/main/resources/com/threerings/presents/tools/decoder_as.tmpl
diff --git a/src/main/resources/com/threerings/presents/tools/dispatcher.tmpl b/tools/src/main/resources/com/threerings/presents/tools/dispatcher.tmpl
similarity index 100%
rename from src/main/resources/com/threerings/presents/tools/dispatcher.tmpl
rename to tools/src/main/resources/com/threerings/presents/tools/dispatcher.tmpl
diff --git a/src/main/resources/com/threerings/presents/tools/dobject_field.tmpl b/tools/src/main/resources/com/threerings/presents/tools/dobject_field.tmpl
similarity index 100%
rename from src/main/resources/com/threerings/presents/tools/dobject_field.tmpl
rename to tools/src/main/resources/com/threerings/presents/tools/dobject_field.tmpl
diff --git a/src/main/resources/com/threerings/presents/tools/dobject_name.tmpl b/tools/src/main/resources/com/threerings/presents/tools/dobject_name.tmpl
similarity index 100%
rename from src/main/resources/com/threerings/presents/tools/dobject_name.tmpl
rename to tools/src/main/resources/com/threerings/presents/tools/dobject_name.tmpl
diff --git a/src/main/resources/com/threerings/presents/tools/dobject_oidlist.tmpl b/tools/src/main/resources/com/threerings/presents/tools/dobject_oidlist.tmpl
similarity index 100%
rename from src/main/resources/com/threerings/presents/tools/dobject_oidlist.tmpl
rename to tools/src/main/resources/com/threerings/presents/tools/dobject_oidlist.tmpl
diff --git a/src/main/resources/com/threerings/presents/tools/dobject_set.tmpl b/tools/src/main/resources/com/threerings/presents/tools/dobject_set.tmpl
similarity index 100%
rename from src/main/resources/com/threerings/presents/tools/dobject_set.tmpl
rename to tools/src/main/resources/com/threerings/presents/tools/dobject_set.tmpl
diff --git a/src/main/resources/com/threerings/presents/tools/enum_as.tmpl b/tools/src/main/resources/com/threerings/presents/tools/enum_as.tmpl
similarity index 100%
rename from src/main/resources/com/threerings/presents/tools/enum_as.tmpl
rename to tools/src/main/resources/com/threerings/presents/tools/enum_as.tmpl
diff --git a/src/main/resources/com/threerings/presents/tools/marshaller.tmpl b/tools/src/main/resources/com/threerings/presents/tools/marshaller.tmpl
similarity index 100%
rename from src/main/resources/com/threerings/presents/tools/marshaller.tmpl
rename to tools/src/main/resources/com/threerings/presents/tools/marshaller.tmpl
diff --git a/src/main/resources/com/threerings/presents/tools/marshaller_as.tmpl b/tools/src/main/resources/com/threerings/presents/tools/marshaller_as.tmpl
similarity index 100%
rename from src/main/resources/com/threerings/presents/tools/marshaller_as.tmpl
rename to tools/src/main/resources/com/threerings/presents/tools/marshaller_as.tmpl
diff --git a/src/main/resources/com/threerings/presents/tools/marshaller_listener_as.tmpl b/tools/src/main/resources/com/threerings/presents/tools/marshaller_listener_as.tmpl
similarity index 100%
rename from src/main/resources/com/threerings/presents/tools/marshaller_listener_as.tmpl
rename to tools/src/main/resources/com/threerings/presents/tools/marshaller_listener_as.tmpl
diff --git a/src/main/resources/com/threerings/presents/tools/provider.tmpl b/tools/src/main/resources/com/threerings/presents/tools/provider.tmpl
similarity index 100%
rename from src/main/resources/com/threerings/presents/tools/provider.tmpl
rename to tools/src/main/resources/com/threerings/presents/tools/provider.tmpl
diff --git a/src/main/resources/com/threerings/presents/tools/receiver_as.tmpl b/tools/src/main/resources/com/threerings/presents/tools/receiver_as.tmpl
similarity index 100%
rename from src/main/resources/com/threerings/presents/tools/receiver_as.tmpl
rename to tools/src/main/resources/com/threerings/presents/tools/receiver_as.tmpl
diff --git a/src/main/resources/com/threerings/presents/tools/sender.tmpl b/tools/src/main/resources/com/threerings/presents/tools/sender.tmpl
similarity index 100%
rename from src/main/resources/com/threerings/presents/tools/sender.tmpl
rename to tools/src/main/resources/com/threerings/presents/tools/sender.tmpl
diff --git a/src/main/resources/com/threerings/presents/tools/service_as.tmpl b/tools/src/main/resources/com/threerings/presents/tools/service_as.tmpl
similarity index 100%
rename from src/main/resources/com/threerings/presents/tools/service_as.tmpl
rename to tools/src/main/resources/com/threerings/presents/tools/service_as.tmpl
diff --git a/src/main/resources/com/threerings/presents/tools/service_listener_adapter_as.tmpl b/tools/src/main/resources/com/threerings/presents/tools/service_listener_adapter_as.tmpl
similarity index 100%
rename from src/main/resources/com/threerings/presents/tools/service_listener_adapter_as.tmpl
rename to tools/src/main/resources/com/threerings/presents/tools/service_listener_adapter_as.tmpl
diff --git a/src/main/resources/com/threerings/presents/tools/service_listener_as.tmpl b/tools/src/main/resources/com/threerings/presents/tools/service_listener_as.tmpl
similarity index 100%
rename from src/main/resources/com/threerings/presents/tools/service_listener_as.tmpl
rename to tools/src/main/resources/com/threerings/presents/tools/service_listener_as.tmpl
diff --git a/src/main/resources/com/threerings/presents/tools/streamable_as.tmpl b/tools/src/main/resources/com/threerings/presents/tools/streamable_as.tmpl
similarity index 100%
rename from src/main/resources/com/threerings/presents/tools/streamable_as.tmpl
rename to tools/src/main/resources/com/threerings/presents/tools/streamable_as.tmpl
diff --git a/src/test/java/com/threerings/presents/tools/GeneratedSourceMergerTest.java b/tools/src/test/java/com/threerings/presents/tools/GeneratedSourceMergerTest.java
similarity index 100%
rename from src/test/java/com/threerings/presents/tools/GeneratedSourceMergerTest.java
rename to tools/src/test/java/com/threerings/presents/tools/GeneratedSourceMergerTest.java