diff --git a/aslib/pom.xml b/aslib/pom.xml
new file mode 100644
index 00000000..d0bd1ef1
--- /dev/null
+++ b/aslib/pom.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.threerings</groupId>
+    <artifactId>vilya-parent</artifactId>
+    <version>1.6-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>vilyalib</artifactId>
+  <packaging>swc</packaging>
+  <name>Vilya ActionScript</name>
+
+  <repositories>
+    <repository>
+      <id>flexlib-repo</id>
+      <url>http://maven.ow2.org/maven2</url>
+    </repository>
+    <repository>
+      <id>ooo-ext-maven-repo</id>
+      <url>http://ooo-maven.googlecode.com/hg/repository</url>
+    </repository>
+    <repository>
+      <id>ooo-maven-repo</id>
+      <url>http://threerings.github.com/maven-repo</url>
+    </repository>
+  </repositories>
+
+  <properties>
+    <flex.version>4.1.0.16076</flex.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.threerings</groupId>
+      <artifactId>aspirin</artifactId>
+      <version>1.9</version>
+      <type>swc</type>
+    </dependency>
+    <dependency>
+      <groupId>flexlib</groupId>
+      <artifactId>flexlib-bin</artifactId>
+      <version>2.4</version>
+      <type>swc</type>
+    </dependency>
+    <dependency>
+      <groupId>as3isolib</groupId>
+      <artifactId>as3isolib-fp9</artifactId>
+      <version>r298</version>
+      <type>swc</type>
+    </dependency>
+    <dependency>
+      <groupId>com.threerings</groupId>
+      <artifactId>nenyalib</artifactId>
+      <version>1.5</version>
+      <type>swc</type>
+    </dependency>
+    <!-- needed for the build, but not an exported dependency -->
+    <dependency>
+      <groupId>com.adobe.flex.framework</groupId>
+      <artifactId>flex-framework</artifactId>
+      <version>${flex.version}</version>
+      <type>pom</type>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <id>flexmojos</id>
+      <url>http://repository.sonatype.org/content/groups/flexgroup/</url>
+    </pluginRepository>
+  </pluginRepositories>
+
+  <build>
+    <sourceDirectory>src/main/as</sourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.sonatype.flexmojos</groupId>
+        <artifactId>flexmojos-maven-plugin</artifactId>
+        <extensions>true</extensions>
+        <version>4.2-beta</version>
+        <configuration>
+          <omitTraceStatements>false</omitTraceStatements>
+          <debug>true</debug>
+          <incremental>false</incremental>
+          <useNetwork>false</useNetwork>
+          <verboseStacktraces>true</verboseStacktraces>
+          <!-- we've never shown them in the Ant build, why start now? -->
+          <showWarnings>false</showWarnings>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.adobe.flex</groupId>
+            <artifactId>compiler</artifactId>
+            <version>${flex.version}</version>
+            <type>pom</type>
+          </dependency>
+          <dependency>
+            <groupId>com.adobe.flex.compiler</groupId>
+            <artifactId>asdoc</artifactId>
+            <version>${flex.version}</version>
+            <classifier>template</classifier>
+            <type>zip</type>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/src/main/as/com/threerings/parlor/card/data/Card.as b/aslib/src/main/as/com/threerings/parlor/card/data/Card.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/card/data/Card.as
rename to aslib/src/main/as/com/threerings/parlor/card/data/Card.as
diff --git a/src/main/as/com/threerings/parlor/card/data/CardCodes.as b/aslib/src/main/as/com/threerings/parlor/card/data/CardCodes.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/card/data/CardCodes.as
rename to aslib/src/main/as/com/threerings/parlor/card/data/CardCodes.as
diff --git a/src/main/as/com/threerings/parlor/card/data/Deck.as b/aslib/src/main/as/com/threerings/parlor/card/data/Deck.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/card/data/Deck.as
rename to aslib/src/main/as/com/threerings/parlor/card/data/Deck.as
diff --git a/src/main/as/com/threerings/parlor/card/data/Hand.as b/aslib/src/main/as/com/threerings/parlor/card/data/Hand.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/card/data/Hand.as
rename to aslib/src/main/as/com/threerings/parlor/card/data/Hand.as
diff --git a/src/main/as/com/threerings/parlor/card/data/PlayerCard.as b/aslib/src/main/as/com/threerings/parlor/card/data/PlayerCard.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/card/data/PlayerCard.as
rename to aslib/src/main/as/com/threerings/parlor/card/data/PlayerCard.as
diff --git a/src/main/as/com/threerings/parlor/card/trick/client/TrickCardGameService.as b/aslib/src/main/as/com/threerings/parlor/card/trick/client/TrickCardGameService.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/card/trick/client/TrickCardGameService.as
rename to aslib/src/main/as/com/threerings/parlor/card/trick/client/TrickCardGameService.as
diff --git a/src/main/as/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.as b/aslib/src/main/as/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.as
rename to aslib/src/main/as/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.as
diff --git a/src/main/as/com/threerings/parlor/client/DefaultFlexTableConfigurator.as b/aslib/src/main/as/com/threerings/parlor/client/DefaultFlexTableConfigurator.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/client/DefaultFlexTableConfigurator.as
rename to aslib/src/main/as/com/threerings/parlor/client/DefaultFlexTableConfigurator.as
diff --git a/src/main/as/com/threerings/parlor/client/GameReadyObserver.as b/aslib/src/main/as/com/threerings/parlor/client/GameReadyObserver.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/client/GameReadyObserver.as
rename to aslib/src/main/as/com/threerings/parlor/client/GameReadyObserver.as
diff --git a/src/main/as/com/threerings/parlor/client/Invitation.as b/aslib/src/main/as/com/threerings/parlor/client/Invitation.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/client/Invitation.as
rename to aslib/src/main/as/com/threerings/parlor/client/Invitation.as
diff --git a/src/main/as/com/threerings/parlor/client/InvitationHandler.as b/aslib/src/main/as/com/threerings/parlor/client/InvitationHandler.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/client/InvitationHandler.as
rename to aslib/src/main/as/com/threerings/parlor/client/InvitationHandler.as
diff --git a/src/main/as/com/threerings/parlor/client/InvitationResponseObserver.as b/aslib/src/main/as/com/threerings/parlor/client/InvitationResponseObserver.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/client/InvitationResponseObserver.as
rename to aslib/src/main/as/com/threerings/parlor/client/InvitationResponseObserver.as
diff --git a/src/main/as/com/threerings/parlor/client/ParlorDecoder.as b/aslib/src/main/as/com/threerings/parlor/client/ParlorDecoder.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/client/ParlorDecoder.as
rename to aslib/src/main/as/com/threerings/parlor/client/ParlorDecoder.as
diff --git a/src/main/as/com/threerings/parlor/client/ParlorDirector.as b/aslib/src/main/as/com/threerings/parlor/client/ParlorDirector.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/client/ParlorDirector.as
rename to aslib/src/main/as/com/threerings/parlor/client/ParlorDirector.as
diff --git a/src/main/as/com/threerings/parlor/client/ParlorReceiver.as b/aslib/src/main/as/com/threerings/parlor/client/ParlorReceiver.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/client/ParlorReceiver.as
rename to aslib/src/main/as/com/threerings/parlor/client/ParlorReceiver.as
diff --git a/src/main/as/com/threerings/parlor/client/ParlorService.as b/aslib/src/main/as/com/threerings/parlor/client/ParlorService.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/client/ParlorService.as
rename to aslib/src/main/as/com/threerings/parlor/client/ParlorService.as
diff --git a/src/main/as/com/threerings/parlor/client/ParlorService_InviteListener.as b/aslib/src/main/as/com/threerings/parlor/client/ParlorService_InviteListener.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/client/ParlorService_InviteListener.as
rename to aslib/src/main/as/com/threerings/parlor/client/ParlorService_InviteListener.as
diff --git a/src/main/as/com/threerings/parlor/client/SeatednessObserver.as b/aslib/src/main/as/com/threerings/parlor/client/SeatednessObserver.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/client/SeatednessObserver.as
rename to aslib/src/main/as/com/threerings/parlor/client/SeatednessObserver.as
diff --git a/src/main/as/com/threerings/parlor/client/TableConfigurator.as b/aslib/src/main/as/com/threerings/parlor/client/TableConfigurator.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/client/TableConfigurator.as
rename to aslib/src/main/as/com/threerings/parlor/client/TableConfigurator.as
diff --git a/src/main/as/com/threerings/parlor/client/TableDirector.as b/aslib/src/main/as/com/threerings/parlor/client/TableDirector.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/client/TableDirector.as
rename to aslib/src/main/as/com/threerings/parlor/client/TableDirector.as
diff --git a/src/main/as/com/threerings/parlor/client/TableObserver.as b/aslib/src/main/as/com/threerings/parlor/client/TableObserver.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/client/TableObserver.as
rename to aslib/src/main/as/com/threerings/parlor/client/TableObserver.as
diff --git a/src/main/as/com/threerings/parlor/client/TableService.as b/aslib/src/main/as/com/threerings/parlor/client/TableService.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/client/TableService.as
rename to aslib/src/main/as/com/threerings/parlor/client/TableService.as
diff --git a/src/main/as/com/threerings/parlor/data/ChoiceParameter.as b/aslib/src/main/as/com/threerings/parlor/data/ChoiceParameter.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/data/ChoiceParameter.as
rename to aslib/src/main/as/com/threerings/parlor/data/ChoiceParameter.as
diff --git a/src/main/as/com/threerings/parlor/data/Parameter.as b/aslib/src/main/as/com/threerings/parlor/data/Parameter.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/data/Parameter.as
rename to aslib/src/main/as/com/threerings/parlor/data/Parameter.as
diff --git a/src/main/as/com/threerings/parlor/data/ParlorCodes.as b/aslib/src/main/as/com/threerings/parlor/data/ParlorCodes.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/data/ParlorCodes.as
rename to aslib/src/main/as/com/threerings/parlor/data/ParlorCodes.as
diff --git a/src/main/as/com/threerings/parlor/data/ParlorMarshaller.as b/aslib/src/main/as/com/threerings/parlor/data/ParlorMarshaller.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/data/ParlorMarshaller.as
rename to aslib/src/main/as/com/threerings/parlor/data/ParlorMarshaller.as
diff --git a/src/main/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as b/aslib/src/main/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as
rename to aslib/src/main/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as
diff --git a/src/main/as/com/threerings/parlor/data/RangeParameter.as b/aslib/src/main/as/com/threerings/parlor/data/RangeParameter.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/data/RangeParameter.as
rename to aslib/src/main/as/com/threerings/parlor/data/RangeParameter.as
diff --git a/src/main/as/com/threerings/parlor/data/Table.as b/aslib/src/main/as/com/threerings/parlor/data/Table.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/data/Table.as
rename to aslib/src/main/as/com/threerings/parlor/data/Table.as
diff --git a/src/main/as/com/threerings/parlor/data/TableConfig.as b/aslib/src/main/as/com/threerings/parlor/data/TableConfig.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/data/TableConfig.as
rename to aslib/src/main/as/com/threerings/parlor/data/TableConfig.as
diff --git a/src/main/as/com/threerings/parlor/data/TableLobbyObject.as b/aslib/src/main/as/com/threerings/parlor/data/TableLobbyObject.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/data/TableLobbyObject.as
rename to aslib/src/main/as/com/threerings/parlor/data/TableLobbyObject.as
diff --git a/src/main/as/com/threerings/parlor/data/TableMarshaller.as b/aslib/src/main/as/com/threerings/parlor/data/TableMarshaller.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/data/TableMarshaller.as
rename to aslib/src/main/as/com/threerings/parlor/data/TableMarshaller.as
diff --git a/src/main/as/com/threerings/parlor/data/ToggleParameter.as b/aslib/src/main/as/com/threerings/parlor/data/ToggleParameter.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/data/ToggleParameter.as
rename to aslib/src/main/as/com/threerings/parlor/data/ToggleParameter.as
diff --git a/src/main/as/com/threerings/parlor/game/client/FlexGameConfigurator.as b/aslib/src/main/as/com/threerings/parlor/game/client/FlexGameConfigurator.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/game/client/FlexGameConfigurator.as
rename to aslib/src/main/as/com/threerings/parlor/game/client/FlexGameConfigurator.as
diff --git a/src/main/as/com/threerings/parlor/game/client/GameConfigurator.as b/aslib/src/main/as/com/threerings/parlor/game/client/GameConfigurator.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/game/client/GameConfigurator.as
rename to aslib/src/main/as/com/threerings/parlor/game/client/GameConfigurator.as
diff --git a/src/main/as/com/threerings/parlor/game/client/GameController.as b/aslib/src/main/as/com/threerings/parlor/game/client/GameController.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/game/client/GameController.as
rename to aslib/src/main/as/com/threerings/parlor/game/client/GameController.as
diff --git a/src/main/as/com/threerings/parlor/game/client/GameControllerDelegate.as b/aslib/src/main/as/com/threerings/parlor/game/client/GameControllerDelegate.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/game/client/GameControllerDelegate.as
rename to aslib/src/main/as/com/threerings/parlor/game/client/GameControllerDelegate.as
diff --git a/src/main/as/com/threerings/parlor/game/data/GameAI.as b/aslib/src/main/as/com/threerings/parlor/game/data/GameAI.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/game/data/GameAI.as
rename to aslib/src/main/as/com/threerings/parlor/game/data/GameAI.as
diff --git a/src/main/as/com/threerings/parlor/game/data/GameCodes.as b/aslib/src/main/as/com/threerings/parlor/game/data/GameCodes.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/game/data/GameCodes.as
rename to aslib/src/main/as/com/threerings/parlor/game/data/GameCodes.as
diff --git a/src/main/as/com/threerings/parlor/game/data/GameConfig.as b/aslib/src/main/as/com/threerings/parlor/game/data/GameConfig.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/game/data/GameConfig.as
rename to aslib/src/main/as/com/threerings/parlor/game/data/GameConfig.as
diff --git a/src/main/as/com/threerings/parlor/game/data/GameObject.as b/aslib/src/main/as/com/threerings/parlor/game/data/GameObject.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/game/data/GameObject.as
rename to aslib/src/main/as/com/threerings/parlor/game/data/GameObject.as
diff --git a/src/main/as/com/threerings/parlor/game/data/UserIdentifier.as b/aslib/src/main/as/com/threerings/parlor/game/data/UserIdentifier.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/game/data/UserIdentifier.as
rename to aslib/src/main/as/com/threerings/parlor/game/data/UserIdentifier.as
diff --git a/src/main/as/com/threerings/parlor/turn/client/TurnGameController.as b/aslib/src/main/as/com/threerings/parlor/turn/client/TurnGameController.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/turn/client/TurnGameController.as
rename to aslib/src/main/as/com/threerings/parlor/turn/client/TurnGameController.as
diff --git a/src/main/as/com/threerings/parlor/turn/client/TurnGameControllerDelegate.as b/aslib/src/main/as/com/threerings/parlor/turn/client/TurnGameControllerDelegate.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/turn/client/TurnGameControllerDelegate.as
rename to aslib/src/main/as/com/threerings/parlor/turn/client/TurnGameControllerDelegate.as
diff --git a/src/main/as/com/threerings/parlor/turn/data/TurnGameObject.as b/aslib/src/main/as/com/threerings/parlor/turn/data/TurnGameObject.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/turn/data/TurnGameObject.as
rename to aslib/src/main/as/com/threerings/parlor/turn/data/TurnGameObject.as
diff --git a/src/main/as/com/threerings/parlor/util/ParlorContext.as b/aslib/src/main/as/com/threerings/parlor/util/ParlorContext.as
similarity index 100%
rename from src/main/as/com/threerings/parlor/util/ParlorContext.as
rename to aslib/src/main/as/com/threerings/parlor/util/ParlorContext.as
diff --git a/src/main/as/com/threerings/stage/client/CharacterIsoSprite.as b/aslib/src/main/as/com/threerings/stage/client/CharacterIsoSprite.as
similarity index 100%
rename from src/main/as/com/threerings/stage/client/CharacterIsoSprite.as
rename to aslib/src/main/as/com/threerings/stage/client/CharacterIsoSprite.as
diff --git a/src/main/as/com/threerings/stage/client/ClusterClickedInfo.as b/aslib/src/main/as/com/threerings/stage/client/ClusterClickedInfo.as
similarity index 100%
rename from src/main/as/com/threerings/stage/client/ClusterClickedInfo.as
rename to aslib/src/main/as/com/threerings/stage/client/ClusterClickedInfo.as
diff --git a/src/main/as/com/threerings/stage/client/CrowdStageScenePanel.as b/aslib/src/main/as/com/threerings/stage/client/CrowdStageScenePanel.as
similarity index 100%
rename from src/main/as/com/threerings/stage/client/CrowdStageScenePanel.as
rename to aslib/src/main/as/com/threerings/stage/client/CrowdStageScenePanel.as
diff --git a/src/main/as/com/threerings/stage/client/PortalIsoSprite.as b/aslib/src/main/as/com/threerings/stage/client/PortalIsoSprite.as
similarity index 100%
rename from src/main/as/com/threerings/stage/client/PortalIsoSprite.as
rename to aslib/src/main/as/com/threerings/stage/client/PortalIsoSprite.as
diff --git a/src/main/as/com/threerings/stage/client/SceneColorizer.as b/aslib/src/main/as/com/threerings/stage/client/SceneColorizer.as
similarity index 100%
rename from src/main/as/com/threerings/stage/client/SceneColorizer.as
rename to aslib/src/main/as/com/threerings/stage/client/SceneColorizer.as
diff --git a/src/main/as/com/threerings/stage/client/StageSceneBlock.as b/aslib/src/main/as/com/threerings/stage/client/StageSceneBlock.as
similarity index 100%
rename from src/main/as/com/threerings/stage/client/StageSceneBlock.as
rename to aslib/src/main/as/com/threerings/stage/client/StageSceneBlock.as
diff --git a/src/main/as/com/threerings/stage/client/StageSceneController.as b/aslib/src/main/as/com/threerings/stage/client/StageSceneController.as
similarity index 100%
rename from src/main/as/com/threerings/stage/client/StageSceneController.as
rename to aslib/src/main/as/com/threerings/stage/client/StageSceneController.as
diff --git a/src/main/as/com/threerings/stage/client/StageScenePanel.as b/aslib/src/main/as/com/threerings/stage/client/StageScenePanel.as
similarity index 100%
rename from src/main/as/com/threerings/stage/client/StageScenePanel.as
rename to aslib/src/main/as/com/threerings/stage/client/StageScenePanel.as
diff --git a/src/main/as/com/threerings/stage/client/StageSceneService.as b/aslib/src/main/as/com/threerings/stage/client/StageSceneService.as
similarity index 100%
rename from src/main/as/com/threerings/stage/client/StageSceneService.as
rename to aslib/src/main/as/com/threerings/stage/client/StageSceneService.as
diff --git a/src/main/as/com/threerings/stage/data/DefaultColorUpdate.as b/aslib/src/main/as/com/threerings/stage/data/DefaultColorUpdate.as
similarity index 100%
rename from src/main/as/com/threerings/stage/data/DefaultColorUpdate.as
rename to aslib/src/main/as/com/threerings/stage/data/DefaultColorUpdate.as
diff --git a/src/main/as/com/threerings/stage/data/ModifyObjectsUpdate.as b/aslib/src/main/as/com/threerings/stage/data/ModifyObjectsUpdate.as
similarity index 100%
rename from src/main/as/com/threerings/stage/data/ModifyObjectsUpdate.as
rename to aslib/src/main/as/com/threerings/stage/data/ModifyObjectsUpdate.as
diff --git a/src/main/as/com/threerings/stage/data/StageLocation.as b/aslib/src/main/as/com/threerings/stage/data/StageLocation.as
similarity index 100%
rename from src/main/as/com/threerings/stage/data/StageLocation.as
rename to aslib/src/main/as/com/threerings/stage/data/StageLocation.as
diff --git a/src/main/as/com/threerings/stage/data/StageMisoSceneModel.as b/aslib/src/main/as/com/threerings/stage/data/StageMisoSceneModel.as
similarity index 100%
rename from src/main/as/com/threerings/stage/data/StageMisoSceneModel.as
rename to aslib/src/main/as/com/threerings/stage/data/StageMisoSceneModel.as
diff --git a/src/main/as/com/threerings/stage/data/StageOccupantInfo.as b/aslib/src/main/as/com/threerings/stage/data/StageOccupantInfo.as
similarity index 100%
rename from src/main/as/com/threerings/stage/data/StageOccupantInfo.as
rename to aslib/src/main/as/com/threerings/stage/data/StageOccupantInfo.as
diff --git a/src/main/as/com/threerings/stage/data/StageScene.as b/aslib/src/main/as/com/threerings/stage/data/StageScene.as
similarity index 100%
rename from src/main/as/com/threerings/stage/data/StageScene.as
rename to aslib/src/main/as/com/threerings/stage/data/StageScene.as
diff --git a/src/main/as/com/threerings/stage/data/StageSceneConfig.as b/aslib/src/main/as/com/threerings/stage/data/StageSceneConfig.as
similarity index 100%
rename from src/main/as/com/threerings/stage/data/StageSceneConfig.as
rename to aslib/src/main/as/com/threerings/stage/data/StageSceneConfig.as
diff --git a/src/main/as/com/threerings/stage/data/StageSceneMarshaller.as b/aslib/src/main/as/com/threerings/stage/data/StageSceneMarshaller.as
similarity index 100%
rename from src/main/as/com/threerings/stage/data/StageSceneMarshaller.as
rename to aslib/src/main/as/com/threerings/stage/data/StageSceneMarshaller.as
diff --git a/src/main/as/com/threerings/stage/data/StageSceneModel.as b/aslib/src/main/as/com/threerings/stage/data/StageSceneModel.as
similarity index 100%
rename from src/main/as/com/threerings/stage/data/StageSceneModel.as
rename to aslib/src/main/as/com/threerings/stage/data/StageSceneModel.as
diff --git a/src/main/as/com/threerings/stage/data/StageSceneObject.as b/aslib/src/main/as/com/threerings/stage/data/StageSceneObject.as
similarity index 100%
rename from src/main/as/com/threerings/stage/data/StageSceneObject.as
rename to aslib/src/main/as/com/threerings/stage/data/StageSceneObject.as
diff --git a/src/main/as/com/threerings/stage/util/StageContext.as b/aslib/src/main/as/com/threerings/stage/util/StageContext.as
similarity index 100%
rename from src/main/as/com/threerings/stage/util/StageContext.as
rename to aslib/src/main/as/com/threerings/stage/util/StageContext.as
diff --git a/src/main/as/com/threerings/whirled/client/PendingData.as b/aslib/src/main/as/com/threerings/whirled/client/PendingData.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/client/PendingData.as
rename to aslib/src/main/as/com/threerings/whirled/client/PendingData.as
diff --git a/src/main/as/com/threerings/whirled/client/SceneController.as b/aslib/src/main/as/com/threerings/whirled/client/SceneController.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/client/SceneController.as
rename to aslib/src/main/as/com/threerings/whirled/client/SceneController.as
diff --git a/src/main/as/com/threerings/whirled/client/SceneDecoder.as b/aslib/src/main/as/com/threerings/whirled/client/SceneDecoder.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/client/SceneDecoder.as
rename to aslib/src/main/as/com/threerings/whirled/client/SceneDecoder.as
diff --git a/src/main/as/com/threerings/whirled/client/SceneDirector.as b/aslib/src/main/as/com/threerings/whirled/client/SceneDirector.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/client/SceneDirector.as
rename to aslib/src/main/as/com/threerings/whirled/client/SceneDirector.as
diff --git a/src/main/as/com/threerings/whirled/client/SceneDirector_MoveHandler.as b/aslib/src/main/as/com/threerings/whirled/client/SceneDirector_MoveHandler.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/client/SceneDirector_MoveHandler.as
rename to aslib/src/main/as/com/threerings/whirled/client/SceneDirector_MoveHandler.as
diff --git a/src/main/as/com/threerings/whirled/client/SceneReceiver.as b/aslib/src/main/as/com/threerings/whirled/client/SceneReceiver.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/client/SceneReceiver.as
rename to aslib/src/main/as/com/threerings/whirled/client/SceneReceiver.as
diff --git a/src/main/as/com/threerings/whirled/client/SceneService.as b/aslib/src/main/as/com/threerings/whirled/client/SceneService.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/client/SceneService.as
rename to aslib/src/main/as/com/threerings/whirled/client/SceneService.as
diff --git a/src/main/as/com/threerings/whirled/client/SceneService_SceneMoveListener.as b/aslib/src/main/as/com/threerings/whirled/client/SceneService_SceneMoveListener.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/client/SceneService_SceneMoveListener.as
rename to aslib/src/main/as/com/threerings/whirled/client/SceneService_SceneMoveListener.as
diff --git a/src/main/as/com/threerings/whirled/client/persist/SceneRepository.as b/aslib/src/main/as/com/threerings/whirled/client/persist/SceneRepository.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/client/persist/SceneRepository.as
rename to aslib/src/main/as/com/threerings/whirled/client/persist/SceneRepository.as
diff --git a/src/main/as/com/threerings/whirled/data/AuxModel.as b/aslib/src/main/as/com/threerings/whirled/data/AuxModel.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/data/AuxModel.as
rename to aslib/src/main/as/com/threerings/whirled/data/AuxModel.as
diff --git a/src/main/as/com/threerings/whirled/data/DefaultSceneConfig.as b/aslib/src/main/as/com/threerings/whirled/data/DefaultSceneConfig.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/data/DefaultSceneConfig.as
rename to aslib/src/main/as/com/threerings/whirled/data/DefaultSceneConfig.as
diff --git a/src/main/as/com/threerings/whirled/data/Scene.as b/aslib/src/main/as/com/threerings/whirled/data/Scene.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/data/Scene.as
rename to aslib/src/main/as/com/threerings/whirled/data/Scene.as
diff --git a/src/main/as/com/threerings/whirled/data/SceneCodes.as b/aslib/src/main/as/com/threerings/whirled/data/SceneCodes.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/data/SceneCodes.as
rename to aslib/src/main/as/com/threerings/whirled/data/SceneCodes.as
diff --git a/src/main/as/com/threerings/whirled/data/SceneImpl.as b/aslib/src/main/as/com/threerings/whirled/data/SceneImpl.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/data/SceneImpl.as
rename to aslib/src/main/as/com/threerings/whirled/data/SceneImpl.as
diff --git a/src/main/as/com/threerings/whirled/data/SceneMarshaller.as b/aslib/src/main/as/com/threerings/whirled/data/SceneMarshaller.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/data/SceneMarshaller.as
rename to aslib/src/main/as/com/threerings/whirled/data/SceneMarshaller.as
diff --git a/src/main/as/com/threerings/whirled/data/SceneMarshaller_SceneMoveMarshaller.as b/aslib/src/main/as/com/threerings/whirled/data/SceneMarshaller_SceneMoveMarshaller.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/data/SceneMarshaller_SceneMoveMarshaller.as
rename to aslib/src/main/as/com/threerings/whirled/data/SceneMarshaller_SceneMoveMarshaller.as
diff --git a/src/main/as/com/threerings/whirled/data/SceneModel.as b/aslib/src/main/as/com/threerings/whirled/data/SceneModel.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/data/SceneModel.as
rename to aslib/src/main/as/com/threerings/whirled/data/SceneModel.as
diff --git a/src/main/as/com/threerings/whirled/data/SceneObject.as b/aslib/src/main/as/com/threerings/whirled/data/SceneObject.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/data/SceneObject.as
rename to aslib/src/main/as/com/threerings/whirled/data/SceneObject.as
diff --git a/src/main/as/com/threerings/whirled/data/ScenePlace.as b/aslib/src/main/as/com/threerings/whirled/data/ScenePlace.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/data/ScenePlace.as
rename to aslib/src/main/as/com/threerings/whirled/data/ScenePlace.as
diff --git a/src/main/as/com/threerings/whirled/data/SceneUpdate.as b/aslib/src/main/as/com/threerings/whirled/data/SceneUpdate.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/data/SceneUpdate.as
rename to aslib/src/main/as/com/threerings/whirled/data/SceneUpdate.as
diff --git a/src/main/as/com/threerings/whirled/spot/client/SpotSceneController.as b/aslib/src/main/as/com/threerings/whirled/spot/client/SpotSceneController.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/spot/client/SpotSceneController.as
rename to aslib/src/main/as/com/threerings/whirled/spot/client/SpotSceneController.as
diff --git a/src/main/as/com/threerings/whirled/spot/client/SpotSceneDirector.as b/aslib/src/main/as/com/threerings/whirled/spot/client/SpotSceneDirector.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/spot/client/SpotSceneDirector.as
rename to aslib/src/main/as/com/threerings/whirled/spot/client/SpotSceneDirector.as
diff --git a/src/main/as/com/threerings/whirled/spot/client/SpotService.as b/aslib/src/main/as/com/threerings/whirled/spot/client/SpotService.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/spot/client/SpotService.as
rename to aslib/src/main/as/com/threerings/whirled/spot/client/SpotService.as
diff --git a/src/main/as/com/threerings/whirled/spot/client/SpotService_SpotSceneMoveListener.as b/aslib/src/main/as/com/threerings/whirled/spot/client/SpotService_SpotSceneMoveListener.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/spot/client/SpotService_SpotSceneMoveListener.as
rename to aslib/src/main/as/com/threerings/whirled/spot/client/SpotService_SpotSceneMoveListener.as
diff --git a/src/main/as/com/threerings/whirled/spot/data/Cluster.as b/aslib/src/main/as/com/threerings/whirled/spot/data/Cluster.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/spot/data/Cluster.as
rename to aslib/src/main/as/com/threerings/whirled/spot/data/Cluster.as
diff --git a/src/main/as/com/threerings/whirled/spot/data/ClusterObject.as b/aslib/src/main/as/com/threerings/whirled/spot/data/ClusterObject.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/spot/data/ClusterObject.as
rename to aslib/src/main/as/com/threerings/whirled/spot/data/ClusterObject.as
diff --git a/src/main/as/com/threerings/whirled/spot/data/ClusteredBodyObject.as b/aslib/src/main/as/com/threerings/whirled/spot/data/ClusteredBodyObject.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/spot/data/ClusteredBodyObject.as
rename to aslib/src/main/as/com/threerings/whirled/spot/data/ClusteredBodyObject.as
diff --git a/src/main/as/com/threerings/whirled/spot/data/Location.as b/aslib/src/main/as/com/threerings/whirled/spot/data/Location.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/spot/data/Location.as
rename to aslib/src/main/as/com/threerings/whirled/spot/data/Location.as
diff --git a/src/main/as/com/threerings/whirled/spot/data/ModifyPortalsUpdate.as b/aslib/src/main/as/com/threerings/whirled/spot/data/ModifyPortalsUpdate.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/spot/data/ModifyPortalsUpdate.as
rename to aslib/src/main/as/com/threerings/whirled/spot/data/ModifyPortalsUpdate.as
diff --git a/src/main/as/com/threerings/whirled/spot/data/Portal.as b/aslib/src/main/as/com/threerings/whirled/spot/data/Portal.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/spot/data/Portal.as
rename to aslib/src/main/as/com/threerings/whirled/spot/data/Portal.as
diff --git a/src/main/as/com/threerings/whirled/spot/data/SceneLocation.as b/aslib/src/main/as/com/threerings/whirled/spot/data/SceneLocation.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/spot/data/SceneLocation.as
rename to aslib/src/main/as/com/threerings/whirled/spot/data/SceneLocation.as
diff --git a/src/main/as/com/threerings/whirled/spot/data/SpotCodes.as b/aslib/src/main/as/com/threerings/whirled/spot/data/SpotCodes.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/spot/data/SpotCodes.as
rename to aslib/src/main/as/com/threerings/whirled/spot/data/SpotCodes.as
diff --git a/src/main/as/com/threerings/whirled/spot/data/SpotMarshaller.as b/aslib/src/main/as/com/threerings/whirled/spot/data/SpotMarshaller.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/spot/data/SpotMarshaller.as
rename to aslib/src/main/as/com/threerings/whirled/spot/data/SpotMarshaller.as
diff --git a/src/main/as/com/threerings/whirled/spot/data/SpotMarshaller_SpotSceneMoveMarshaller.as b/aslib/src/main/as/com/threerings/whirled/spot/data/SpotMarshaller_SpotSceneMoveMarshaller.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/spot/data/SpotMarshaller_SpotSceneMoveMarshaller.as
rename to aslib/src/main/as/com/threerings/whirled/spot/data/SpotMarshaller_SpotSceneMoveMarshaller.as
diff --git a/src/main/as/com/threerings/whirled/spot/data/SpotScene.as b/aslib/src/main/as/com/threerings/whirled/spot/data/SpotScene.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/spot/data/SpotScene.as
rename to aslib/src/main/as/com/threerings/whirled/spot/data/SpotScene.as
diff --git a/src/main/as/com/threerings/whirled/spot/data/SpotSceneImpl.as b/aslib/src/main/as/com/threerings/whirled/spot/data/SpotSceneImpl.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/spot/data/SpotSceneImpl.as
rename to aslib/src/main/as/com/threerings/whirled/spot/data/SpotSceneImpl.as
diff --git a/src/main/as/com/threerings/whirled/spot/data/SpotSceneModel.as b/aslib/src/main/as/com/threerings/whirled/spot/data/SpotSceneModel.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/spot/data/SpotSceneModel.as
rename to aslib/src/main/as/com/threerings/whirled/spot/data/SpotSceneModel.as
diff --git a/src/main/as/com/threerings/whirled/spot/data/SpotSceneObject.as b/aslib/src/main/as/com/threerings/whirled/spot/data/SpotSceneObject.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/spot/data/SpotSceneObject.as
rename to aslib/src/main/as/com/threerings/whirled/spot/data/SpotSceneObject.as
diff --git a/src/main/as/com/threerings/whirled/util/NoSuchSceneError.as b/aslib/src/main/as/com/threerings/whirled/util/NoSuchSceneError.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/util/NoSuchSceneError.as
rename to aslib/src/main/as/com/threerings/whirled/util/NoSuchSceneError.as
diff --git a/src/main/as/com/threerings/whirled/util/SceneFactory.as b/aslib/src/main/as/com/threerings/whirled/util/SceneFactory.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/util/SceneFactory.as
rename to aslib/src/main/as/com/threerings/whirled/util/SceneFactory.as
diff --git a/src/main/as/com/threerings/whirled/util/UpdateList.as b/aslib/src/main/as/com/threerings/whirled/util/UpdateList.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/util/UpdateList.as
rename to aslib/src/main/as/com/threerings/whirled/util/UpdateList.as
diff --git a/src/main/as/com/threerings/whirled/util/WhirledContext.as b/aslib/src/main/as/com/threerings/whirled/util/WhirledContext.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/util/WhirledContext.as
rename to aslib/src/main/as/com/threerings/whirled/util/WhirledContext.as
diff --git a/src/main/as/com/threerings/whirled/zone/client/ZoneDecoder.as b/aslib/src/main/as/com/threerings/whirled/zone/client/ZoneDecoder.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/zone/client/ZoneDecoder.as
rename to aslib/src/main/as/com/threerings/whirled/zone/client/ZoneDecoder.as
diff --git a/src/main/as/com/threerings/whirled/zone/client/ZoneDirector.as b/aslib/src/main/as/com/threerings/whirled/zone/client/ZoneDirector.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/zone/client/ZoneDirector.as
rename to aslib/src/main/as/com/threerings/whirled/zone/client/ZoneDirector.as
diff --git a/src/main/as/com/threerings/whirled/zone/client/ZoneObserver.as b/aslib/src/main/as/com/threerings/whirled/zone/client/ZoneObserver.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/zone/client/ZoneObserver.as
rename to aslib/src/main/as/com/threerings/whirled/zone/client/ZoneObserver.as
diff --git a/src/main/as/com/threerings/whirled/zone/client/ZoneReceiver.as b/aslib/src/main/as/com/threerings/whirled/zone/client/ZoneReceiver.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/zone/client/ZoneReceiver.as
rename to aslib/src/main/as/com/threerings/whirled/zone/client/ZoneReceiver.as
diff --git a/src/main/as/com/threerings/whirled/zone/client/ZoneService.as b/aslib/src/main/as/com/threerings/whirled/zone/client/ZoneService.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/zone/client/ZoneService.as
rename to aslib/src/main/as/com/threerings/whirled/zone/client/ZoneService.as
diff --git a/src/main/as/com/threerings/whirled/zone/client/ZoneService_ZoneMoveListener.as b/aslib/src/main/as/com/threerings/whirled/zone/client/ZoneService_ZoneMoveListener.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/zone/client/ZoneService_ZoneMoveListener.as
rename to aslib/src/main/as/com/threerings/whirled/zone/client/ZoneService_ZoneMoveListener.as
diff --git a/src/main/as/com/threerings/whirled/zone/data/SceneSummary.as b/aslib/src/main/as/com/threerings/whirled/zone/data/SceneSummary.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/zone/data/SceneSummary.as
rename to aslib/src/main/as/com/threerings/whirled/zone/data/SceneSummary.as
diff --git a/src/main/as/com/threerings/whirled/zone/data/ZoneMarshaller.as b/aslib/src/main/as/com/threerings/whirled/zone/data/ZoneMarshaller.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/zone/data/ZoneMarshaller.as
rename to aslib/src/main/as/com/threerings/whirled/zone/data/ZoneMarshaller.as
diff --git a/src/main/as/com/threerings/whirled/zone/data/ZoneMarshaller_ZoneMoveMarshaller.as b/aslib/src/main/as/com/threerings/whirled/zone/data/ZoneMarshaller_ZoneMoveMarshaller.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/zone/data/ZoneMarshaller_ZoneMoveMarshaller.as
rename to aslib/src/main/as/com/threerings/whirled/zone/data/ZoneMarshaller_ZoneMoveMarshaller.as
diff --git a/src/main/as/com/threerings/whirled/zone/data/ZoneSummary.as b/aslib/src/main/as/com/threerings/whirled/zone/data/ZoneSummary.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/zone/data/ZoneSummary.as
rename to aslib/src/main/as/com/threerings/whirled/zone/data/ZoneSummary.as
diff --git a/src/main/as/com/threerings/whirled/zone/util/ZoneUtil.as b/aslib/src/main/as/com/threerings/whirled/zone/util/ZoneUtil.as
similarity index 100%
rename from src/main/as/com/threerings/whirled/zone/util/ZoneUtil.as
rename to aslib/src/main/as/com/threerings/whirled/zone/util/ZoneUtil.as
diff --git a/core/pom.xml b/core/pom.xml
new file mode 100644
index 00000000..f678fbac
--- /dev/null
+++ b/core/pom.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.threerings</groupId>
+    <artifactId>vilya-parent</artifactId>
+    <version>1.6-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>vilya</artifactId>
+  <packaging>jar</packaging>
+  <name>Vilya Core</name>
+
+  <dependencies>
+    <!-- exported dependencies -->
+    <dependency>
+      <groupId>com.threerings</groupId>
+      <artifactId>ooo-util</artifactId>
+      <version>1.3.2</version>
+    </dependency>
+    <dependency>
+      <groupId>com.threerings</groupId>
+      <artifactId>narya</artifactId>
+      <version>1.14</version>
+    </dependency>
+    <dependency>
+      <groupId>com.threerings</groupId>
+      <artifactId>nenya</artifactId>
+      <version>1.5</version>
+    </dependency>
+
+    <!-- optional dependencies -->
+    <dependency>
+      <groupId>com.threerings</groupId>
+      <artifactId>nenya-tools</artifactId>
+      <version>1.5</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>commons-digester</groupId>
+      <artifactId>commons-digester</artifactId>
+      <version>2.0</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.samskivert</groupId>
+      <artifactId>depot</artifactId>
+      <version>1.6.1</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javassist</groupId>
+      <artifactId>javassist</artifactId>
+      <version>3.8.0.GA</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.megginson.sax</groupId>
+      <artifactId>xml-writer</artifactId>
+      <version>0.2</version>
+      <optional>true</optional>
+    </dependency>
+
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.10</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.7</version>
+        <configuration>
+          <quiet>true</quiet>
+          <show>public</show>
+          <links>
+            <link>http://samskivert.github.com/samskivert/apidocs/</link>
+            <link>http://depot.googlecode.com/svn/apidocs/</link>
+            <link>http://docs.guava-libraries.googlecode.com/git/javadoc/</link>
+            <link>http://google-web-toolkit.googlecode.com/svn/javadoc/2.1/</link>
+          </links>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.6</version>
+        <configuration>
+          <includes>
+            <include>com/threerings/**/*Test.java</include>
+          </includes>
+          <systemPropertyVariables>
+            <test_dir>target/test-classes</test_dir>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/src/main/java/com/threerings/micasa/Log.java b/core/src/main/java/com/threerings/micasa/Log.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/Log.java
rename to core/src/main/java/com/threerings/micasa/Log.java
diff --git a/src/main/java/com/threerings/micasa/client/ChatPanel.java b/core/src/main/java/com/threerings/micasa/client/ChatPanel.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/client/ChatPanel.java
rename to core/src/main/java/com/threerings/micasa/client/ChatPanel.java
diff --git a/src/main/java/com/threerings/micasa/client/ClientController.java b/core/src/main/java/com/threerings/micasa/client/ClientController.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/client/ClientController.java
rename to core/src/main/java/com/threerings/micasa/client/ClientController.java
diff --git a/src/main/java/com/threerings/micasa/client/LogonPanel.java b/core/src/main/java/com/threerings/micasa/client/LogonPanel.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/client/LogonPanel.java
rename to core/src/main/java/com/threerings/micasa/client/LogonPanel.java
diff --git a/src/main/java/com/threerings/micasa/client/MiCasaApp.java b/core/src/main/java/com/threerings/micasa/client/MiCasaApp.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/client/MiCasaApp.java
rename to core/src/main/java/com/threerings/micasa/client/MiCasaApp.java
diff --git a/src/main/java/com/threerings/micasa/client/MiCasaApplet.java b/core/src/main/java/com/threerings/micasa/client/MiCasaApplet.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/client/MiCasaApplet.java
rename to core/src/main/java/com/threerings/micasa/client/MiCasaApplet.java
diff --git a/src/main/java/com/threerings/micasa/client/MiCasaClient.java b/core/src/main/java/com/threerings/micasa/client/MiCasaClient.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/client/MiCasaClient.java
rename to core/src/main/java/com/threerings/micasa/client/MiCasaClient.java
diff --git a/src/main/java/com/threerings/micasa/client/MiCasaFrame.java b/core/src/main/java/com/threerings/micasa/client/MiCasaFrame.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/client/MiCasaFrame.java
rename to core/src/main/java/com/threerings/micasa/client/MiCasaFrame.java
diff --git a/src/main/java/com/threerings/micasa/client/OccupantList.java b/core/src/main/java/com/threerings/micasa/client/OccupantList.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/client/OccupantList.java
rename to core/src/main/java/com/threerings/micasa/client/OccupantList.java
diff --git a/src/main/java/com/threerings/micasa/data/MiCasaBootstrapData.java b/core/src/main/java/com/threerings/micasa/data/MiCasaBootstrapData.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/data/MiCasaBootstrapData.java
rename to core/src/main/java/com/threerings/micasa/data/MiCasaBootstrapData.java
diff --git a/src/main/java/com/threerings/micasa/lobby/Lobby.java b/core/src/main/java/com/threerings/micasa/lobby/Lobby.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/lobby/Lobby.java
rename to core/src/main/java/com/threerings/micasa/lobby/Lobby.java
diff --git a/src/main/java/com/threerings/micasa/lobby/LobbyConfig.java b/core/src/main/java/com/threerings/micasa/lobby/LobbyConfig.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/lobby/LobbyConfig.java
rename to core/src/main/java/com/threerings/micasa/lobby/LobbyConfig.java
diff --git a/src/main/java/com/threerings/micasa/lobby/LobbyController.java b/core/src/main/java/com/threerings/micasa/lobby/LobbyController.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/lobby/LobbyController.java
rename to core/src/main/java/com/threerings/micasa/lobby/LobbyController.java
diff --git a/src/main/java/com/threerings/micasa/lobby/LobbyManager.java b/core/src/main/java/com/threerings/micasa/lobby/LobbyManager.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/lobby/LobbyManager.java
rename to core/src/main/java/com/threerings/micasa/lobby/LobbyManager.java
diff --git a/src/main/java/com/threerings/micasa/lobby/LobbyMarshaller.java b/core/src/main/java/com/threerings/micasa/lobby/LobbyMarshaller.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/lobby/LobbyMarshaller.java
rename to core/src/main/java/com/threerings/micasa/lobby/LobbyMarshaller.java
diff --git a/src/main/java/com/threerings/micasa/lobby/LobbyObject.java b/core/src/main/java/com/threerings/micasa/lobby/LobbyObject.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/lobby/LobbyObject.java
rename to core/src/main/java/com/threerings/micasa/lobby/LobbyObject.java
diff --git a/src/main/java/com/threerings/micasa/lobby/LobbyPanel.java b/core/src/main/java/com/threerings/micasa/lobby/LobbyPanel.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/lobby/LobbyPanel.java
rename to core/src/main/java/com/threerings/micasa/lobby/LobbyPanel.java
diff --git a/src/main/java/com/threerings/micasa/lobby/LobbyProvider.java b/core/src/main/java/com/threerings/micasa/lobby/LobbyProvider.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/lobby/LobbyProvider.java
rename to core/src/main/java/com/threerings/micasa/lobby/LobbyProvider.java
diff --git a/src/main/java/com/threerings/micasa/lobby/LobbyRegistry.java b/core/src/main/java/com/threerings/micasa/lobby/LobbyRegistry.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/lobby/LobbyRegistry.java
rename to core/src/main/java/com/threerings/micasa/lobby/LobbyRegistry.java
diff --git a/src/main/java/com/threerings/micasa/lobby/LobbySelector.java b/core/src/main/java/com/threerings/micasa/lobby/LobbySelector.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/lobby/LobbySelector.java
rename to core/src/main/java/com/threerings/micasa/lobby/LobbySelector.java
diff --git a/src/main/java/com/threerings/micasa/lobby/LobbyService.java b/core/src/main/java/com/threerings/micasa/lobby/LobbyService.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/lobby/LobbyService.java
rename to core/src/main/java/com/threerings/micasa/lobby/LobbyService.java
diff --git a/src/main/java/com/threerings/micasa/lobby/table/TableItem.java b/core/src/main/java/com/threerings/micasa/lobby/table/TableItem.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/lobby/table/TableItem.java
rename to core/src/main/java/com/threerings/micasa/lobby/table/TableItem.java
diff --git a/src/main/java/com/threerings/micasa/lobby/table/TableListView.java b/core/src/main/java/com/threerings/micasa/lobby/table/TableListView.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/lobby/table/TableListView.java
rename to core/src/main/java/com/threerings/micasa/lobby/table/TableListView.java
diff --git a/src/main/java/com/threerings/micasa/lobby/table/TableLobbyConfig.java b/core/src/main/java/com/threerings/micasa/lobby/table/TableLobbyConfig.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/lobby/table/TableLobbyConfig.java
rename to core/src/main/java/com/threerings/micasa/lobby/table/TableLobbyConfig.java
diff --git a/src/main/java/com/threerings/micasa/lobby/table/TableLobbyManager.java b/core/src/main/java/com/threerings/micasa/lobby/table/TableLobbyManager.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/lobby/table/TableLobbyManager.java
rename to core/src/main/java/com/threerings/micasa/lobby/table/TableLobbyManager.java
diff --git a/src/main/java/com/threerings/micasa/lobby/table/TableLobbyObject.java b/core/src/main/java/com/threerings/micasa/lobby/table/TableLobbyObject.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/lobby/table/TableLobbyObject.java
rename to core/src/main/java/com/threerings/micasa/lobby/table/TableLobbyObject.java
diff --git a/src/main/java/com/threerings/micasa/server/MiCasaConfig.java b/core/src/main/java/com/threerings/micasa/server/MiCasaConfig.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/server/MiCasaConfig.java
rename to core/src/main/java/com/threerings/micasa/server/MiCasaConfig.java
diff --git a/src/main/java/com/threerings/micasa/server/MiCasaServer.java b/core/src/main/java/com/threerings/micasa/server/MiCasaServer.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/server/MiCasaServer.java
rename to core/src/main/java/com/threerings/micasa/server/MiCasaServer.java
diff --git a/src/main/java/com/threerings/micasa/server/MiCasaSession.java b/core/src/main/java/com/threerings/micasa/server/MiCasaSession.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/server/MiCasaSession.java
rename to core/src/main/java/com/threerings/micasa/server/MiCasaSession.java
diff --git a/src/main/java/com/threerings/micasa/simulator/client/SimpleClient.java b/core/src/main/java/com/threerings/micasa/simulator/client/SimpleClient.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/simulator/client/SimpleClient.java
rename to core/src/main/java/com/threerings/micasa/simulator/client/SimpleClient.java
diff --git a/src/main/java/com/threerings/micasa/simulator/client/SimpleFrame.java b/core/src/main/java/com/threerings/micasa/simulator/client/SimpleFrame.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/simulator/client/SimpleFrame.java
rename to core/src/main/java/com/threerings/micasa/simulator/client/SimpleFrame.java
diff --git a/src/main/java/com/threerings/micasa/simulator/client/SimulatorApp.java b/core/src/main/java/com/threerings/micasa/simulator/client/SimulatorApp.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/simulator/client/SimulatorApp.java
rename to core/src/main/java/com/threerings/micasa/simulator/client/SimulatorApp.java
diff --git a/src/main/java/com/threerings/micasa/simulator/client/SimulatorClient.java b/core/src/main/java/com/threerings/micasa/simulator/client/SimulatorClient.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/simulator/client/SimulatorClient.java
rename to core/src/main/java/com/threerings/micasa/simulator/client/SimulatorClient.java
diff --git a/src/main/java/com/threerings/micasa/simulator/client/SimulatorController.java b/core/src/main/java/com/threerings/micasa/simulator/client/SimulatorController.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/simulator/client/SimulatorController.java
rename to core/src/main/java/com/threerings/micasa/simulator/client/SimulatorController.java
diff --git a/src/main/java/com/threerings/micasa/simulator/client/SimulatorFrame.java b/core/src/main/java/com/threerings/micasa/simulator/client/SimulatorFrame.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/simulator/client/SimulatorFrame.java
rename to core/src/main/java/com/threerings/micasa/simulator/client/SimulatorFrame.java
diff --git a/src/main/java/com/threerings/micasa/simulator/client/SimulatorService.java b/core/src/main/java/com/threerings/micasa/simulator/client/SimulatorService.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/simulator/client/SimulatorService.java
rename to core/src/main/java/com/threerings/micasa/simulator/client/SimulatorService.java
diff --git a/src/main/java/com/threerings/micasa/simulator/data/SimulatorInfo.java b/core/src/main/java/com/threerings/micasa/simulator/data/SimulatorInfo.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/simulator/data/SimulatorInfo.java
rename to core/src/main/java/com/threerings/micasa/simulator/data/SimulatorInfo.java
diff --git a/src/main/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java b/core/src/main/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java
rename to core/src/main/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java
diff --git a/src/main/java/com/threerings/micasa/simulator/server/SimpleServer.java b/core/src/main/java/com/threerings/micasa/simulator/server/SimpleServer.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/simulator/server/SimpleServer.java
rename to core/src/main/java/com/threerings/micasa/simulator/server/SimpleServer.java
diff --git a/src/main/java/com/threerings/micasa/simulator/server/Simulant.java b/core/src/main/java/com/threerings/micasa/simulator/server/Simulant.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/simulator/server/Simulant.java
rename to core/src/main/java/com/threerings/micasa/simulator/server/Simulant.java
diff --git a/src/main/java/com/threerings/micasa/simulator/server/SimulatorManager.java b/core/src/main/java/com/threerings/micasa/simulator/server/SimulatorManager.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/simulator/server/SimulatorManager.java
rename to core/src/main/java/com/threerings/micasa/simulator/server/SimulatorManager.java
diff --git a/src/main/java/com/threerings/micasa/simulator/server/SimulatorProvider.java b/core/src/main/java/com/threerings/micasa/simulator/server/SimulatorProvider.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/simulator/server/SimulatorProvider.java
rename to core/src/main/java/com/threerings/micasa/simulator/server/SimulatorProvider.java
diff --git a/src/main/java/com/threerings/micasa/simulator/server/SimulatorServer.java b/core/src/main/java/com/threerings/micasa/simulator/server/SimulatorServer.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/simulator/server/SimulatorServer.java
rename to core/src/main/java/com/threerings/micasa/simulator/server/SimulatorServer.java
diff --git a/src/main/java/com/threerings/micasa/simulator/util/SimulatorContext.java b/core/src/main/java/com/threerings/micasa/simulator/util/SimulatorContext.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/simulator/util/SimulatorContext.java
rename to core/src/main/java/com/threerings/micasa/simulator/util/SimulatorContext.java
diff --git a/src/main/java/com/threerings/micasa/util/MiCasaContext.java b/core/src/main/java/com/threerings/micasa/util/MiCasaContext.java
similarity index 100%
rename from src/main/java/com/threerings/micasa/util/MiCasaContext.java
rename to core/src/main/java/com/threerings/micasa/util/MiCasaContext.java
diff --git a/src/main/java/com/threerings/parlor/Log.java b/core/src/main/java/com/threerings/parlor/Log.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/Log.java
rename to core/src/main/java/com/threerings/parlor/Log.java
diff --git a/src/main/java/com/threerings/parlor/card/Log.java b/core/src/main/java/com/threerings/parlor/card/Log.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/card/Log.java
rename to core/src/main/java/com/threerings/parlor/card/Log.java
diff --git a/src/main/java/com/threerings/parlor/card/client/CardGameController.java b/core/src/main/java/com/threerings/parlor/card/client/CardGameController.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/card/client/CardGameController.java
rename to core/src/main/java/com/threerings/parlor/card/client/CardGameController.java
diff --git a/src/main/java/com/threerings/parlor/card/client/CardGameDecoder.java b/core/src/main/java/com/threerings/parlor/card/client/CardGameDecoder.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/card/client/CardGameDecoder.java
rename to core/src/main/java/com/threerings/parlor/card/client/CardGameDecoder.java
diff --git a/src/main/java/com/threerings/parlor/card/client/CardGameReceiver.java b/core/src/main/java/com/threerings/parlor/card/client/CardGameReceiver.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/card/client/CardGameReceiver.java
rename to core/src/main/java/com/threerings/parlor/card/client/CardGameReceiver.java
diff --git a/src/main/java/com/threerings/parlor/card/client/CardPanel.java b/core/src/main/java/com/threerings/parlor/card/client/CardPanel.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/card/client/CardPanel.java
rename to core/src/main/java/com/threerings/parlor/card/client/CardPanel.java
diff --git a/src/main/java/com/threerings/parlor/card/client/CardSprite.java b/core/src/main/java/com/threerings/parlor/card/client/CardSprite.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/card/client/CardSprite.java
rename to core/src/main/java/com/threerings/parlor/card/client/CardSprite.java
diff --git a/src/main/java/com/threerings/parlor/card/client/CardSpriteObserver.java b/core/src/main/java/com/threerings/parlor/card/client/CardSpriteObserver.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/card/client/CardSpriteObserver.java
rename to core/src/main/java/com/threerings/parlor/card/client/CardSpriteObserver.java
diff --git a/src/main/java/com/threerings/parlor/card/client/MicroCardSprite.java b/core/src/main/java/com/threerings/parlor/card/client/MicroCardSprite.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/card/client/MicroCardSprite.java
rename to core/src/main/java/com/threerings/parlor/card/client/MicroCardSprite.java
diff --git a/src/main/java/com/threerings/parlor/card/data/Card.java b/core/src/main/java/com/threerings/parlor/card/data/Card.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/card/data/Card.java
rename to core/src/main/java/com/threerings/parlor/card/data/Card.java
diff --git a/src/main/java/com/threerings/parlor/card/data/CardCodes.java b/core/src/main/java/com/threerings/parlor/card/data/CardCodes.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/card/data/CardCodes.java
rename to core/src/main/java/com/threerings/parlor/card/data/CardCodes.java
diff --git a/src/main/java/com/threerings/parlor/card/data/CardGameObject.java b/core/src/main/java/com/threerings/parlor/card/data/CardGameObject.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/card/data/CardGameObject.java
rename to core/src/main/java/com/threerings/parlor/card/data/CardGameObject.java
diff --git a/src/main/java/com/threerings/parlor/card/data/Deck.java b/core/src/main/java/com/threerings/parlor/card/data/Deck.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/card/data/Deck.java
rename to core/src/main/java/com/threerings/parlor/card/data/Deck.java
diff --git a/src/main/java/com/threerings/parlor/card/data/Hand.java b/core/src/main/java/com/threerings/parlor/card/data/Hand.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/card/data/Hand.java
rename to core/src/main/java/com/threerings/parlor/card/data/Hand.java
diff --git a/src/main/java/com/threerings/parlor/card/data/PlayerCard.java b/core/src/main/java/com/threerings/parlor/card/data/PlayerCard.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/card/data/PlayerCard.java
rename to core/src/main/java/com/threerings/parlor/card/data/PlayerCard.java
diff --git a/src/main/java/com/threerings/parlor/card/server/CardGameManager.java b/core/src/main/java/com/threerings/parlor/card/server/CardGameManager.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/card/server/CardGameManager.java
rename to core/src/main/java/com/threerings/parlor/card/server/CardGameManager.java
diff --git a/src/main/java/com/threerings/parlor/card/server/CardGameSender.java b/core/src/main/java/com/threerings/parlor/card/server/CardGameSender.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/card/server/CardGameSender.java
rename to core/src/main/java/com/threerings/parlor/card/server/CardGameSender.java
diff --git a/src/main/java/com/threerings/parlor/card/trick/client/TrickCardGameControllerDelegate.java b/core/src/main/java/com/threerings/parlor/card/trick/client/TrickCardGameControllerDelegate.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/card/trick/client/TrickCardGameControllerDelegate.java
rename to core/src/main/java/com/threerings/parlor/card/trick/client/TrickCardGameControllerDelegate.java
diff --git a/src/main/java/com/threerings/parlor/card/trick/client/TrickCardGameService.java b/core/src/main/java/com/threerings/parlor/card/trick/client/TrickCardGameService.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/card/trick/client/TrickCardGameService.java
rename to core/src/main/java/com/threerings/parlor/card/trick/client/TrickCardGameService.java
diff --git a/src/main/java/com/threerings/parlor/card/trick/data/TrickCardCodes.java b/core/src/main/java/com/threerings/parlor/card/trick/data/TrickCardCodes.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/card/trick/data/TrickCardCodes.java
rename to core/src/main/java/com/threerings/parlor/card/trick/data/TrickCardCodes.java
diff --git a/src/main/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java b/core/src/main/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java
rename to core/src/main/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java
diff --git a/src/main/java/com/threerings/parlor/card/trick/data/TrickCardGameObject.java b/core/src/main/java/com/threerings/parlor/card/trick/data/TrickCardGameObject.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/card/trick/data/TrickCardGameObject.java
rename to core/src/main/java/com/threerings/parlor/card/trick/data/TrickCardGameObject.java
diff --git a/src/main/java/com/threerings/parlor/card/trick/server/TrickCardGameManagerDelegate.java b/core/src/main/java/com/threerings/parlor/card/trick/server/TrickCardGameManagerDelegate.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/card/trick/server/TrickCardGameManagerDelegate.java
rename to core/src/main/java/com/threerings/parlor/card/trick/server/TrickCardGameManagerDelegate.java
diff --git a/src/main/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java b/core/src/main/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java
rename to core/src/main/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java
diff --git a/src/main/java/com/threerings/parlor/card/trick/util/TrickCardGameUtil.java b/core/src/main/java/com/threerings/parlor/card/trick/util/TrickCardGameUtil.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/card/trick/util/TrickCardGameUtil.java
rename to core/src/main/java/com/threerings/parlor/card/trick/util/TrickCardGameUtil.java
diff --git a/src/main/java/com/threerings/parlor/client/DefaultSwingTableConfigurator.java b/core/src/main/java/com/threerings/parlor/client/DefaultSwingTableConfigurator.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/client/DefaultSwingTableConfigurator.java
rename to core/src/main/java/com/threerings/parlor/client/DefaultSwingTableConfigurator.java
diff --git a/src/main/java/com/threerings/parlor/client/GameReadyObserver.java b/core/src/main/java/com/threerings/parlor/client/GameReadyObserver.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/client/GameReadyObserver.java
rename to core/src/main/java/com/threerings/parlor/client/GameReadyObserver.java
diff --git a/src/main/java/com/threerings/parlor/client/Invitation.java b/core/src/main/java/com/threerings/parlor/client/Invitation.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/client/Invitation.java
rename to core/src/main/java/com/threerings/parlor/client/Invitation.java
diff --git a/src/main/java/com/threerings/parlor/client/InvitationHandler.java b/core/src/main/java/com/threerings/parlor/client/InvitationHandler.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/client/InvitationHandler.java
rename to core/src/main/java/com/threerings/parlor/client/InvitationHandler.java
diff --git a/src/main/java/com/threerings/parlor/client/InvitationResponseObserver.java b/core/src/main/java/com/threerings/parlor/client/InvitationResponseObserver.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/client/InvitationResponseObserver.java
rename to core/src/main/java/com/threerings/parlor/client/InvitationResponseObserver.java
diff --git a/src/main/java/com/threerings/parlor/client/ParlorDecoder.java b/core/src/main/java/com/threerings/parlor/client/ParlorDecoder.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/client/ParlorDecoder.java
rename to core/src/main/java/com/threerings/parlor/client/ParlorDecoder.java
diff --git a/src/main/java/com/threerings/parlor/client/ParlorDirector.java b/core/src/main/java/com/threerings/parlor/client/ParlorDirector.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/client/ParlorDirector.java
rename to core/src/main/java/com/threerings/parlor/client/ParlorDirector.java
diff --git a/src/main/java/com/threerings/parlor/client/ParlorReceiver.java b/core/src/main/java/com/threerings/parlor/client/ParlorReceiver.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/client/ParlorReceiver.java
rename to core/src/main/java/com/threerings/parlor/client/ParlorReceiver.java
diff --git a/src/main/java/com/threerings/parlor/client/ParlorService.java b/core/src/main/java/com/threerings/parlor/client/ParlorService.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/client/ParlorService.java
rename to core/src/main/java/com/threerings/parlor/client/ParlorService.java
diff --git a/src/main/java/com/threerings/parlor/client/SeatednessObserver.java b/core/src/main/java/com/threerings/parlor/client/SeatednessObserver.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/client/SeatednessObserver.java
rename to core/src/main/java/com/threerings/parlor/client/SeatednessObserver.java
diff --git a/src/main/java/com/threerings/parlor/client/TableConfigurator.java b/core/src/main/java/com/threerings/parlor/client/TableConfigurator.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/client/TableConfigurator.java
rename to core/src/main/java/com/threerings/parlor/client/TableConfigurator.java
diff --git a/src/main/java/com/threerings/parlor/client/TableDirector.java b/core/src/main/java/com/threerings/parlor/client/TableDirector.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/client/TableDirector.java
rename to core/src/main/java/com/threerings/parlor/client/TableDirector.java
diff --git a/src/main/java/com/threerings/parlor/client/TableObserver.java b/core/src/main/java/com/threerings/parlor/client/TableObserver.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/client/TableObserver.java
rename to core/src/main/java/com/threerings/parlor/client/TableObserver.java
diff --git a/src/main/java/com/threerings/parlor/client/TableService.java b/core/src/main/java/com/threerings/parlor/client/TableService.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/client/TableService.java
rename to core/src/main/java/com/threerings/parlor/client/TableService.java
diff --git a/src/main/java/com/threerings/parlor/data/ChoiceParameter.java b/core/src/main/java/com/threerings/parlor/data/ChoiceParameter.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/data/ChoiceParameter.java
rename to core/src/main/java/com/threerings/parlor/data/ChoiceParameter.java
diff --git a/src/main/java/com/threerings/parlor/data/Parameter.java b/core/src/main/java/com/threerings/parlor/data/Parameter.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/data/Parameter.java
rename to core/src/main/java/com/threerings/parlor/data/Parameter.java
diff --git a/src/main/java/com/threerings/parlor/data/ParlorCodes.java b/core/src/main/java/com/threerings/parlor/data/ParlorCodes.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/data/ParlorCodes.java
rename to core/src/main/java/com/threerings/parlor/data/ParlorCodes.java
diff --git a/src/main/java/com/threerings/parlor/data/ParlorMarshaller.java b/core/src/main/java/com/threerings/parlor/data/ParlorMarshaller.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/data/ParlorMarshaller.java
rename to core/src/main/java/com/threerings/parlor/data/ParlorMarshaller.java
diff --git a/src/main/java/com/threerings/parlor/data/RangeParameter.java b/core/src/main/java/com/threerings/parlor/data/RangeParameter.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/data/RangeParameter.java
rename to core/src/main/java/com/threerings/parlor/data/RangeParameter.java
diff --git a/src/main/java/com/threerings/parlor/data/Table.java b/core/src/main/java/com/threerings/parlor/data/Table.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/data/Table.java
rename to core/src/main/java/com/threerings/parlor/data/Table.java
diff --git a/src/main/java/com/threerings/parlor/data/TableConfig.java b/core/src/main/java/com/threerings/parlor/data/TableConfig.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/data/TableConfig.java
rename to core/src/main/java/com/threerings/parlor/data/TableConfig.java
diff --git a/src/main/java/com/threerings/parlor/data/TableLobbyObject.java b/core/src/main/java/com/threerings/parlor/data/TableLobbyObject.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/data/TableLobbyObject.java
rename to core/src/main/java/com/threerings/parlor/data/TableLobbyObject.java
diff --git a/src/main/java/com/threerings/parlor/data/TableMarshaller.java b/core/src/main/java/com/threerings/parlor/data/TableMarshaller.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/data/TableMarshaller.java
rename to core/src/main/java/com/threerings/parlor/data/TableMarshaller.java
diff --git a/src/main/java/com/threerings/parlor/data/ToggleParameter.java b/core/src/main/java/com/threerings/parlor/data/ToggleParameter.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/data/ToggleParameter.java
rename to core/src/main/java/com/threerings/parlor/data/ToggleParameter.java
diff --git a/src/main/java/com/threerings/parlor/game/client/GameConfigurator.java b/core/src/main/java/com/threerings/parlor/game/client/GameConfigurator.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/game/client/GameConfigurator.java
rename to core/src/main/java/com/threerings/parlor/game/client/GameConfigurator.java
diff --git a/src/main/java/com/threerings/parlor/game/client/GameController.java b/core/src/main/java/com/threerings/parlor/game/client/GameController.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/game/client/GameController.java
rename to core/src/main/java/com/threerings/parlor/game/client/GameController.java
diff --git a/src/main/java/com/threerings/parlor/game/client/GameControllerDelegate.java b/core/src/main/java/com/threerings/parlor/game/client/GameControllerDelegate.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/game/client/GameControllerDelegate.java
rename to core/src/main/java/com/threerings/parlor/game/client/GameControllerDelegate.java
diff --git a/src/main/java/com/threerings/parlor/game/client/SwingGameConfigurator.java b/core/src/main/java/com/threerings/parlor/game/client/SwingGameConfigurator.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/game/client/SwingGameConfigurator.java
rename to core/src/main/java/com/threerings/parlor/game/client/SwingGameConfigurator.java
diff --git a/src/main/java/com/threerings/parlor/game/data/GameAI.java b/core/src/main/java/com/threerings/parlor/game/data/GameAI.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/game/data/GameAI.java
rename to core/src/main/java/com/threerings/parlor/game/data/GameAI.java
diff --git a/src/main/java/com/threerings/parlor/game/data/GameCodes.java b/core/src/main/java/com/threerings/parlor/game/data/GameCodes.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/game/data/GameCodes.java
rename to core/src/main/java/com/threerings/parlor/game/data/GameCodes.java
diff --git a/src/main/java/com/threerings/parlor/game/data/GameConfig.java b/core/src/main/java/com/threerings/parlor/game/data/GameConfig.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/game/data/GameConfig.java
rename to core/src/main/java/com/threerings/parlor/game/data/GameConfig.java
diff --git a/src/main/java/com/threerings/parlor/game/data/GameObject.java b/core/src/main/java/com/threerings/parlor/game/data/GameObject.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/game/data/GameObject.java
rename to core/src/main/java/com/threerings/parlor/game/data/GameObject.java
diff --git a/src/main/java/com/threerings/parlor/game/data/UserIdentifier.java b/core/src/main/java/com/threerings/parlor/game/data/UserIdentifier.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/game/data/UserIdentifier.java
rename to core/src/main/java/com/threerings/parlor/game/data/UserIdentifier.java
diff --git a/src/main/java/com/threerings/parlor/game/server/GameManager.java b/core/src/main/java/com/threerings/parlor/game/server/GameManager.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/game/server/GameManager.java
rename to core/src/main/java/com/threerings/parlor/game/server/GameManager.java
diff --git a/src/main/java/com/threerings/parlor/game/server/GameManagerDelegate.java b/core/src/main/java/com/threerings/parlor/game/server/GameManagerDelegate.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/game/server/GameManagerDelegate.java
rename to core/src/main/java/com/threerings/parlor/game/server/GameManagerDelegate.java
diff --git a/src/main/java/com/threerings/parlor/game/server/GameWatcher.java b/core/src/main/java/com/threerings/parlor/game/server/GameWatcher.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/game/server/GameWatcher.java
rename to core/src/main/java/com/threerings/parlor/game/server/GameWatcher.java
diff --git a/src/main/java/com/threerings/parlor/game/server/TeamGameManager.java b/core/src/main/java/com/threerings/parlor/game/server/TeamGameManager.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/game/server/TeamGameManager.java
rename to core/src/main/java/com/threerings/parlor/game/server/TeamGameManager.java
diff --git a/src/main/java/com/threerings/parlor/media/ScoreAnimation.java b/core/src/main/java/com/threerings/parlor/media/ScoreAnimation.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/media/ScoreAnimation.java
rename to core/src/main/java/com/threerings/parlor/media/ScoreAnimation.java
diff --git a/src/main/java/com/threerings/parlor/rating/data/RatingCodes.java b/core/src/main/java/com/threerings/parlor/rating/data/RatingCodes.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/rating/data/RatingCodes.java
rename to core/src/main/java/com/threerings/parlor/rating/data/RatingCodes.java
diff --git a/src/main/java/com/threerings/parlor/rating/server/Rating.java b/core/src/main/java/com/threerings/parlor/rating/server/Rating.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/rating/server/Rating.java
rename to core/src/main/java/com/threerings/parlor/rating/server/Rating.java
diff --git a/src/main/java/com/threerings/parlor/rating/server/RatingDelegate.java b/core/src/main/java/com/threerings/parlor/rating/server/RatingDelegate.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/rating/server/RatingDelegate.java
rename to core/src/main/java/com/threerings/parlor/rating/server/RatingDelegate.java
diff --git a/src/main/java/com/threerings/parlor/rating/server/persist/PercentileRecord.java b/core/src/main/java/com/threerings/parlor/rating/server/persist/PercentileRecord.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/rating/server/persist/PercentileRecord.java
rename to core/src/main/java/com/threerings/parlor/rating/server/persist/PercentileRecord.java
diff --git a/src/main/java/com/threerings/parlor/rating/server/persist/RatingRecord.java b/core/src/main/java/com/threerings/parlor/rating/server/persist/RatingRecord.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/rating/server/persist/RatingRecord.java
rename to core/src/main/java/com/threerings/parlor/rating/server/persist/RatingRecord.java
diff --git a/src/main/java/com/threerings/parlor/rating/server/persist/RatingRepository.java b/core/src/main/java/com/threerings/parlor/rating/server/persist/RatingRepository.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/rating/server/persist/RatingRepository.java
rename to core/src/main/java/com/threerings/parlor/rating/server/persist/RatingRepository.java
diff --git a/src/main/java/com/threerings/parlor/rating/util/Percentiler.java b/core/src/main/java/com/threerings/parlor/rating/util/Percentiler.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/rating/util/Percentiler.java
rename to core/src/main/java/com/threerings/parlor/rating/util/Percentiler.java
diff --git a/src/main/java/com/threerings/parlor/server/ParlorManager.java b/core/src/main/java/com/threerings/parlor/server/ParlorManager.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/server/ParlorManager.java
rename to core/src/main/java/com/threerings/parlor/server/ParlorManager.java
diff --git a/src/main/java/com/threerings/parlor/server/ParlorProvider.java b/core/src/main/java/com/threerings/parlor/server/ParlorProvider.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/server/ParlorProvider.java
rename to core/src/main/java/com/threerings/parlor/server/ParlorProvider.java
diff --git a/src/main/java/com/threerings/parlor/server/ParlorSender.java b/core/src/main/java/com/threerings/parlor/server/ParlorSender.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/server/ParlorSender.java
rename to core/src/main/java/com/threerings/parlor/server/ParlorSender.java
diff --git a/src/main/java/com/threerings/parlor/server/PlayManager.java b/core/src/main/java/com/threerings/parlor/server/PlayManager.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/server/PlayManager.java
rename to core/src/main/java/com/threerings/parlor/server/PlayManager.java
diff --git a/src/main/java/com/threerings/parlor/server/PlayManagerDelegate.java b/core/src/main/java/com/threerings/parlor/server/PlayManagerDelegate.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/server/PlayManagerDelegate.java
rename to core/src/main/java/com/threerings/parlor/server/PlayManagerDelegate.java
diff --git a/src/main/java/com/threerings/parlor/server/TableManager.java b/core/src/main/java/com/threerings/parlor/server/TableManager.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/server/TableManager.java
rename to core/src/main/java/com/threerings/parlor/server/TableManager.java
diff --git a/src/main/java/com/threerings/parlor/server/TableProvider.java b/core/src/main/java/com/threerings/parlor/server/TableProvider.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/server/TableProvider.java
rename to core/src/main/java/com/threerings/parlor/server/TableProvider.java
diff --git a/src/main/java/com/threerings/parlor/tourney/client/TourneyService.java b/core/src/main/java/com/threerings/parlor/tourney/client/TourneyService.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/tourney/client/TourneyService.java
rename to core/src/main/java/com/threerings/parlor/tourney/client/TourneyService.java
diff --git a/src/main/java/com/threerings/parlor/tourney/client/TourniesService.java b/core/src/main/java/com/threerings/parlor/tourney/client/TourniesService.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/tourney/client/TourniesService.java
rename to core/src/main/java/com/threerings/parlor/tourney/client/TourniesService.java
diff --git a/src/main/java/com/threerings/parlor/tourney/data/EntryFee.java b/core/src/main/java/com/threerings/parlor/tourney/data/EntryFee.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/tourney/data/EntryFee.java
rename to core/src/main/java/com/threerings/parlor/tourney/data/EntryFee.java
diff --git a/src/main/java/com/threerings/parlor/tourney/data/Participant.java b/core/src/main/java/com/threerings/parlor/tourney/data/Participant.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/tourney/data/Participant.java
rename to core/src/main/java/com/threerings/parlor/tourney/data/Participant.java
diff --git a/src/main/java/com/threerings/parlor/tourney/data/Prize.java b/core/src/main/java/com/threerings/parlor/tourney/data/Prize.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/tourney/data/Prize.java
rename to core/src/main/java/com/threerings/parlor/tourney/data/Prize.java
diff --git a/src/main/java/com/threerings/parlor/tourney/data/TourneyCodes.java b/core/src/main/java/com/threerings/parlor/tourney/data/TourneyCodes.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/tourney/data/TourneyCodes.java
rename to core/src/main/java/com/threerings/parlor/tourney/data/TourneyCodes.java
diff --git a/src/main/java/com/threerings/parlor/tourney/data/TourneyConfig.java b/core/src/main/java/com/threerings/parlor/tourney/data/TourneyConfig.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/tourney/data/TourneyConfig.java
rename to core/src/main/java/com/threerings/parlor/tourney/data/TourneyConfig.java
diff --git a/src/main/java/com/threerings/parlor/tourney/data/TourneyLogicData.java b/core/src/main/java/com/threerings/parlor/tourney/data/TourneyLogicData.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/tourney/data/TourneyLogicData.java
rename to core/src/main/java/com/threerings/parlor/tourney/data/TourneyLogicData.java
diff --git a/src/main/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java b/core/src/main/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java
rename to core/src/main/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java
diff --git a/src/main/java/com/threerings/parlor/tourney/data/TourneyObject.java b/core/src/main/java/com/threerings/parlor/tourney/data/TourneyObject.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/tourney/data/TourneyObject.java
rename to core/src/main/java/com/threerings/parlor/tourney/data/TourneyObject.java
diff --git a/src/main/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java b/core/src/main/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java
rename to core/src/main/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java
diff --git a/src/main/java/com/threerings/parlor/tourney/server/TourneyManager.java b/core/src/main/java/com/threerings/parlor/tourney/server/TourneyManager.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/tourney/server/TourneyManager.java
rename to core/src/main/java/com/threerings/parlor/tourney/server/TourneyManager.java
diff --git a/src/main/java/com/threerings/parlor/tourney/server/TourneyProvider.java b/core/src/main/java/com/threerings/parlor/tourney/server/TourneyProvider.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/tourney/server/TourneyProvider.java
rename to core/src/main/java/com/threerings/parlor/tourney/server/TourneyProvider.java
diff --git a/src/main/java/com/threerings/parlor/tourney/server/TourniesManager.java b/core/src/main/java/com/threerings/parlor/tourney/server/TourniesManager.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/tourney/server/TourniesManager.java
rename to core/src/main/java/com/threerings/parlor/tourney/server/TourniesManager.java
diff --git a/src/main/java/com/threerings/parlor/tourney/server/TourniesProvider.java b/core/src/main/java/com/threerings/parlor/tourney/server/TourniesProvider.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/tourney/server/TourniesProvider.java
rename to core/src/main/java/com/threerings/parlor/tourney/server/TourniesProvider.java
diff --git a/src/main/java/com/threerings/parlor/tourney/server/persist/TourneyRepository.java b/core/src/main/java/com/threerings/parlor/tourney/server/persist/TourneyRepository.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/tourney/server/persist/TourneyRepository.java
rename to core/src/main/java/com/threerings/parlor/tourney/server/persist/TourneyRepository.java
diff --git a/src/main/java/com/threerings/parlor/turn/client/TurnDisplay.java b/core/src/main/java/com/threerings/parlor/turn/client/TurnDisplay.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/turn/client/TurnDisplay.java
rename to core/src/main/java/com/threerings/parlor/turn/client/TurnDisplay.java
diff --git a/src/main/java/com/threerings/parlor/turn/client/TurnGameController.java b/core/src/main/java/com/threerings/parlor/turn/client/TurnGameController.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/turn/client/TurnGameController.java
rename to core/src/main/java/com/threerings/parlor/turn/client/TurnGameController.java
diff --git a/src/main/java/com/threerings/parlor/turn/client/TurnGameControllerDelegate.java b/core/src/main/java/com/threerings/parlor/turn/client/TurnGameControllerDelegate.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/turn/client/TurnGameControllerDelegate.java
rename to core/src/main/java/com/threerings/parlor/turn/client/TurnGameControllerDelegate.java
diff --git a/src/main/java/com/threerings/parlor/turn/data/TurnGameObject.java b/core/src/main/java/com/threerings/parlor/turn/data/TurnGameObject.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/turn/data/TurnGameObject.java
rename to core/src/main/java/com/threerings/parlor/turn/data/TurnGameObject.java
diff --git a/src/main/java/com/threerings/parlor/turn/server/TurnGameManager.java b/core/src/main/java/com/threerings/parlor/turn/server/TurnGameManager.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/turn/server/TurnGameManager.java
rename to core/src/main/java/com/threerings/parlor/turn/server/TurnGameManager.java
diff --git a/src/main/java/com/threerings/parlor/turn/server/TurnGameManagerDelegate.java b/core/src/main/java/com/threerings/parlor/turn/server/TurnGameManagerDelegate.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/turn/server/TurnGameManagerDelegate.java
rename to core/src/main/java/com/threerings/parlor/turn/server/TurnGameManagerDelegate.java
diff --git a/src/main/java/com/threerings/parlor/util/ParlorContext.java b/core/src/main/java/com/threerings/parlor/util/ParlorContext.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/util/ParlorContext.java
rename to core/src/main/java/com/threerings/parlor/util/ParlorContext.java
diff --git a/src/main/java/com/threerings/parlor/util/RobotPlayer.java b/core/src/main/java/com/threerings/parlor/util/RobotPlayer.java
similarity index 100%
rename from src/main/java/com/threerings/parlor/util/RobotPlayer.java
rename to core/src/main/java/com/threerings/parlor/util/RobotPlayer.java
diff --git a/src/main/java/com/threerings/puzzle/Log.java b/core/src/main/java/com/threerings/puzzle/Log.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/Log.java
rename to core/src/main/java/com/threerings/puzzle/Log.java
diff --git a/src/main/java/com/threerings/puzzle/client/PlayerStatusView.java b/core/src/main/java/com/threerings/puzzle/client/PlayerStatusView.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/client/PlayerStatusView.java
rename to core/src/main/java/com/threerings/puzzle/client/PlayerStatusView.java
diff --git a/src/main/java/com/threerings/puzzle/client/PuzzleAnimationWaiter.java b/core/src/main/java/com/threerings/puzzle/client/PuzzleAnimationWaiter.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/client/PuzzleAnimationWaiter.java
rename to core/src/main/java/com/threerings/puzzle/client/PuzzleAnimationWaiter.java
diff --git a/src/main/java/com/threerings/puzzle/client/PuzzleBoardView.java b/core/src/main/java/com/threerings/puzzle/client/PuzzleBoardView.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/client/PuzzleBoardView.java
rename to core/src/main/java/com/threerings/puzzle/client/PuzzleBoardView.java
diff --git a/src/main/java/com/threerings/puzzle/client/PuzzleController.java b/core/src/main/java/com/threerings/puzzle/client/PuzzleController.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/client/PuzzleController.java
rename to core/src/main/java/com/threerings/puzzle/client/PuzzleController.java
diff --git a/src/main/java/com/threerings/puzzle/client/PuzzleControllerDelegate.java b/core/src/main/java/com/threerings/puzzle/client/PuzzleControllerDelegate.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/client/PuzzleControllerDelegate.java
rename to core/src/main/java/com/threerings/puzzle/client/PuzzleControllerDelegate.java
diff --git a/src/main/java/com/threerings/puzzle/client/PuzzleGameService.java b/core/src/main/java/com/threerings/puzzle/client/PuzzleGameService.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/client/PuzzleGameService.java
rename to core/src/main/java/com/threerings/puzzle/client/PuzzleGameService.java
diff --git a/src/main/java/com/threerings/puzzle/client/PuzzlePanel.java b/core/src/main/java/com/threerings/puzzle/client/PuzzlePanel.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/client/PuzzlePanel.java
rename to core/src/main/java/com/threerings/puzzle/client/PuzzlePanel.java
diff --git a/src/main/java/com/threerings/puzzle/client/PuzzlePrefs.java b/core/src/main/java/com/threerings/puzzle/client/PuzzlePrefs.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/client/PuzzlePrefs.java
rename to core/src/main/java/com/threerings/puzzle/client/PuzzlePrefs.java
diff --git a/src/main/java/com/threerings/puzzle/data/Board.java b/core/src/main/java/com/threerings/puzzle/data/Board.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/data/Board.java
rename to core/src/main/java/com/threerings/puzzle/data/Board.java
diff --git a/src/main/java/com/threerings/puzzle/data/BoardSummary.java b/core/src/main/java/com/threerings/puzzle/data/BoardSummary.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/data/BoardSummary.java
rename to core/src/main/java/com/threerings/puzzle/data/BoardSummary.java
diff --git a/src/main/java/com/threerings/puzzle/data/PuzzleCodes.java b/core/src/main/java/com/threerings/puzzle/data/PuzzleCodes.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/data/PuzzleCodes.java
rename to core/src/main/java/com/threerings/puzzle/data/PuzzleCodes.java
diff --git a/src/main/java/com/threerings/puzzle/data/PuzzleGameCodes.java b/core/src/main/java/com/threerings/puzzle/data/PuzzleGameCodes.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/data/PuzzleGameCodes.java
rename to core/src/main/java/com/threerings/puzzle/data/PuzzleGameCodes.java
diff --git a/src/main/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java b/core/src/main/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java
rename to core/src/main/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java
diff --git a/src/main/java/com/threerings/puzzle/data/PuzzleObject.java b/core/src/main/java/com/threerings/puzzle/data/PuzzleObject.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/data/PuzzleObject.java
rename to core/src/main/java/com/threerings/puzzle/data/PuzzleObject.java
diff --git a/src/main/java/com/threerings/puzzle/drop/client/DropBlockSprite.java b/core/src/main/java/com/threerings/puzzle/drop/client/DropBlockSprite.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/drop/client/DropBlockSprite.java
rename to core/src/main/java/com/threerings/puzzle/drop/client/DropBlockSprite.java
diff --git a/src/main/java/com/threerings/puzzle/drop/client/DropBoardView.java b/core/src/main/java/com/threerings/puzzle/drop/client/DropBoardView.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/drop/client/DropBoardView.java
rename to core/src/main/java/com/threerings/puzzle/drop/client/DropBoardView.java
diff --git a/src/main/java/com/threerings/puzzle/drop/client/DropControllerDelegate.java b/core/src/main/java/com/threerings/puzzle/drop/client/DropControllerDelegate.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/drop/client/DropControllerDelegate.java
rename to core/src/main/java/com/threerings/puzzle/drop/client/DropControllerDelegate.java
diff --git a/src/main/java/com/threerings/puzzle/drop/client/DropPanel.java b/core/src/main/java/com/threerings/puzzle/drop/client/DropPanel.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/drop/client/DropPanel.java
rename to core/src/main/java/com/threerings/puzzle/drop/client/DropPanel.java
diff --git a/src/main/java/com/threerings/puzzle/drop/client/DropSprite.java b/core/src/main/java/com/threerings/puzzle/drop/client/DropSprite.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/drop/client/DropSprite.java
rename to core/src/main/java/com/threerings/puzzle/drop/client/DropSprite.java
diff --git a/src/main/java/com/threerings/puzzle/drop/client/DropSpriteObserver.java b/core/src/main/java/com/threerings/puzzle/drop/client/DropSpriteObserver.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/drop/client/DropSpriteObserver.java
rename to core/src/main/java/com/threerings/puzzle/drop/client/DropSpriteObserver.java
diff --git a/src/main/java/com/threerings/puzzle/drop/client/NextBlockView.java b/core/src/main/java/com/threerings/puzzle/drop/client/NextBlockView.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/drop/client/NextBlockView.java
rename to core/src/main/java/com/threerings/puzzle/drop/client/NextBlockView.java
diff --git a/src/main/java/com/threerings/puzzle/drop/client/PieceGroupAnimation.java b/core/src/main/java/com/threerings/puzzle/drop/client/PieceGroupAnimation.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/drop/client/PieceGroupAnimation.java
rename to core/src/main/java/com/threerings/puzzle/drop/client/PieceGroupAnimation.java
diff --git a/src/main/java/com/threerings/puzzle/drop/data/DropBoard.java b/core/src/main/java/com/threerings/puzzle/drop/data/DropBoard.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/drop/data/DropBoard.java
rename to core/src/main/java/com/threerings/puzzle/drop/data/DropBoard.java
diff --git a/src/main/java/com/threerings/puzzle/drop/data/DropBoardSummary.java b/core/src/main/java/com/threerings/puzzle/drop/data/DropBoardSummary.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/drop/data/DropBoardSummary.java
rename to core/src/main/java/com/threerings/puzzle/drop/data/DropBoardSummary.java
diff --git a/src/main/java/com/threerings/puzzle/drop/data/DropCodes.java b/core/src/main/java/com/threerings/puzzle/drop/data/DropCodes.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/drop/data/DropCodes.java
rename to core/src/main/java/com/threerings/puzzle/drop/data/DropCodes.java
diff --git a/src/main/java/com/threerings/puzzle/drop/data/DropConfig.java b/core/src/main/java/com/threerings/puzzle/drop/data/DropConfig.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/drop/data/DropConfig.java
rename to core/src/main/java/com/threerings/puzzle/drop/data/DropConfig.java
diff --git a/src/main/java/com/threerings/puzzle/drop/data/DropLogic.java b/core/src/main/java/com/threerings/puzzle/drop/data/DropLogic.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/drop/data/DropLogic.java
rename to core/src/main/java/com/threerings/puzzle/drop/data/DropLogic.java
diff --git a/src/main/java/com/threerings/puzzle/drop/data/DropPieceCodes.java b/core/src/main/java/com/threerings/puzzle/drop/data/DropPieceCodes.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/drop/data/DropPieceCodes.java
rename to core/src/main/java/com/threerings/puzzle/drop/data/DropPieceCodes.java
diff --git a/src/main/java/com/threerings/puzzle/drop/data/SegmentInfo.java b/core/src/main/java/com/threerings/puzzle/drop/data/SegmentInfo.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/drop/data/SegmentInfo.java
rename to core/src/main/java/com/threerings/puzzle/drop/data/SegmentInfo.java
diff --git a/src/main/java/com/threerings/puzzle/drop/server/DropManagerDelegate.java b/core/src/main/java/com/threerings/puzzle/drop/server/DropManagerDelegate.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/drop/server/DropManagerDelegate.java
rename to core/src/main/java/com/threerings/puzzle/drop/server/DropManagerDelegate.java
diff --git a/src/main/java/com/threerings/puzzle/drop/util/DropBoardUtil.java b/core/src/main/java/com/threerings/puzzle/drop/util/DropBoardUtil.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/drop/util/DropBoardUtil.java
rename to core/src/main/java/com/threerings/puzzle/drop/util/DropBoardUtil.java
diff --git a/src/main/java/com/threerings/puzzle/drop/util/DropGameUtil.java b/core/src/main/java/com/threerings/puzzle/drop/util/DropGameUtil.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/drop/util/DropGameUtil.java
rename to core/src/main/java/com/threerings/puzzle/drop/util/DropGameUtil.java
diff --git a/src/main/java/com/threerings/puzzle/drop/util/PieceDestroyer.java b/core/src/main/java/com/threerings/puzzle/drop/util/PieceDestroyer.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/drop/util/PieceDestroyer.java
rename to core/src/main/java/com/threerings/puzzle/drop/util/PieceDestroyer.java
diff --git a/src/main/java/com/threerings/puzzle/drop/util/PieceDropLogic.java b/core/src/main/java/com/threerings/puzzle/drop/util/PieceDropLogic.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/drop/util/PieceDropLogic.java
rename to core/src/main/java/com/threerings/puzzle/drop/util/PieceDropLogic.java
diff --git a/src/main/java/com/threerings/puzzle/drop/util/PieceDropper.java b/core/src/main/java/com/threerings/puzzle/drop/util/PieceDropper.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/drop/util/PieceDropper.java
rename to core/src/main/java/com/threerings/puzzle/drop/util/PieceDropper.java
diff --git a/src/main/java/com/threerings/puzzle/server/PuzzleGameProvider.java b/core/src/main/java/com/threerings/puzzle/server/PuzzleGameProvider.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/server/PuzzleGameProvider.java
rename to core/src/main/java/com/threerings/puzzle/server/PuzzleGameProvider.java
diff --git a/src/main/java/com/threerings/puzzle/server/PuzzleManager.java b/core/src/main/java/com/threerings/puzzle/server/PuzzleManager.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/server/PuzzleManager.java
rename to core/src/main/java/com/threerings/puzzle/server/PuzzleManager.java
diff --git a/src/main/java/com/threerings/puzzle/server/PuzzleManagerDelegate.java b/core/src/main/java/com/threerings/puzzle/server/PuzzleManagerDelegate.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/server/PuzzleManagerDelegate.java
rename to core/src/main/java/com/threerings/puzzle/server/PuzzleManagerDelegate.java
diff --git a/src/main/java/com/threerings/puzzle/util/PointSet.java b/core/src/main/java/com/threerings/puzzle/util/PointSet.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/util/PointSet.java
rename to core/src/main/java/com/threerings/puzzle/util/PointSet.java
diff --git a/src/main/java/com/threerings/puzzle/util/PuzzleContext.java b/core/src/main/java/com/threerings/puzzle/util/PuzzleContext.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/util/PuzzleContext.java
rename to core/src/main/java/com/threerings/puzzle/util/PuzzleContext.java
diff --git a/src/main/java/com/threerings/puzzle/util/PuzzleGameUtil.java b/core/src/main/java/com/threerings/puzzle/util/PuzzleGameUtil.java
similarity index 100%
rename from src/main/java/com/threerings/puzzle/util/PuzzleGameUtil.java
rename to core/src/main/java/com/threerings/puzzle/util/PuzzleGameUtil.java
diff --git a/src/main/java/com/threerings/stage/Log.java b/core/src/main/java/com/threerings/stage/Log.java
similarity index 100%
rename from src/main/java/com/threerings/stage/Log.java
rename to core/src/main/java/com/threerings/stage/Log.java
diff --git a/src/main/java/com/threerings/stage/client/SceneColorizer.java b/core/src/main/java/com/threerings/stage/client/SceneColorizer.java
similarity index 100%
rename from src/main/java/com/threerings/stage/client/SceneColorizer.java
rename to core/src/main/java/com/threerings/stage/client/SceneColorizer.java
diff --git a/src/main/java/com/threerings/stage/client/StageSceneController.java b/core/src/main/java/com/threerings/stage/client/StageSceneController.java
similarity index 100%
rename from src/main/java/com/threerings/stage/client/StageSceneController.java
rename to core/src/main/java/com/threerings/stage/client/StageSceneController.java
diff --git a/src/main/java/com/threerings/stage/client/StageScenePanel.java b/core/src/main/java/com/threerings/stage/client/StageScenePanel.java
similarity index 100%
rename from src/main/java/com/threerings/stage/client/StageScenePanel.java
rename to core/src/main/java/com/threerings/stage/client/StageScenePanel.java
diff --git a/src/main/java/com/threerings/stage/client/StageSceneService.java b/core/src/main/java/com/threerings/stage/client/StageSceneService.java
similarity index 100%
rename from src/main/java/com/threerings/stage/client/StageSceneService.java
rename to core/src/main/java/com/threerings/stage/client/StageSceneService.java
diff --git a/src/main/java/com/threerings/stage/data/DefaultColorUpdate.java b/core/src/main/java/com/threerings/stage/data/DefaultColorUpdate.java
similarity index 100%
rename from src/main/java/com/threerings/stage/data/DefaultColorUpdate.java
rename to core/src/main/java/com/threerings/stage/data/DefaultColorUpdate.java
diff --git a/src/main/java/com/threerings/stage/data/ModifyObjectsUpdate.java b/core/src/main/java/com/threerings/stage/data/ModifyObjectsUpdate.java
similarity index 100%
rename from src/main/java/com/threerings/stage/data/ModifyObjectsUpdate.java
rename to core/src/main/java/com/threerings/stage/data/ModifyObjectsUpdate.java
diff --git a/src/main/java/com/threerings/stage/data/StageCodes.java b/core/src/main/java/com/threerings/stage/data/StageCodes.java
similarity index 100%
rename from src/main/java/com/threerings/stage/data/StageCodes.java
rename to core/src/main/java/com/threerings/stage/data/StageCodes.java
diff --git a/src/main/java/com/threerings/stage/data/StageLocation.java b/core/src/main/java/com/threerings/stage/data/StageLocation.java
similarity index 100%
rename from src/main/java/com/threerings/stage/data/StageLocation.java
rename to core/src/main/java/com/threerings/stage/data/StageLocation.java
diff --git a/src/main/java/com/threerings/stage/data/StageMisoSceneModel.java b/core/src/main/java/com/threerings/stage/data/StageMisoSceneModel.java
similarity index 100%
rename from src/main/java/com/threerings/stage/data/StageMisoSceneModel.java
rename to core/src/main/java/com/threerings/stage/data/StageMisoSceneModel.java
diff --git a/src/main/java/com/threerings/stage/data/StageOccupantInfo.java b/core/src/main/java/com/threerings/stage/data/StageOccupantInfo.java
similarity index 100%
rename from src/main/java/com/threerings/stage/data/StageOccupantInfo.java
rename to core/src/main/java/com/threerings/stage/data/StageOccupantInfo.java
diff --git a/src/main/java/com/threerings/stage/data/StageScene.java b/core/src/main/java/com/threerings/stage/data/StageScene.java
similarity index 100%
rename from src/main/java/com/threerings/stage/data/StageScene.java
rename to core/src/main/java/com/threerings/stage/data/StageScene.java
diff --git a/src/main/java/com/threerings/stage/data/StageSceneConfig.java b/core/src/main/java/com/threerings/stage/data/StageSceneConfig.java
similarity index 100%
rename from src/main/java/com/threerings/stage/data/StageSceneConfig.java
rename to core/src/main/java/com/threerings/stage/data/StageSceneConfig.java
diff --git a/src/main/java/com/threerings/stage/data/StageSceneMarshaller.java b/core/src/main/java/com/threerings/stage/data/StageSceneMarshaller.java
similarity index 100%
rename from src/main/java/com/threerings/stage/data/StageSceneMarshaller.java
rename to core/src/main/java/com/threerings/stage/data/StageSceneMarshaller.java
diff --git a/src/main/java/com/threerings/stage/data/StageSceneModel.java b/core/src/main/java/com/threerings/stage/data/StageSceneModel.java
similarity index 100%
rename from src/main/java/com/threerings/stage/data/StageSceneModel.java
rename to core/src/main/java/com/threerings/stage/data/StageSceneModel.java
diff --git a/src/main/java/com/threerings/stage/data/StageSceneObject.java b/core/src/main/java/com/threerings/stage/data/StageSceneObject.java
similarity index 100%
rename from src/main/java/com/threerings/stage/data/StageSceneObject.java
rename to core/src/main/java/com/threerings/stage/data/StageSceneObject.java
diff --git a/src/main/java/com/threerings/stage/server/StageSceneManager.java b/core/src/main/java/com/threerings/stage/server/StageSceneManager.java
similarity index 100%
rename from src/main/java/com/threerings/stage/server/StageSceneManager.java
rename to core/src/main/java/com/threerings/stage/server/StageSceneManager.java
diff --git a/src/main/java/com/threerings/stage/server/StageSceneProvider.java b/core/src/main/java/com/threerings/stage/server/StageSceneProvider.java
similarity index 100%
rename from src/main/java/com/threerings/stage/server/StageSceneProvider.java
rename to core/src/main/java/com/threerings/stage/server/StageSceneProvider.java
diff --git a/src/main/java/com/threerings/stage/server/StageServer.java b/core/src/main/java/com/threerings/stage/server/StageServer.java
similarity index 100%
rename from src/main/java/com/threerings/stage/server/StageServer.java
rename to core/src/main/java/com/threerings/stage/server/StageServer.java
diff --git a/src/main/java/com/threerings/stage/tools/editor/DirectionButton.java b/core/src/main/java/com/threerings/stage/tools/editor/DirectionButton.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/editor/DirectionButton.java
rename to core/src/main/java/com/threerings/stage/tools/editor/DirectionButton.java
diff --git a/src/main/java/com/threerings/stage/tools/editor/EditorApp.java b/core/src/main/java/com/threerings/stage/tools/editor/EditorApp.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/editor/EditorApp.java
rename to core/src/main/java/com/threerings/stage/tools/editor/EditorApp.java
diff --git a/src/main/java/com/threerings/stage/tools/editor/EditorConfig.java b/core/src/main/java/com/threerings/stage/tools/editor/EditorConfig.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/editor/EditorConfig.java
rename to core/src/main/java/com/threerings/stage/tools/editor/EditorConfig.java
diff --git a/src/main/java/com/threerings/stage/tools/editor/EditorDialog.java b/core/src/main/java/com/threerings/stage/tools/editor/EditorDialog.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/editor/EditorDialog.java
rename to core/src/main/java/com/threerings/stage/tools/editor/EditorDialog.java
diff --git a/src/main/java/com/threerings/stage/tools/editor/EditorFrame.java b/core/src/main/java/com/threerings/stage/tools/editor/EditorFrame.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/editor/EditorFrame.java
rename to core/src/main/java/com/threerings/stage/tools/editor/EditorFrame.java
diff --git a/src/main/java/com/threerings/stage/tools/editor/EditorModel.java b/core/src/main/java/com/threerings/stage/tools/editor/EditorModel.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/editor/EditorModel.java
rename to core/src/main/java/com/threerings/stage/tools/editor/EditorModel.java
diff --git a/src/main/java/com/threerings/stage/tools/editor/EditorModelListener.java b/core/src/main/java/com/threerings/stage/tools/editor/EditorModelListener.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/editor/EditorModelListener.java
rename to core/src/main/java/com/threerings/stage/tools/editor/EditorModelListener.java
diff --git a/src/main/java/com/threerings/stage/tools/editor/EditorScenePanel.java b/core/src/main/java/com/threerings/stage/tools/editor/EditorScenePanel.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/editor/EditorScenePanel.java
rename to core/src/main/java/com/threerings/stage/tools/editor/EditorScenePanel.java
diff --git a/src/main/java/com/threerings/stage/tools/editor/EditorScrollBox.java b/core/src/main/java/com/threerings/stage/tools/editor/EditorScrollBox.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/editor/EditorScrollBox.java
rename to core/src/main/java/com/threerings/stage/tools/editor/EditorScrollBox.java
diff --git a/src/main/java/com/threerings/stage/tools/editor/EditorTileManager.java b/core/src/main/java/com/threerings/stage/tools/editor/EditorTileManager.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/editor/EditorTileManager.java
rename to core/src/main/java/com/threerings/stage/tools/editor/EditorTileManager.java
diff --git a/src/main/java/com/threerings/stage/tools/editor/EditorToolBarPanel.java b/core/src/main/java/com/threerings/stage/tools/editor/EditorToolBarPanel.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/editor/EditorToolBarPanel.java
rename to core/src/main/java/com/threerings/stage/tools/editor/EditorToolBarPanel.java
diff --git a/src/main/java/com/threerings/stage/tools/editor/ObjectEditorDialog.java b/core/src/main/java/com/threerings/stage/tools/editor/ObjectEditorDialog.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/editor/ObjectEditorDialog.java
rename to core/src/main/java/com/threerings/stage/tools/editor/ObjectEditorDialog.java
diff --git a/src/main/java/com/threerings/stage/tools/editor/PortalDialog.java b/core/src/main/java/com/threerings/stage/tools/editor/PortalDialog.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/editor/PortalDialog.java
rename to core/src/main/java/com/threerings/stage/tools/editor/PortalDialog.java
diff --git a/src/main/java/com/threerings/stage/tools/editor/PortalTool.java b/core/src/main/java/com/threerings/stage/tools/editor/PortalTool.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/editor/PortalTool.java
rename to core/src/main/java/com/threerings/stage/tools/editor/PortalTool.java
diff --git a/src/main/java/com/threerings/stage/tools/editor/PreferencesDialog.java b/core/src/main/java/com/threerings/stage/tools/editor/PreferencesDialog.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/editor/PreferencesDialog.java
rename to core/src/main/java/com/threerings/stage/tools/editor/PreferencesDialog.java
diff --git a/src/main/java/com/threerings/stage/tools/editor/SceneInfoPanel.java b/core/src/main/java/com/threerings/stage/tools/editor/SceneInfoPanel.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/editor/SceneInfoPanel.java
rename to core/src/main/java/com/threerings/stage/tools/editor/SceneInfoPanel.java
diff --git a/src/main/java/com/threerings/stage/tools/editor/TestTileLoader.java b/core/src/main/java/com/threerings/stage/tools/editor/TestTileLoader.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/editor/TestTileLoader.java
rename to core/src/main/java/com/threerings/stage/tools/editor/TestTileLoader.java
diff --git a/src/main/java/com/threerings/stage/tools/editor/TileInfoPanel.java b/core/src/main/java/com/threerings/stage/tools/editor/TileInfoPanel.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/editor/TileInfoPanel.java
rename to core/src/main/java/com/threerings/stage/tools/editor/TileInfoPanel.java
diff --git a/src/main/java/com/threerings/stage/tools/editor/util/EditorContext.java b/core/src/main/java/com/threerings/stage/tools/editor/util/EditorContext.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/editor/util/EditorContext.java
rename to core/src/main/java/com/threerings/stage/tools/editor/util/EditorContext.java
diff --git a/src/main/java/com/threerings/stage/tools/editor/util/EditorDialogUtil.java b/core/src/main/java/com/threerings/stage/tools/editor/util/EditorDialogUtil.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/editor/util/EditorDialogUtil.java
rename to core/src/main/java/com/threerings/stage/tools/editor/util/EditorDialogUtil.java
diff --git a/src/main/java/com/threerings/stage/tools/editor/util/ExtrasPainter.java b/core/src/main/java/com/threerings/stage/tools/editor/util/ExtrasPainter.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/editor/util/ExtrasPainter.java
rename to core/src/main/java/com/threerings/stage/tools/editor/util/ExtrasPainter.java
diff --git a/src/main/java/com/threerings/stage/tools/editor/util/TileSetUtil.java b/core/src/main/java/com/threerings/stage/tools/editor/util/TileSetUtil.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/editor/util/TileSetUtil.java
rename to core/src/main/java/com/threerings/stage/tools/editor/util/TileSetUtil.java
diff --git a/src/main/java/com/threerings/stage/tools/viewer/ViewerApp.java b/core/src/main/java/com/threerings/stage/tools/viewer/ViewerApp.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/viewer/ViewerApp.java
rename to core/src/main/java/com/threerings/stage/tools/viewer/ViewerApp.java
diff --git a/src/main/java/com/threerings/stage/tools/viewer/ViewerFrame.java b/core/src/main/java/com/threerings/stage/tools/viewer/ViewerFrame.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/viewer/ViewerFrame.java
rename to core/src/main/java/com/threerings/stage/tools/viewer/ViewerFrame.java
diff --git a/src/main/java/com/threerings/stage/tools/viewer/ViewerScenePanel.java b/core/src/main/java/com/threerings/stage/tools/viewer/ViewerScenePanel.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/viewer/ViewerScenePanel.java
rename to core/src/main/java/com/threerings/stage/tools/viewer/ViewerScenePanel.java
diff --git a/src/main/java/com/threerings/stage/tools/xml/StageMisoSceneRuleSet.java b/core/src/main/java/com/threerings/stage/tools/xml/StageMisoSceneRuleSet.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/xml/StageMisoSceneRuleSet.java
rename to core/src/main/java/com/threerings/stage/tools/xml/StageMisoSceneRuleSet.java
diff --git a/src/main/java/com/threerings/stage/tools/xml/StageSceneParser.java b/core/src/main/java/com/threerings/stage/tools/xml/StageSceneParser.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/xml/StageSceneParser.java
rename to core/src/main/java/com/threerings/stage/tools/xml/StageSceneParser.java
diff --git a/src/main/java/com/threerings/stage/tools/xml/StageSceneRuleSet.java b/core/src/main/java/com/threerings/stage/tools/xml/StageSceneRuleSet.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/xml/StageSceneRuleSet.java
rename to core/src/main/java/com/threerings/stage/tools/xml/StageSceneRuleSet.java
diff --git a/src/main/java/com/threerings/stage/tools/xml/StageSceneWriter.java b/core/src/main/java/com/threerings/stage/tools/xml/StageSceneWriter.java
similarity index 100%
rename from src/main/java/com/threerings/stage/tools/xml/StageSceneWriter.java
rename to core/src/main/java/com/threerings/stage/tools/xml/StageSceneWriter.java
diff --git a/src/main/java/com/threerings/stage/util/PlacementConstraints.java b/core/src/main/java/com/threerings/stage/util/PlacementConstraints.java
similarity index 100%
rename from src/main/java/com/threerings/stage/util/PlacementConstraints.java
rename to core/src/main/java/com/threerings/stage/util/PlacementConstraints.java
diff --git a/src/main/java/com/threerings/stage/util/StageContext.java b/core/src/main/java/com/threerings/stage/util/StageContext.java
similarity index 100%
rename from src/main/java/com/threerings/stage/util/StageContext.java
rename to core/src/main/java/com/threerings/stage/util/StageContext.java
diff --git a/src/main/java/com/threerings/stage/util/StageSceneUtil.java b/core/src/main/java/com/threerings/stage/util/StageSceneUtil.java
similarity index 100%
rename from src/main/java/com/threerings/stage/util/StageSceneUtil.java
rename to core/src/main/java/com/threerings/stage/util/StageSceneUtil.java
diff --git a/src/main/java/com/threerings/stats/Log.java b/core/src/main/java/com/threerings/stats/Log.java
similarity index 100%
rename from src/main/java/com/threerings/stats/Log.java
rename to core/src/main/java/com/threerings/stats/Log.java
diff --git a/src/main/java/com/threerings/stats/data/ByteByteStringMapStat.java b/core/src/main/java/com/threerings/stats/data/ByteByteStringMapStat.java
similarity index 100%
rename from src/main/java/com/threerings/stats/data/ByteByteStringMapStat.java
rename to core/src/main/java/com/threerings/stats/data/ByteByteStringMapStat.java
diff --git a/src/main/java/com/threerings/stats/data/ByteStringSetStat.java b/core/src/main/java/com/threerings/stats/data/ByteStringSetStat.java
similarity index 100%
rename from src/main/java/com/threerings/stats/data/ByteStringSetStat.java
rename to core/src/main/java/com/threerings/stats/data/ByteStringSetStat.java
diff --git a/src/main/java/com/threerings/stats/data/IntArrayStat.java b/core/src/main/java/com/threerings/stats/data/IntArrayStat.java
similarity index 100%
rename from src/main/java/com/threerings/stats/data/IntArrayStat.java
rename to core/src/main/java/com/threerings/stats/data/IntArrayStat.java
diff --git a/src/main/java/com/threerings/stats/data/IntSetStat.java b/core/src/main/java/com/threerings/stats/data/IntSetStat.java
similarity index 100%
rename from src/main/java/com/threerings/stats/data/IntSetStat.java
rename to core/src/main/java/com/threerings/stats/data/IntSetStat.java
diff --git a/src/main/java/com/threerings/stats/data/IntSetStatAdder.java b/core/src/main/java/com/threerings/stats/data/IntSetStatAdder.java
similarity index 100%
rename from src/main/java/com/threerings/stats/data/IntSetStatAdder.java
rename to core/src/main/java/com/threerings/stats/data/IntSetStatAdder.java
diff --git a/src/main/java/com/threerings/stats/data/IntStat.java b/core/src/main/java/com/threerings/stats/data/IntStat.java
similarity index 100%
rename from src/main/java/com/threerings/stats/data/IntStat.java
rename to core/src/main/java/com/threerings/stats/data/IntStat.java
diff --git a/src/main/java/com/threerings/stats/data/IntStatIncrementer.java b/core/src/main/java/com/threerings/stats/data/IntStatIncrementer.java
similarity index 100%
rename from src/main/java/com/threerings/stats/data/IntStatIncrementer.java
rename to core/src/main/java/com/threerings/stats/data/IntStatIncrementer.java
diff --git a/src/main/java/com/threerings/stats/data/IntStatMinimumer.java b/core/src/main/java/com/threerings/stats/data/IntStatMinimumer.java
similarity index 100%
rename from src/main/java/com/threerings/stats/data/IntStatMinimumer.java
rename to core/src/main/java/com/threerings/stats/data/IntStatMinimumer.java
diff --git a/src/main/java/com/threerings/stats/data/IntStringSetStat.java b/core/src/main/java/com/threerings/stats/data/IntStringSetStat.java
similarity index 100%
rename from src/main/java/com/threerings/stats/data/IntStringSetStat.java
rename to core/src/main/java/com/threerings/stats/data/IntStringSetStat.java
diff --git a/src/main/java/com/threerings/stats/data/MaxIntStat.java b/core/src/main/java/com/threerings/stats/data/MaxIntStat.java
similarity index 100%
rename from src/main/java/com/threerings/stats/data/MaxIntStat.java
rename to core/src/main/java/com/threerings/stats/data/MaxIntStat.java
diff --git a/src/main/java/com/threerings/stats/data/MaxValueIntStat.java b/core/src/main/java/com/threerings/stats/data/MaxValueIntStat.java
similarity index 100%
rename from src/main/java/com/threerings/stats/data/MaxValueIntStat.java
rename to core/src/main/java/com/threerings/stats/data/MaxValueIntStat.java
diff --git a/src/main/java/com/threerings/stats/data/SetStat.java b/core/src/main/java/com/threerings/stats/data/SetStat.java
similarity index 100%
rename from src/main/java/com/threerings/stats/data/SetStat.java
rename to core/src/main/java/com/threerings/stats/data/SetStat.java
diff --git a/src/main/java/com/threerings/stats/data/ShortStringSetStat.java b/core/src/main/java/com/threerings/stats/data/ShortStringSetStat.java
similarity index 100%
rename from src/main/java/com/threerings/stats/data/ShortStringSetStat.java
rename to core/src/main/java/com/threerings/stats/data/ShortStringSetStat.java
diff --git a/src/main/java/com/threerings/stats/data/Stat.java b/core/src/main/java/com/threerings/stats/data/Stat.java
similarity index 100%
rename from src/main/java/com/threerings/stats/data/Stat.java
rename to core/src/main/java/com/threerings/stats/data/Stat.java
diff --git a/src/main/java/com/threerings/stats/data/StatModifier.java b/core/src/main/java/com/threerings/stats/data/StatModifier.java
similarity index 100%
rename from src/main/java/com/threerings/stats/data/StatModifier.java
rename to core/src/main/java/com/threerings/stats/data/StatModifier.java
diff --git a/src/main/java/com/threerings/stats/data/StatSet.java b/core/src/main/java/com/threerings/stats/data/StatSet.java
similarity index 100%
rename from src/main/java/com/threerings/stats/data/StatSet.java
rename to core/src/main/java/com/threerings/stats/data/StatSet.java
diff --git a/src/main/java/com/threerings/stats/data/StringMapStat.java b/core/src/main/java/com/threerings/stats/data/StringMapStat.java
similarity index 100%
rename from src/main/java/com/threerings/stats/data/StringMapStat.java
rename to core/src/main/java/com/threerings/stats/data/StringMapStat.java
diff --git a/src/main/java/com/threerings/stats/data/StringSetStat.java b/core/src/main/java/com/threerings/stats/data/StringSetStat.java
similarity index 100%
rename from src/main/java/com/threerings/stats/data/StringSetStat.java
rename to core/src/main/java/com/threerings/stats/data/StringSetStat.java
diff --git a/src/main/java/com/threerings/stats/server/persist/MaxStatCodeRecord.java b/core/src/main/java/com/threerings/stats/server/persist/MaxStatCodeRecord.java
similarity index 100%
rename from src/main/java/com/threerings/stats/server/persist/MaxStatCodeRecord.java
rename to core/src/main/java/com/threerings/stats/server/persist/MaxStatCodeRecord.java
diff --git a/src/main/java/com/threerings/stats/server/persist/StatRecord.java b/core/src/main/java/com/threerings/stats/server/persist/StatRecord.java
similarity index 100%
rename from src/main/java/com/threerings/stats/server/persist/StatRecord.java
rename to core/src/main/java/com/threerings/stats/server/persist/StatRecord.java
diff --git a/src/main/java/com/threerings/stats/server/persist/StatRepository.java b/core/src/main/java/com/threerings/stats/server/persist/StatRepository.java
similarity index 100%
rename from src/main/java/com/threerings/stats/server/persist/StatRepository.java
rename to core/src/main/java/com/threerings/stats/server/persist/StatRepository.java
diff --git a/src/main/java/com/threerings/stats/server/persist/StringCodeRecord.java b/core/src/main/java/com/threerings/stats/server/persist/StringCodeRecord.java
similarity index 100%
rename from src/main/java/com/threerings/stats/server/persist/StringCodeRecord.java
rename to core/src/main/java/com/threerings/stats/server/persist/StringCodeRecord.java
diff --git a/src/main/java/com/threerings/whirled/Log.java b/core/src/main/java/com/threerings/whirled/Log.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/Log.java
rename to core/src/main/java/com/threerings/whirled/Log.java
diff --git a/src/main/java/com/threerings/whirled/client/SceneController.java b/core/src/main/java/com/threerings/whirled/client/SceneController.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/client/SceneController.java
rename to core/src/main/java/com/threerings/whirled/client/SceneController.java
diff --git a/src/main/java/com/threerings/whirled/client/SceneDecoder.java b/core/src/main/java/com/threerings/whirled/client/SceneDecoder.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/client/SceneDecoder.java
rename to core/src/main/java/com/threerings/whirled/client/SceneDecoder.java
diff --git a/src/main/java/com/threerings/whirled/client/SceneDirector.java b/core/src/main/java/com/threerings/whirled/client/SceneDirector.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/client/SceneDirector.java
rename to core/src/main/java/com/threerings/whirled/client/SceneDirector.java
diff --git a/src/main/java/com/threerings/whirled/client/SceneMoveAdapter.java b/core/src/main/java/com/threerings/whirled/client/SceneMoveAdapter.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/client/SceneMoveAdapter.java
rename to core/src/main/java/com/threerings/whirled/client/SceneMoveAdapter.java
diff --git a/src/main/java/com/threerings/whirled/client/SceneReceiver.java b/core/src/main/java/com/threerings/whirled/client/SceneReceiver.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/client/SceneReceiver.java
rename to core/src/main/java/com/threerings/whirled/client/SceneReceiver.java
diff --git a/src/main/java/com/threerings/whirled/client/SceneService.java b/core/src/main/java/com/threerings/whirled/client/SceneService.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/client/SceneService.java
rename to core/src/main/java/com/threerings/whirled/client/SceneService.java
diff --git a/src/main/java/com/threerings/whirled/client/persist/SceneRepository.java b/core/src/main/java/com/threerings/whirled/client/persist/SceneRepository.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/client/persist/SceneRepository.java
rename to core/src/main/java/com/threerings/whirled/client/persist/SceneRepository.java
diff --git a/src/main/java/com/threerings/whirled/data/AuxModel.java b/core/src/main/java/com/threerings/whirled/data/AuxModel.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/data/AuxModel.java
rename to core/src/main/java/com/threerings/whirled/data/AuxModel.java
diff --git a/src/main/java/com/threerings/whirled/data/DefaultSceneConfig.java b/core/src/main/java/com/threerings/whirled/data/DefaultSceneConfig.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/data/DefaultSceneConfig.java
rename to core/src/main/java/com/threerings/whirled/data/DefaultSceneConfig.java
diff --git a/src/main/java/com/threerings/whirled/data/Scene.java b/core/src/main/java/com/threerings/whirled/data/Scene.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/data/Scene.java
rename to core/src/main/java/com/threerings/whirled/data/Scene.java
diff --git a/src/main/java/com/threerings/whirled/data/SceneCodes.java b/core/src/main/java/com/threerings/whirled/data/SceneCodes.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/data/SceneCodes.java
rename to core/src/main/java/com/threerings/whirled/data/SceneCodes.java
diff --git a/src/main/java/com/threerings/whirled/data/SceneImpl.java b/core/src/main/java/com/threerings/whirled/data/SceneImpl.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/data/SceneImpl.java
rename to core/src/main/java/com/threerings/whirled/data/SceneImpl.java
diff --git a/src/main/java/com/threerings/whirled/data/SceneMarshaller.java b/core/src/main/java/com/threerings/whirled/data/SceneMarshaller.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/data/SceneMarshaller.java
rename to core/src/main/java/com/threerings/whirled/data/SceneMarshaller.java
diff --git a/src/main/java/com/threerings/whirled/data/SceneModel.java b/core/src/main/java/com/threerings/whirled/data/SceneModel.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/data/SceneModel.java
rename to core/src/main/java/com/threerings/whirled/data/SceneModel.java
diff --git a/src/main/java/com/threerings/whirled/data/SceneObject.java b/core/src/main/java/com/threerings/whirled/data/SceneObject.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/data/SceneObject.java
rename to core/src/main/java/com/threerings/whirled/data/SceneObject.java
diff --git a/src/main/java/com/threerings/whirled/data/ScenePlace.java b/core/src/main/java/com/threerings/whirled/data/ScenePlace.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/data/ScenePlace.java
rename to core/src/main/java/com/threerings/whirled/data/ScenePlace.java
diff --git a/src/main/java/com/threerings/whirled/data/SceneUpdate.java b/core/src/main/java/com/threerings/whirled/data/SceneUpdate.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/data/SceneUpdate.java
rename to core/src/main/java/com/threerings/whirled/data/SceneUpdate.java
diff --git a/src/main/java/com/threerings/whirled/server/AbstractSceneMoveHandler.java b/core/src/main/java/com/threerings/whirled/server/AbstractSceneMoveHandler.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/server/AbstractSceneMoveHandler.java
rename to core/src/main/java/com/threerings/whirled/server/AbstractSceneMoveHandler.java
diff --git a/src/main/java/com/threerings/whirled/server/SceneManager.java b/core/src/main/java/com/threerings/whirled/server/SceneManager.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/server/SceneManager.java
rename to core/src/main/java/com/threerings/whirled/server/SceneManager.java
diff --git a/src/main/java/com/threerings/whirled/server/SceneMoveHandler.java b/core/src/main/java/com/threerings/whirled/server/SceneMoveHandler.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/server/SceneMoveHandler.java
rename to core/src/main/java/com/threerings/whirled/server/SceneMoveHandler.java
diff --git a/src/main/java/com/threerings/whirled/server/SceneProvider.java b/core/src/main/java/com/threerings/whirled/server/SceneProvider.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/server/SceneProvider.java
rename to core/src/main/java/com/threerings/whirled/server/SceneProvider.java
diff --git a/src/main/java/com/threerings/whirled/server/SceneRegistry.java b/core/src/main/java/com/threerings/whirled/server/SceneRegistry.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/server/SceneRegistry.java
rename to core/src/main/java/com/threerings/whirled/server/SceneRegistry.java
diff --git a/src/main/java/com/threerings/whirled/server/SceneSender.java b/core/src/main/java/com/threerings/whirled/server/SceneSender.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/server/SceneSender.java
rename to core/src/main/java/com/threerings/whirled/server/SceneSender.java
diff --git a/src/main/java/com/threerings/whirled/server/WhirledServer.java b/core/src/main/java/com/threerings/whirled/server/WhirledServer.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/server/WhirledServer.java
rename to core/src/main/java/com/threerings/whirled/server/WhirledServer.java
diff --git a/src/main/java/com/threerings/whirled/server/WhirledSession.java b/core/src/main/java/com/threerings/whirled/server/WhirledSession.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/server/WhirledSession.java
rename to core/src/main/java/com/threerings/whirled/server/WhirledSession.java
diff --git a/src/main/java/com/threerings/whirled/server/persist/DummySceneRepository.java b/core/src/main/java/com/threerings/whirled/server/persist/DummySceneRepository.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/server/persist/DummySceneRepository.java
rename to core/src/main/java/com/threerings/whirled/server/persist/DummySceneRepository.java
diff --git a/src/main/java/com/threerings/whirled/server/persist/SceneRepository.java b/core/src/main/java/com/threerings/whirled/server/persist/SceneRepository.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/server/persist/SceneRepository.java
rename to core/src/main/java/com/threerings/whirled/server/persist/SceneRepository.java
diff --git a/src/main/java/com/threerings/whirled/server/persist/SceneUpdateMarshaller.java b/core/src/main/java/com/threerings/whirled/server/persist/SceneUpdateMarshaller.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/server/persist/SceneUpdateMarshaller.java
rename to core/src/main/java/com/threerings/whirled/server/persist/SceneUpdateMarshaller.java
diff --git a/src/main/java/com/threerings/whirled/spot/Log.java b/core/src/main/java/com/threerings/whirled/spot/Log.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/Log.java
rename to core/src/main/java/com/threerings/whirled/spot/Log.java
diff --git a/src/main/java/com/threerings/whirled/spot/client/SpotSceneController.java b/core/src/main/java/com/threerings/whirled/spot/client/SpotSceneController.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/client/SpotSceneController.java
rename to core/src/main/java/com/threerings/whirled/spot/client/SpotSceneController.java
diff --git a/src/main/java/com/threerings/whirled/spot/client/SpotSceneDirector.java b/core/src/main/java/com/threerings/whirled/spot/client/SpotSceneDirector.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/client/SpotSceneDirector.java
rename to core/src/main/java/com/threerings/whirled/spot/client/SpotSceneDirector.java
diff --git a/src/main/java/com/threerings/whirled/spot/client/SpotService.java b/core/src/main/java/com/threerings/whirled/spot/client/SpotService.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/client/SpotService.java
rename to core/src/main/java/com/threerings/whirled/spot/client/SpotService.java
diff --git a/src/main/java/com/threerings/whirled/spot/data/Cluster.java b/core/src/main/java/com/threerings/whirled/spot/data/Cluster.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/data/Cluster.java
rename to core/src/main/java/com/threerings/whirled/spot/data/Cluster.java
diff --git a/src/main/java/com/threerings/whirled/spot/data/ClusterObject.java b/core/src/main/java/com/threerings/whirled/spot/data/ClusterObject.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/data/ClusterObject.java
rename to core/src/main/java/com/threerings/whirled/spot/data/ClusterObject.java
diff --git a/src/main/java/com/threerings/whirled/spot/data/ClusteredBodyObject.java b/core/src/main/java/com/threerings/whirled/spot/data/ClusteredBodyObject.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/data/ClusteredBodyObject.java
rename to core/src/main/java/com/threerings/whirled/spot/data/ClusteredBodyObject.java
diff --git a/src/main/java/com/threerings/whirled/spot/data/Location.java b/core/src/main/java/com/threerings/whirled/spot/data/Location.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/data/Location.java
rename to core/src/main/java/com/threerings/whirled/spot/data/Location.java
diff --git a/src/main/java/com/threerings/whirled/spot/data/ModifyPortalsUpdate.java b/core/src/main/java/com/threerings/whirled/spot/data/ModifyPortalsUpdate.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/data/ModifyPortalsUpdate.java
rename to core/src/main/java/com/threerings/whirled/spot/data/ModifyPortalsUpdate.java
diff --git a/src/main/java/com/threerings/whirled/spot/data/Portal.java b/core/src/main/java/com/threerings/whirled/spot/data/Portal.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/data/Portal.java
rename to core/src/main/java/com/threerings/whirled/spot/data/Portal.java
diff --git a/src/main/java/com/threerings/whirled/spot/data/SceneLocation.java b/core/src/main/java/com/threerings/whirled/spot/data/SceneLocation.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/data/SceneLocation.java
rename to core/src/main/java/com/threerings/whirled/spot/data/SceneLocation.java
diff --git a/src/main/java/com/threerings/whirled/spot/data/SpotCodes.java b/core/src/main/java/com/threerings/whirled/spot/data/SpotCodes.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/data/SpotCodes.java
rename to core/src/main/java/com/threerings/whirled/spot/data/SpotCodes.java
diff --git a/src/main/java/com/threerings/whirled/spot/data/SpotMarshaller.java b/core/src/main/java/com/threerings/whirled/spot/data/SpotMarshaller.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/data/SpotMarshaller.java
rename to core/src/main/java/com/threerings/whirled/spot/data/SpotMarshaller.java
diff --git a/src/main/java/com/threerings/whirled/spot/data/SpotScene.java b/core/src/main/java/com/threerings/whirled/spot/data/SpotScene.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/data/SpotScene.java
rename to core/src/main/java/com/threerings/whirled/spot/data/SpotScene.java
diff --git a/src/main/java/com/threerings/whirled/spot/data/SpotSceneImpl.java b/core/src/main/java/com/threerings/whirled/spot/data/SpotSceneImpl.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/data/SpotSceneImpl.java
rename to core/src/main/java/com/threerings/whirled/spot/data/SpotSceneImpl.java
diff --git a/src/main/java/com/threerings/whirled/spot/data/SpotSceneModel.java b/core/src/main/java/com/threerings/whirled/spot/data/SpotSceneModel.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/data/SpotSceneModel.java
rename to core/src/main/java/com/threerings/whirled/spot/data/SpotSceneModel.java
diff --git a/src/main/java/com/threerings/whirled/spot/data/SpotSceneObject.java b/core/src/main/java/com/threerings/whirled/spot/data/SpotSceneObject.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/data/SpotSceneObject.java
rename to core/src/main/java/com/threerings/whirled/spot/data/SpotSceneObject.java
diff --git a/src/main/java/com/threerings/whirled/spot/images/scene.dia b/core/src/main/java/com/threerings/whirled/spot/images/scene.dia
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/images/scene.dia
rename to core/src/main/java/com/threerings/whirled/spot/images/scene.dia
diff --git a/src/main/java/com/threerings/whirled/spot/images/scene.png b/core/src/main/java/com/threerings/whirled/spot/images/scene.png
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/images/scene.png
rename to core/src/main/java/com/threerings/whirled/spot/images/scene.png
diff --git a/src/main/java/com/threerings/whirled/spot/package.html b/core/src/main/java/com/threerings/whirled/spot/package.html
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/package.html
rename to core/src/main/java/com/threerings/whirled/spot/package.html
diff --git a/src/main/java/com/threerings/whirled/spot/server/SpotClient.java b/core/src/main/java/com/threerings/whirled/spot/server/SpotClient.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/server/SpotClient.java
rename to core/src/main/java/com/threerings/whirled/spot/server/SpotClient.java
diff --git a/src/main/java/com/threerings/whirled/spot/server/SpotProvider.java b/core/src/main/java/com/threerings/whirled/spot/server/SpotProvider.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/server/SpotProvider.java
rename to core/src/main/java/com/threerings/whirled/spot/server/SpotProvider.java
diff --git a/src/main/java/com/threerings/whirled/spot/server/SpotSceneManager.java b/core/src/main/java/com/threerings/whirled/spot/server/SpotSceneManager.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/server/SpotSceneManager.java
rename to core/src/main/java/com/threerings/whirled/spot/server/SpotSceneManager.java
diff --git a/src/main/java/com/threerings/whirled/spot/server/SpotSceneMoveHandler.java b/core/src/main/java/com/threerings/whirled/spot/server/SpotSceneMoveHandler.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/server/SpotSceneMoveHandler.java
rename to core/src/main/java/com/threerings/whirled/spot/server/SpotSceneMoveHandler.java
diff --git a/src/main/java/com/threerings/whirled/spot/server/SpotSceneRegistry.java b/core/src/main/java/com/threerings/whirled/spot/server/SpotSceneRegistry.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/server/SpotSceneRegistry.java
rename to core/src/main/java/com/threerings/whirled/spot/server/SpotSceneRegistry.java
diff --git a/src/main/java/com/threerings/whirled/spot/tools/EditablePortal.java b/core/src/main/java/com/threerings/whirled/spot/tools/EditablePortal.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/tools/EditablePortal.java
rename to core/src/main/java/com/threerings/whirled/spot/tools/EditablePortal.java
diff --git a/src/main/java/com/threerings/whirled/spot/tools/xml/SpotSceneRuleSet.java b/core/src/main/java/com/threerings/whirled/spot/tools/xml/SpotSceneRuleSet.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/tools/xml/SpotSceneRuleSet.java
rename to core/src/main/java/com/threerings/whirled/spot/tools/xml/SpotSceneRuleSet.java
diff --git a/src/main/java/com/threerings/whirled/spot/tools/xml/SpotSceneWriter.java b/core/src/main/java/com/threerings/whirled/spot/tools/xml/SpotSceneWriter.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/spot/tools/xml/SpotSceneWriter.java
rename to core/src/main/java/com/threerings/whirled/spot/tools/xml/SpotSceneWriter.java
diff --git a/src/main/java/com/threerings/whirled/tools/xml/SceneParser.java b/core/src/main/java/com/threerings/whirled/tools/xml/SceneParser.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/tools/xml/SceneParser.java
rename to core/src/main/java/com/threerings/whirled/tools/xml/SceneParser.java
diff --git a/src/main/java/com/threerings/whirled/tools/xml/SceneRuleSet.java b/core/src/main/java/com/threerings/whirled/tools/xml/SceneRuleSet.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/tools/xml/SceneRuleSet.java
rename to core/src/main/java/com/threerings/whirled/tools/xml/SceneRuleSet.java
diff --git a/src/main/java/com/threerings/whirled/tools/xml/SceneWriter.java b/core/src/main/java/com/threerings/whirled/tools/xml/SceneWriter.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/tools/xml/SceneWriter.java
rename to core/src/main/java/com/threerings/whirled/tools/xml/SceneWriter.java
diff --git a/src/main/java/com/threerings/whirled/util/NoSuchSceneException.java b/core/src/main/java/com/threerings/whirled/util/NoSuchSceneException.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/util/NoSuchSceneException.java
rename to core/src/main/java/com/threerings/whirled/util/NoSuchSceneException.java
diff --git a/src/main/java/com/threerings/whirled/util/SceneFactory.java b/core/src/main/java/com/threerings/whirled/util/SceneFactory.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/util/SceneFactory.java
rename to core/src/main/java/com/threerings/whirled/util/SceneFactory.java
diff --git a/src/main/java/com/threerings/whirled/util/UpdateList.java b/core/src/main/java/com/threerings/whirled/util/UpdateList.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/util/UpdateList.java
rename to core/src/main/java/com/threerings/whirled/util/UpdateList.java
diff --git a/src/main/java/com/threerings/whirled/util/WhirledContext.java b/core/src/main/java/com/threerings/whirled/util/WhirledContext.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/util/WhirledContext.java
rename to core/src/main/java/com/threerings/whirled/util/WhirledContext.java
diff --git a/src/main/java/com/threerings/whirled/zone/Log.java b/core/src/main/java/com/threerings/whirled/zone/Log.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/zone/Log.java
rename to core/src/main/java/com/threerings/whirled/zone/Log.java
diff --git a/src/main/java/com/threerings/whirled/zone/client/ZoneAdapter.java b/core/src/main/java/com/threerings/whirled/zone/client/ZoneAdapter.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/zone/client/ZoneAdapter.java
rename to core/src/main/java/com/threerings/whirled/zone/client/ZoneAdapter.java
diff --git a/src/main/java/com/threerings/whirled/zone/client/ZoneDecoder.java b/core/src/main/java/com/threerings/whirled/zone/client/ZoneDecoder.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/zone/client/ZoneDecoder.java
rename to core/src/main/java/com/threerings/whirled/zone/client/ZoneDecoder.java
diff --git a/src/main/java/com/threerings/whirled/zone/client/ZoneDirector.java b/core/src/main/java/com/threerings/whirled/zone/client/ZoneDirector.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/zone/client/ZoneDirector.java
rename to core/src/main/java/com/threerings/whirled/zone/client/ZoneDirector.java
diff --git a/src/main/java/com/threerings/whirled/zone/client/ZoneObserver.java b/core/src/main/java/com/threerings/whirled/zone/client/ZoneObserver.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/zone/client/ZoneObserver.java
rename to core/src/main/java/com/threerings/whirled/zone/client/ZoneObserver.java
diff --git a/src/main/java/com/threerings/whirled/zone/client/ZoneReceiver.java b/core/src/main/java/com/threerings/whirled/zone/client/ZoneReceiver.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/zone/client/ZoneReceiver.java
rename to core/src/main/java/com/threerings/whirled/zone/client/ZoneReceiver.java
diff --git a/src/main/java/com/threerings/whirled/zone/client/ZoneService.java b/core/src/main/java/com/threerings/whirled/zone/client/ZoneService.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/zone/client/ZoneService.java
rename to core/src/main/java/com/threerings/whirled/zone/client/ZoneService.java
diff --git a/src/main/java/com/threerings/whirled/zone/data/SceneSummary.java b/core/src/main/java/com/threerings/whirled/zone/data/SceneSummary.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/zone/data/SceneSummary.java
rename to core/src/main/java/com/threerings/whirled/zone/data/SceneSummary.java
diff --git a/src/main/java/com/threerings/whirled/zone/data/ZoneCodes.java b/core/src/main/java/com/threerings/whirled/zone/data/ZoneCodes.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/zone/data/ZoneCodes.java
rename to core/src/main/java/com/threerings/whirled/zone/data/ZoneCodes.java
diff --git a/src/main/java/com/threerings/whirled/zone/data/ZoneMarshaller.java b/core/src/main/java/com/threerings/whirled/zone/data/ZoneMarshaller.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/zone/data/ZoneMarshaller.java
rename to core/src/main/java/com/threerings/whirled/zone/data/ZoneMarshaller.java
diff --git a/src/main/java/com/threerings/whirled/zone/data/ZoneSummary.java b/core/src/main/java/com/threerings/whirled/zone/data/ZoneSummary.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/zone/data/ZoneSummary.java
rename to core/src/main/java/com/threerings/whirled/zone/data/ZoneSummary.java
diff --git a/src/main/java/com/threerings/whirled/zone/data/ZonedBodyObject.java b/core/src/main/java/com/threerings/whirled/zone/data/ZonedBodyObject.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/zone/data/ZonedBodyObject.java
rename to core/src/main/java/com/threerings/whirled/zone/data/ZonedBodyObject.java
diff --git a/src/main/java/com/threerings/whirled/zone/peer/data/HostedZone.java b/core/src/main/java/com/threerings/whirled/zone/peer/data/HostedZone.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/zone/peer/data/HostedZone.java
rename to core/src/main/java/com/threerings/whirled/zone/peer/data/HostedZone.java
diff --git a/src/main/java/com/threerings/whirled/zone/peer/server/PeeredZoneManager.java b/core/src/main/java/com/threerings/whirled/zone/peer/server/PeeredZoneManager.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/zone/peer/server/PeeredZoneManager.java
rename to core/src/main/java/com/threerings/whirled/zone/peer/server/PeeredZoneManager.java
diff --git a/src/main/java/com/threerings/whirled/zone/peer/server/PeeredZoneRegistry.java b/core/src/main/java/com/threerings/whirled/zone/peer/server/PeeredZoneRegistry.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/zone/peer/server/PeeredZoneRegistry.java
rename to core/src/main/java/com/threerings/whirled/zone/peer/server/PeeredZoneRegistry.java
diff --git a/src/main/java/com/threerings/whirled/zone/peer/server/ZoneNodeObject.java b/core/src/main/java/com/threerings/whirled/zone/peer/server/ZoneNodeObject.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/zone/peer/server/ZoneNodeObject.java
rename to core/src/main/java/com/threerings/whirled/zone/peer/server/ZoneNodeObject.java
diff --git a/src/main/java/com/threerings/whirled/zone/peer/server/ZonePeerManager.java b/core/src/main/java/com/threerings/whirled/zone/peer/server/ZonePeerManager.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/zone/peer/server/ZonePeerManager.java
rename to core/src/main/java/com/threerings/whirled/zone/peer/server/ZonePeerManager.java
diff --git a/src/main/java/com/threerings/whirled/zone/server/ZoneManager.java b/core/src/main/java/com/threerings/whirled/zone/server/ZoneManager.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/zone/server/ZoneManager.java
rename to core/src/main/java/com/threerings/whirled/zone/server/ZoneManager.java
diff --git a/src/main/java/com/threerings/whirled/zone/server/ZoneMoveHandler.java b/core/src/main/java/com/threerings/whirled/zone/server/ZoneMoveHandler.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/zone/server/ZoneMoveHandler.java
rename to core/src/main/java/com/threerings/whirled/zone/server/ZoneMoveHandler.java
diff --git a/src/main/java/com/threerings/whirled/zone/server/ZoneProvider.java b/core/src/main/java/com/threerings/whirled/zone/server/ZoneProvider.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/zone/server/ZoneProvider.java
rename to core/src/main/java/com/threerings/whirled/zone/server/ZoneProvider.java
diff --git a/src/main/java/com/threerings/whirled/zone/server/ZoneRegistry.java b/core/src/main/java/com/threerings/whirled/zone/server/ZoneRegistry.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/zone/server/ZoneRegistry.java
rename to core/src/main/java/com/threerings/whirled/zone/server/ZoneRegistry.java
diff --git a/src/main/java/com/threerings/whirled/zone/server/ZoneSender.java b/core/src/main/java/com/threerings/whirled/zone/server/ZoneSender.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/zone/server/ZoneSender.java
rename to core/src/main/java/com/threerings/whirled/zone/server/ZoneSender.java
diff --git a/src/main/java/com/threerings/whirled/zone/util/ZoneUtil.java b/core/src/main/java/com/threerings/whirled/zone/util/ZoneUtil.java
similarity index 100%
rename from src/main/java/com/threerings/whirled/zone/util/ZoneUtil.java
rename to core/src/main/java/com/threerings/whirled/zone/util/ZoneUtil.java
diff --git a/src/main/resources/rsrc/config/micasa/server.properties b/core/src/main/resources/rsrc/config/micasa/server.properties
similarity index 100%
rename from src/main/resources/rsrc/config/micasa/server.properties
rename to core/src/main/resources/rsrc/config/micasa/server.properties
diff --git a/src/main/resources/rsrc/i18n/game/general.properties b/core/src/main/resources/rsrc/i18n/game/general.properties
similarity index 100%
rename from src/main/resources/rsrc/i18n/game/general.properties
rename to core/src/main/resources/rsrc/i18n/game/general.properties
diff --git a/src/main/resources/rsrc/i18n/micasa/logon.properties b/core/src/main/resources/rsrc/i18n/micasa/logon.properties
similarity index 100%
rename from src/main/resources/rsrc/i18n/micasa/logon.properties
rename to core/src/main/resources/rsrc/i18n/micasa/logon.properties
diff --git a/src/main/resources/rsrc/media/stage/portal_arrows.png b/core/src/main/resources/rsrc/media/stage/portal_arrows.png
similarity index 100%
rename from src/main/resources/rsrc/media/stage/portal_arrows.png
rename to core/src/main/resources/rsrc/media/stage/portal_arrows.png
diff --git a/src/main/resources/rsrc/media/stage/tools/editor/toolbar_icons.png b/core/src/main/resources/rsrc/media/stage/tools/editor/toolbar_icons.png
similarity index 100%
rename from src/main/resources/rsrc/media/stage/tools/editor/toolbar_icons.png
rename to core/src/main/resources/rsrc/media/stage/tools/editor/toolbar_icons.png
diff --git a/src/test/java/com/threerings/parlor/TestClient.java b/core/src/test/java/com/threerings/parlor/TestClient.java
similarity index 100%
rename from src/test/java/com/threerings/parlor/TestClient.java
rename to core/src/test/java/com/threerings/parlor/TestClient.java
diff --git a/src/test/java/com/threerings/parlor/TestConfig.java b/core/src/test/java/com/threerings/parlor/TestConfig.java
similarity index 100%
rename from src/test/java/com/threerings/parlor/TestConfig.java
rename to core/src/test/java/com/threerings/parlor/TestConfig.java
diff --git a/src/test/java/com/threerings/parlor/TestController.java b/core/src/test/java/com/threerings/parlor/TestController.java
similarity index 100%
rename from src/test/java/com/threerings/parlor/TestController.java
rename to core/src/test/java/com/threerings/parlor/TestController.java
diff --git a/src/test/java/com/threerings/parlor/TestManager.java b/core/src/test/java/com/threerings/parlor/TestManager.java
similarity index 100%
rename from src/test/java/com/threerings/parlor/TestManager.java
rename to core/src/test/java/com/threerings/parlor/TestManager.java
diff --git a/src/test/java/com/threerings/parlor/TestServer.java b/core/src/test/java/com/threerings/parlor/TestServer.java
similarity index 100%
rename from src/test/java/com/threerings/parlor/TestServer.java
rename to core/src/test/java/com/threerings/parlor/TestServer.java
diff --git a/src/test/java/com/threerings/parlor/rating/util/PercentilerTest.java b/core/src/test/java/com/threerings/parlor/rating/util/PercentilerTest.java
similarity index 100%
rename from src/test/java/com/threerings/parlor/rating/util/PercentilerTest.java
rename to core/src/test/java/com/threerings/parlor/rating/util/PercentilerTest.java
diff --git a/src/test/java/com/threerings/whirled/DummyClientSceneRepository.java b/core/src/test/java/com/threerings/whirled/DummyClientSceneRepository.java
similarity index 100%
rename from src/test/java/com/threerings/whirled/DummyClientSceneRepository.java
rename to core/src/test/java/com/threerings/whirled/DummyClientSceneRepository.java
diff --git a/src/test/java/com/threerings/whirled/TestClient.java b/core/src/test/java/com/threerings/whirled/TestClient.java
similarity index 100%
rename from src/test/java/com/threerings/whirled/TestClient.java
rename to core/src/test/java/com/threerings/whirled/TestClient.java
diff --git a/src/test/java/com/threerings/whirled/TestConfig.java b/core/src/test/java/com/threerings/whirled/TestConfig.java
similarity index 100%
rename from src/test/java/com/threerings/whirled/TestConfig.java
rename to core/src/test/java/com/threerings/whirled/TestConfig.java
diff --git a/src/test/java/com/threerings/whirled/TestController.java b/core/src/test/java/com/threerings/whirled/TestController.java
similarity index 100%
rename from src/test/java/com/threerings/whirled/TestController.java
rename to core/src/test/java/com/threerings/whirled/TestController.java
diff --git a/src/test/java/com/threerings/whirled/spot/tools/xml/SpotSceneParserTest.java b/core/src/test/java/com/threerings/whirled/spot/tools/xml/SpotSceneParserTest.java
similarity index 100%
rename from src/test/java/com/threerings/whirled/spot/tools/xml/SpotSceneParserTest.java
rename to core/src/test/java/com/threerings/whirled/spot/tools/xml/SpotSceneParserTest.java
diff --git a/src/test/java/com/threerings/whirled/tools/xml/SceneParserTest.java b/core/src/test/java/com/threerings/whirled/tools/xml/SceneParserTest.java
similarity index 100%
rename from src/test/java/com/threerings/whirled/tools/xml/SceneParserTest.java
rename to core/src/test/java/com/threerings/whirled/tools/xml/SceneParserTest.java
diff --git a/src/test/resources/rsrc/whirled/spot/tools/xml/scene.xml b/core/src/test/resources/rsrc/whirled/spot/tools/xml/scene.xml
similarity index 100%
rename from src/test/resources/rsrc/whirled/spot/tools/xml/scene.xml
rename to core/src/test/resources/rsrc/whirled/spot/tools/xml/scene.xml
diff --git a/src/test/resources/rsrc/whirled/tools/xml/scene.xml b/core/src/test/resources/rsrc/whirled/tools/xml/scene.xml
similarity index 100%
rename from src/test/resources/rsrc/whirled/tools/xml/scene.xml
rename to core/src/test/resources/rsrc/whirled/tools/xml/scene.xml
diff --git a/pom.xml b/pom.xml
index 7f4faea6..970e51c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,8 +8,8 @@
   </parent>
 
   <groupId>com.threerings</groupId>
-  <artifactId>vilya</artifactId>
-  <packaging>jar</packaging>
+  <artifactId>vilya-parent</artifactId>
+  <packaging>pom</packaging>
   <version>1.6-SNAPSHOT</version>
 
   <name>Vilya</name>
@@ -48,64 +48,11 @@
     </repository>
   </repositories>
 
-  <dependencies>
-    <!-- exported dependencies -->
-    <dependency>
-      <groupId>com.threerings</groupId>
-      <artifactId>ooo-util</artifactId>
-      <version>1.3.2</version>
-    </dependency>
-    <dependency>
-      <groupId>com.threerings</groupId>
-      <artifactId>narya</artifactId>
-      <version>1.14</version>
-    </dependency>
-    <dependency>
-      <groupId>com.threerings</groupId>
-      <artifactId>nenya</artifactId>
-      <version>1.5</version>
-    </dependency>
-
-    <!-- optional dependencies -->
-    <dependency>
-      <groupId>com.threerings</groupId>
-      <artifactId>nenya-tools</artifactId>
-      <version>1.5</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>commons-digester</groupId>
-      <artifactId>commons-digester</artifactId>
-      <version>2.0</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.samskivert</groupId>
-      <artifactId>depot</artifactId>
-      <version>1.6.1</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>javassist</groupId>
-      <artifactId>javassist</artifactId>
-      <version>3.8.0.GA</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.megginson.sax</groupId>
-      <artifactId>xml-writer</artifactId>
-      <version>0.2</version>
-      <optional>true</optional>
-    </dependency>
-
-    <!-- test dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.10</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+  <modules>
+    <module>core</module>
+    <!--<module>tools</module>-->
+    <module>aslib</module>
+  </modules>
 
   <build>
     <plugins>
@@ -131,34 +78,6 @@
           <encoding>UTF-8</encoding>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.7</version>
-        <configuration>
-          <quiet>true</quiet>
-          <show>public</show>
-          <links>
-            <link>http://samskivert.github.com/samskivert/apidocs/</link>
-            <link>http://depot.googlecode.com/svn/apidocs/</link>
-            <link>http://docs.guava-libraries.googlecode.com/git/javadoc/</link>
-            <link>http://google-web-toolkit.googlecode.com/svn/javadoc/2.1/</link>
-          </links>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.6</version>
-        <configuration>
-          <includes>
-            <include>com/threerings/**/*Test.java</include>
-          </includes>
-          <systemPropertyVariables>
-            <test_dir>target/test-classes</test_dir>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -175,6 +94,7 @@
         <version>2.5</version>
       </plugin>
     </plugins>
+
     <pluginManagement>
       <plugins>
         <plugin>