diff --git a/aslib/pom.xml b/aslib/pom.xml
new file mode 100644
index 000000000..d2375e352
--- /dev/null
+++ b/aslib/pom.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.threerings</groupId>
+    <artifactId>narya-parent</artifactId>
+    <version>1.12-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>naryalib</artifactId>
+  <packaging>swc</packaging>
+  <name>Narya ActionScript</name>
+
+  <repositories>
+    <repository>
+      <id>ooo-public</id>
+      <url>http://ooo-maven.googlecode.com/hg/repository</url>
+    </repository>
+    <repository>
+      <id>flexmojos</id>
+      <url>http://repository.sonatype.org/content/groups/flexgroup/</url>
+    </repository>
+  </repositories>
+
+  <properties>
+    <flex.version>4.1.0.16076</flex.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.threerings</groupId>
+      <artifactId>aspirin</artifactId>
+      <version>1.11</version>
+      <type>swc</type>
+      <scope>external</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.adobe</groupId>
+      <artifactId>as3corelib</artifactId>
+      <version>0.93</version>
+      <type>swc</type>
+      <scope>external</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osflash</groupId>
+      <artifactId>signals</artifactId>
+      <version>0.8</version>
+      <type>swc</type>
+      <scope>external</scope>
+    </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>3.9</version>
+        <configuration>
+          <omitTraceStatements>false</omitTraceStatements>
+          <debug>true</debug>
+          <incremental>false</incremental>
+          <useNetwork>false</useNetwork>
+          <verboseStacktraces>true</verboseStacktraces>
+        </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/core/src/main/as/com/threerings/bureau/client/Agent.as b/aslib/src/main/as/com/threerings/bureau/client/Agent.as
similarity index 100%
rename from core/src/main/as/com/threerings/bureau/client/Agent.as
rename to aslib/src/main/as/com/threerings/bureau/client/Agent.as
diff --git a/core/src/main/as/com/threerings/bureau/client/BureauClient.as b/aslib/src/main/as/com/threerings/bureau/client/BureauClient.as
similarity index 100%
rename from core/src/main/as/com/threerings/bureau/client/BureauClient.as
rename to aslib/src/main/as/com/threerings/bureau/client/BureauClient.as
diff --git a/core/src/main/as/com/threerings/bureau/client/BureauDecoder.as b/aslib/src/main/as/com/threerings/bureau/client/BureauDecoder.as
similarity index 100%
rename from core/src/main/as/com/threerings/bureau/client/BureauDecoder.as
rename to aslib/src/main/as/com/threerings/bureau/client/BureauDecoder.as
diff --git a/core/src/main/as/com/threerings/bureau/client/BureauDirector.as b/aslib/src/main/as/com/threerings/bureau/client/BureauDirector.as
similarity index 100%
rename from core/src/main/as/com/threerings/bureau/client/BureauDirector.as
rename to aslib/src/main/as/com/threerings/bureau/client/BureauDirector.as
diff --git a/core/src/main/as/com/threerings/bureau/client/BureauReceiver.as b/aslib/src/main/as/com/threerings/bureau/client/BureauReceiver.as
similarity index 100%
rename from core/src/main/as/com/threerings/bureau/client/BureauReceiver.as
rename to aslib/src/main/as/com/threerings/bureau/client/BureauReceiver.as
diff --git a/core/src/main/as/com/threerings/bureau/client/BureauService.as b/aslib/src/main/as/com/threerings/bureau/client/BureauService.as
similarity index 100%
rename from core/src/main/as/com/threerings/bureau/client/BureauService.as
rename to aslib/src/main/as/com/threerings/bureau/client/BureauService.as
diff --git a/core/src/main/as/com/threerings/bureau/data/AgentObject.as b/aslib/src/main/as/com/threerings/bureau/data/AgentObject.as
similarity index 100%
rename from core/src/main/as/com/threerings/bureau/data/AgentObject.as
rename to aslib/src/main/as/com/threerings/bureau/data/AgentObject.as
diff --git a/core/src/main/as/com/threerings/bureau/data/BureauAuthName.as b/aslib/src/main/as/com/threerings/bureau/data/BureauAuthName.as
similarity index 100%
rename from core/src/main/as/com/threerings/bureau/data/BureauAuthName.as
rename to aslib/src/main/as/com/threerings/bureau/data/BureauAuthName.as
diff --git a/core/src/main/as/com/threerings/bureau/data/BureauClientObject.as b/aslib/src/main/as/com/threerings/bureau/data/BureauClientObject.as
similarity index 100%
rename from core/src/main/as/com/threerings/bureau/data/BureauClientObject.as
rename to aslib/src/main/as/com/threerings/bureau/data/BureauClientObject.as
diff --git a/core/src/main/as/com/threerings/bureau/data/BureauCodes.as b/aslib/src/main/as/com/threerings/bureau/data/BureauCodes.as
similarity index 100%
rename from core/src/main/as/com/threerings/bureau/data/BureauCodes.as
rename to aslib/src/main/as/com/threerings/bureau/data/BureauCodes.as
diff --git a/core/src/main/as/com/threerings/bureau/data/BureauCredentials.as b/aslib/src/main/as/com/threerings/bureau/data/BureauCredentials.as
similarity index 100%
rename from core/src/main/as/com/threerings/bureau/data/BureauCredentials.as
rename to aslib/src/main/as/com/threerings/bureau/data/BureauCredentials.as
diff --git a/core/src/main/as/com/threerings/bureau/data/BureauMarshaller.as b/aslib/src/main/as/com/threerings/bureau/data/BureauMarshaller.as
similarity index 100%
rename from core/src/main/as/com/threerings/bureau/data/BureauMarshaller.as
rename to aslib/src/main/as/com/threerings/bureau/data/BureauMarshaller.as
diff --git a/core/src/main/as/com/threerings/bureau/util/BureauContext.as b/aslib/src/main/as/com/threerings/bureau/util/BureauContext.as
similarity index 100%
rename from core/src/main/as/com/threerings/bureau/util/BureauContext.as
rename to aslib/src/main/as/com/threerings/bureau/util/BureauContext.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/client/BroadcastHandler.as b/aslib/src/main/as/com/threerings/crowd/chat/client/BroadcastHandler.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/client/BroadcastHandler.as
rename to aslib/src/main/as/com/threerings/crowd/chat/client/BroadcastHandler.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/client/ChannelSpeakService.as b/aslib/src/main/as/com/threerings/crowd/chat/client/ChannelSpeakService.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/client/ChannelSpeakService.as
rename to aslib/src/main/as/com/threerings/crowd/chat/client/ChannelSpeakService.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/client/ChatCantStealFocus.as b/aslib/src/main/as/com/threerings/crowd/chat/client/ChatCantStealFocus.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/client/ChatCantStealFocus.as
rename to aslib/src/main/as/com/threerings/crowd/chat/client/ChatCantStealFocus.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/client/ChatDirector.as b/aslib/src/main/as/com/threerings/crowd/chat/client/ChatDirector.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/client/ChatDirector.as
rename to aslib/src/main/as/com/threerings/crowd/chat/client/ChatDirector.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/client/ChatDisplay.as b/aslib/src/main/as/com/threerings/crowd/chat/client/ChatDisplay.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/client/ChatDisplay.as
rename to aslib/src/main/as/com/threerings/crowd/chat/client/ChatDisplay.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/client/ChatFilter.as b/aslib/src/main/as/com/threerings/crowd/chat/client/ChatFilter.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/client/ChatFilter.as
rename to aslib/src/main/as/com/threerings/crowd/chat/client/ChatFilter.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/client/ChatService.as b/aslib/src/main/as/com/threerings/crowd/chat/client/ChatService.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/client/ChatService.as
rename to aslib/src/main/as/com/threerings/crowd/chat/client/ChatService.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/client/ChatService_TellListener.as b/aslib/src/main/as/com/threerings/crowd/chat/client/ChatService_TellListener.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/client/ChatService_TellListener.as
rename to aslib/src/main/as/com/threerings/crowd/chat/client/ChatService_TellListener.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/client/ChatSnooper.as b/aslib/src/main/as/com/threerings/crowd/chat/client/ChatSnooper.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/client/ChatSnooper.as
rename to aslib/src/main/as/com/threerings/crowd/chat/client/ChatSnooper.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/client/ChatterObserver.as b/aslib/src/main/as/com/threerings/crowd/chat/client/ChatterObserver.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/client/ChatterObserver.as
rename to aslib/src/main/as/com/threerings/crowd/chat/client/ChatterObserver.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/client/ChatterValidator.as b/aslib/src/main/as/com/threerings/crowd/chat/client/ChatterValidator.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/client/ChatterValidator.as
rename to aslib/src/main/as/com/threerings/crowd/chat/client/ChatterValidator.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/client/ClearHandler.as b/aslib/src/main/as/com/threerings/crowd/chat/client/ClearHandler.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/client/ClearHandler.as
rename to aslib/src/main/as/com/threerings/crowd/chat/client/ClearHandler.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/client/CommandHandler.as b/aslib/src/main/as/com/threerings/crowd/chat/client/CommandHandler.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/client/CommandHandler.as
rename to aslib/src/main/as/com/threerings/crowd/chat/client/CommandHandler.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/client/CurseFilter.as b/aslib/src/main/as/com/threerings/crowd/chat/client/CurseFilter.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/client/CurseFilter.as
rename to aslib/src/main/as/com/threerings/crowd/chat/client/CurseFilter.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/client/EmoteHandler.as b/aslib/src/main/as/com/threerings/crowd/chat/client/EmoteHandler.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/client/EmoteHandler.as
rename to aslib/src/main/as/com/threerings/crowd/chat/client/EmoteHandler.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/client/HelpHandler.as b/aslib/src/main/as/com/threerings/crowd/chat/client/HelpHandler.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/client/HelpHandler.as
rename to aslib/src/main/as/com/threerings/crowd/chat/client/HelpHandler.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/client/MuteDirector.as b/aslib/src/main/as/com/threerings/crowd/chat/client/MuteDirector.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/client/MuteDirector.as
rename to aslib/src/main/as/com/threerings/crowd/chat/client/MuteDirector.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/client/MuteObserver.as b/aslib/src/main/as/com/threerings/crowd/chat/client/MuteObserver.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/client/MuteObserver.as
rename to aslib/src/main/as/com/threerings/crowd/chat/client/MuteObserver.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/client/SpeakHandler.as b/aslib/src/main/as/com/threerings/crowd/chat/client/SpeakHandler.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/client/SpeakHandler.as
rename to aslib/src/main/as/com/threerings/crowd/chat/client/SpeakHandler.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/client/SpeakService.as b/aslib/src/main/as/com/threerings/crowd/chat/client/SpeakService.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/client/SpeakService.as
rename to aslib/src/main/as/com/threerings/crowd/chat/client/SpeakService.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/client/TellAdapter.as b/aslib/src/main/as/com/threerings/crowd/chat/client/TellAdapter.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/client/TellAdapter.as
rename to aslib/src/main/as/com/threerings/crowd/chat/client/TellAdapter.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/client/TellHandler.as b/aslib/src/main/as/com/threerings/crowd/chat/client/TellHandler.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/client/TellHandler.as
rename to aslib/src/main/as/com/threerings/crowd/chat/client/TellHandler.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/client/ThinkHandler.as b/aslib/src/main/as/com/threerings/crowd/chat/client/ThinkHandler.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/client/ThinkHandler.as
rename to aslib/src/main/as/com/threerings/crowd/chat/client/ThinkHandler.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.as b/aslib/src/main/as/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.as
rename to aslib/src/main/as/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/data/ChatChannel.as b/aslib/src/main/as/com/threerings/crowd/chat/data/ChatChannel.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/data/ChatChannel.as
rename to aslib/src/main/as/com/threerings/crowd/chat/data/ChatChannel.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/data/ChatCodes.as b/aslib/src/main/as/com/threerings/crowd/chat/data/ChatCodes.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/data/ChatCodes.as
rename to aslib/src/main/as/com/threerings/crowd/chat/data/ChatCodes.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller.as b/aslib/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller.as
rename to aslib/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller_TellMarshaller.as b/aslib/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller_TellMarshaller.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller_TellMarshaller.as
rename to aslib/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller_TellMarshaller.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/data/ChatMessage.as b/aslib/src/main/as/com/threerings/crowd/chat/data/ChatMessage.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/data/ChatMessage.as
rename to aslib/src/main/as/com/threerings/crowd/chat/data/ChatMessage.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/data/SpeakMarshaller.as b/aslib/src/main/as/com/threerings/crowd/chat/data/SpeakMarshaller.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/data/SpeakMarshaller.as
rename to aslib/src/main/as/com/threerings/crowd/chat/data/SpeakMarshaller.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/data/SystemMessage.as b/aslib/src/main/as/com/threerings/crowd/chat/data/SystemMessage.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/data/SystemMessage.as
rename to aslib/src/main/as/com/threerings/crowd/chat/data/SystemMessage.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/data/TellFeedbackMessage.as b/aslib/src/main/as/com/threerings/crowd/chat/data/TellFeedbackMessage.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/data/TellFeedbackMessage.as
rename to aslib/src/main/as/com/threerings/crowd/chat/data/TellFeedbackMessage.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/data/UserMessage.as b/aslib/src/main/as/com/threerings/crowd/chat/data/UserMessage.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/data/UserMessage.as
rename to aslib/src/main/as/com/threerings/crowd/chat/data/UserMessage.as
diff --git a/core/src/main/as/com/threerings/crowd/chat/data/UserSystemMessage.as b/aslib/src/main/as/com/threerings/crowd/chat/data/UserSystemMessage.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/chat/data/UserSystemMessage.as
rename to aslib/src/main/as/com/threerings/crowd/chat/data/UserSystemMessage.as
diff --git a/core/src/main/as/com/threerings/crowd/client/BodyService.as b/aslib/src/main/as/com/threerings/crowd/client/BodyService.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/client/BodyService.as
rename to aslib/src/main/as/com/threerings/crowd/client/BodyService.as
diff --git a/core/src/main/as/com/threerings/crowd/client/CrowdClient.as b/aslib/src/main/as/com/threerings/crowd/client/CrowdClient.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/client/CrowdClient.as
rename to aslib/src/main/as/com/threerings/crowd/client/CrowdClient.as
diff --git a/core/src/main/as/com/threerings/crowd/client/LocationAdapter.as b/aslib/src/main/as/com/threerings/crowd/client/LocationAdapter.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/client/LocationAdapter.as
rename to aslib/src/main/as/com/threerings/crowd/client/LocationAdapter.as
diff --git a/core/src/main/as/com/threerings/crowd/client/LocationDecoder.as b/aslib/src/main/as/com/threerings/crowd/client/LocationDecoder.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/client/LocationDecoder.as
rename to aslib/src/main/as/com/threerings/crowd/client/LocationDecoder.as
diff --git a/core/src/main/as/com/threerings/crowd/client/LocationDirector.as b/aslib/src/main/as/com/threerings/crowd/client/LocationDirector.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/client/LocationDirector.as
rename to aslib/src/main/as/com/threerings/crowd/client/LocationDirector.as
diff --git a/core/src/main/as/com/threerings/crowd/client/LocationDirector_FailureHandler.as b/aslib/src/main/as/com/threerings/crowd/client/LocationDirector_FailureHandler.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/client/LocationDirector_FailureHandler.as
rename to aslib/src/main/as/com/threerings/crowd/client/LocationDirector_FailureHandler.as
diff --git a/core/src/main/as/com/threerings/crowd/client/LocationObserver.as b/aslib/src/main/as/com/threerings/crowd/client/LocationObserver.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/client/LocationObserver.as
rename to aslib/src/main/as/com/threerings/crowd/client/LocationObserver.as
diff --git a/core/src/main/as/com/threerings/crowd/client/LocationReceiver.as b/aslib/src/main/as/com/threerings/crowd/client/LocationReceiver.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/client/LocationReceiver.as
rename to aslib/src/main/as/com/threerings/crowd/client/LocationReceiver.as
diff --git a/core/src/main/as/com/threerings/crowd/client/LocationService.as b/aslib/src/main/as/com/threerings/crowd/client/LocationService.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/client/LocationService.as
rename to aslib/src/main/as/com/threerings/crowd/client/LocationService.as
diff --git a/core/src/main/as/com/threerings/crowd/client/LocationService_MoveListener.as b/aslib/src/main/as/com/threerings/crowd/client/LocationService_MoveListener.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/client/LocationService_MoveListener.as
rename to aslib/src/main/as/com/threerings/crowd/client/LocationService_MoveListener.as
diff --git a/core/src/main/as/com/threerings/crowd/client/MoveAdapter.as b/aslib/src/main/as/com/threerings/crowd/client/MoveAdapter.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/client/MoveAdapter.as
rename to aslib/src/main/as/com/threerings/crowd/client/MoveAdapter.as
diff --git a/core/src/main/as/com/threerings/crowd/client/MoveFailedError.as b/aslib/src/main/as/com/threerings/crowd/client/MoveFailedError.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/client/MoveFailedError.as
rename to aslib/src/main/as/com/threerings/crowd/client/MoveFailedError.as
diff --git a/core/src/main/as/com/threerings/crowd/client/MoveVetoedError.as b/aslib/src/main/as/com/threerings/crowd/client/MoveVetoedError.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/client/MoveVetoedError.as
rename to aslib/src/main/as/com/threerings/crowd/client/MoveVetoedError.as
diff --git a/core/src/main/as/com/threerings/crowd/client/OccupantAdapter.as b/aslib/src/main/as/com/threerings/crowd/client/OccupantAdapter.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/client/OccupantAdapter.as
rename to aslib/src/main/as/com/threerings/crowd/client/OccupantAdapter.as
diff --git a/core/src/main/as/com/threerings/crowd/client/OccupantDirector.as b/aslib/src/main/as/com/threerings/crowd/client/OccupantDirector.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/client/OccupantDirector.as
rename to aslib/src/main/as/com/threerings/crowd/client/OccupantDirector.as
diff --git a/core/src/main/as/com/threerings/crowd/client/OccupantObserver.as b/aslib/src/main/as/com/threerings/crowd/client/OccupantObserver.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/client/OccupantObserver.as
rename to aslib/src/main/as/com/threerings/crowd/client/OccupantObserver.as
diff --git a/core/src/main/as/com/threerings/crowd/client/PlaceController.as b/aslib/src/main/as/com/threerings/crowd/client/PlaceController.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/client/PlaceController.as
rename to aslib/src/main/as/com/threerings/crowd/client/PlaceController.as
diff --git a/core/src/main/as/com/threerings/crowd/client/PlaceControllerDelegate.as b/aslib/src/main/as/com/threerings/crowd/client/PlaceControllerDelegate.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/client/PlaceControllerDelegate.as
rename to aslib/src/main/as/com/threerings/crowd/client/PlaceControllerDelegate.as
diff --git a/core/src/main/as/com/threerings/crowd/client/PlaceView.as b/aslib/src/main/as/com/threerings/crowd/client/PlaceView.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/client/PlaceView.as
rename to aslib/src/main/as/com/threerings/crowd/client/PlaceView.as
diff --git a/core/src/main/as/com/threerings/crowd/client/PlaceViewUtil.as b/aslib/src/main/as/com/threerings/crowd/client/PlaceViewUtil.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/client/PlaceViewUtil.as
rename to aslib/src/main/as/com/threerings/crowd/client/PlaceViewUtil.as
diff --git a/core/src/main/as/com/threerings/crowd/data/BodyMarshaller.as b/aslib/src/main/as/com/threerings/crowd/data/BodyMarshaller.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/data/BodyMarshaller.as
rename to aslib/src/main/as/com/threerings/crowd/data/BodyMarshaller.as
diff --git a/core/src/main/as/com/threerings/crowd/data/BodyObject.as b/aslib/src/main/as/com/threerings/crowd/data/BodyObject.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/data/BodyObject.as
rename to aslib/src/main/as/com/threerings/crowd/data/BodyObject.as
diff --git a/core/src/main/as/com/threerings/crowd/data/CrowdCodes.as b/aslib/src/main/as/com/threerings/crowd/data/CrowdCodes.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/data/CrowdCodes.as
rename to aslib/src/main/as/com/threerings/crowd/data/CrowdCodes.as
diff --git a/core/src/main/as/com/threerings/crowd/data/CrowdPermissionPolicy.as b/aslib/src/main/as/com/threerings/crowd/data/CrowdPermissionPolicy.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/data/CrowdPermissionPolicy.as
rename to aslib/src/main/as/com/threerings/crowd/data/CrowdPermissionPolicy.as
diff --git a/core/src/main/as/com/threerings/crowd/data/LocationCodes.as b/aslib/src/main/as/com/threerings/crowd/data/LocationCodes.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/data/LocationCodes.as
rename to aslib/src/main/as/com/threerings/crowd/data/LocationCodes.as
diff --git a/core/src/main/as/com/threerings/crowd/data/LocationMarshaller.as b/aslib/src/main/as/com/threerings/crowd/data/LocationMarshaller.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/data/LocationMarshaller.as
rename to aslib/src/main/as/com/threerings/crowd/data/LocationMarshaller.as
diff --git a/core/src/main/as/com/threerings/crowd/data/LocationMarshaller_MoveMarshaller.as b/aslib/src/main/as/com/threerings/crowd/data/LocationMarshaller_MoveMarshaller.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/data/LocationMarshaller_MoveMarshaller.as
rename to aslib/src/main/as/com/threerings/crowd/data/LocationMarshaller_MoveMarshaller.as
diff --git a/core/src/main/as/com/threerings/crowd/data/ManagerCaller.as b/aslib/src/main/as/com/threerings/crowd/data/ManagerCaller.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/data/ManagerCaller.as
rename to aslib/src/main/as/com/threerings/crowd/data/ManagerCaller.as
diff --git a/core/src/main/as/com/threerings/crowd/data/OccupantInfo.as b/aslib/src/main/as/com/threerings/crowd/data/OccupantInfo.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/data/OccupantInfo.as
rename to aslib/src/main/as/com/threerings/crowd/data/OccupantInfo.as
diff --git a/core/src/main/as/com/threerings/crowd/data/Place.as b/aslib/src/main/as/com/threerings/crowd/data/Place.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/data/Place.as
rename to aslib/src/main/as/com/threerings/crowd/data/Place.as
diff --git a/core/src/main/as/com/threerings/crowd/data/PlaceConfig.as b/aslib/src/main/as/com/threerings/crowd/data/PlaceConfig.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/data/PlaceConfig.as
rename to aslib/src/main/as/com/threerings/crowd/data/PlaceConfig.as
diff --git a/core/src/main/as/com/threerings/crowd/data/PlaceObject.as b/aslib/src/main/as/com/threerings/crowd/data/PlaceObject.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/data/PlaceObject.as
rename to aslib/src/main/as/com/threerings/crowd/data/PlaceObject.as
diff --git a/core/src/main/as/com/threerings/crowd/data/TokenRing.as b/aslib/src/main/as/com/threerings/crowd/data/TokenRing.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/data/TokenRing.as
rename to aslib/src/main/as/com/threerings/crowd/data/TokenRing.as
diff --git a/core/src/main/as/com/threerings/crowd/peer/data/CrowdClientInfo.as b/aslib/src/main/as/com/threerings/crowd/peer/data/CrowdClientInfo.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/peer/data/CrowdClientInfo.as
rename to aslib/src/main/as/com/threerings/crowd/peer/data/CrowdClientInfo.as
diff --git a/core/src/main/as/com/threerings/crowd/util/CrowdContext.as b/aslib/src/main/as/com/threerings/crowd/util/CrowdContext.as
similarity index 100%
rename from core/src/main/as/com/threerings/crowd/util/CrowdContext.as
rename to aslib/src/main/as/com/threerings/crowd/util/CrowdContext.as
diff --git a/core/src/main/as/com/threerings/io/ArrayMask.as b/aslib/src/main/as/com/threerings/io/ArrayMask.as
similarity index 100%
rename from core/src/main/as/com/threerings/io/ArrayMask.as
rename to aslib/src/main/as/com/threerings/io/ArrayMask.as
diff --git a/core/src/main/as/com/threerings/io/ClassMapping.as b/aslib/src/main/as/com/threerings/io/ClassMapping.as
similarity index 100%
rename from core/src/main/as/com/threerings/io/ClassMapping.as
rename to aslib/src/main/as/com/threerings/io/ClassMapping.as
diff --git a/core/src/main/as/com/threerings/io/FrameAvailableEvent.as b/aslib/src/main/as/com/threerings/io/FrameAvailableEvent.as
similarity index 100%
rename from core/src/main/as/com/threerings/io/FrameAvailableEvent.as
rename to aslib/src/main/as/com/threerings/io/FrameAvailableEvent.as
diff --git a/core/src/main/as/com/threerings/io/FrameReader.as b/aslib/src/main/as/com/threerings/io/FrameReader.as
similarity index 100%
rename from core/src/main/as/com/threerings/io/FrameReader.as
rename to aslib/src/main/as/com/threerings/io/FrameReader.as
diff --git a/core/src/main/as/com/threerings/io/ObjectInputStream.as b/aslib/src/main/as/com/threerings/io/ObjectInputStream.as
similarity index 100%
rename from core/src/main/as/com/threerings/io/ObjectInputStream.as
rename to aslib/src/main/as/com/threerings/io/ObjectInputStream.as
diff --git a/core/src/main/as/com/threerings/io/ObjectOutputStream.as b/aslib/src/main/as/com/threerings/io/ObjectOutputStream.as
similarity index 100%
rename from core/src/main/as/com/threerings/io/ObjectOutputStream.as
rename to aslib/src/main/as/com/threerings/io/ObjectOutputStream.as
diff --git a/core/src/main/as/com/threerings/io/SimpleStreamableObject.as b/aslib/src/main/as/com/threerings/io/SimpleStreamableObject.as
similarity index 100%
rename from core/src/main/as/com/threerings/io/SimpleStreamableObject.as
rename to aslib/src/main/as/com/threerings/io/SimpleStreamableObject.as
diff --git a/core/src/main/as/com/threerings/io/Streamable.as b/aslib/src/main/as/com/threerings/io/Streamable.as
similarity index 100%
rename from core/src/main/as/com/threerings/io/Streamable.as
rename to aslib/src/main/as/com/threerings/io/Streamable.as
diff --git a/core/src/main/as/com/threerings/io/Streamer.as b/aslib/src/main/as/com/threerings/io/Streamer.as
similarity index 100%
rename from core/src/main/as/com/threerings/io/Streamer.as
rename to aslib/src/main/as/com/threerings/io/Streamer.as
diff --git a/core/src/main/as/com/threerings/io/Translations.as b/aslib/src/main/as/com/threerings/io/Translations.as
similarity index 100%
rename from core/src/main/as/com/threerings/io/Translations.as
rename to aslib/src/main/as/com/threerings/io/Translations.as
diff --git a/core/src/main/as/com/threerings/io/TypedArray.as b/aslib/src/main/as/com/threerings/io/TypedArray.as
similarity index 100%
rename from core/src/main/as/com/threerings/io/TypedArray.as
rename to aslib/src/main/as/com/threerings/io/TypedArray.as
diff --git a/core/src/main/as/com/threerings/io/streamers/ArrayStreamer.as b/aslib/src/main/as/com/threerings/io/streamers/ArrayStreamer.as
similarity index 100%
rename from core/src/main/as/com/threerings/io/streamers/ArrayStreamer.as
rename to aslib/src/main/as/com/threerings/io/streamers/ArrayStreamer.as
diff --git a/core/src/main/as/com/threerings/io/streamers/ByteArrayStreamer.as b/aslib/src/main/as/com/threerings/io/streamers/ByteArrayStreamer.as
similarity index 100%
rename from core/src/main/as/com/threerings/io/streamers/ByteArrayStreamer.as
rename to aslib/src/main/as/com/threerings/io/streamers/ByteArrayStreamer.as
diff --git a/core/src/main/as/com/threerings/io/streamers/ByteEnumStreamer.as b/aslib/src/main/as/com/threerings/io/streamers/ByteEnumStreamer.as
similarity index 100%
rename from core/src/main/as/com/threerings/io/streamers/ByteEnumStreamer.as
rename to aslib/src/main/as/com/threerings/io/streamers/ByteEnumStreamer.as
diff --git a/core/src/main/as/com/threerings/io/streamers/DelegatingStreamer.as b/aslib/src/main/as/com/threerings/io/streamers/DelegatingStreamer.as
similarity index 100%
rename from core/src/main/as/com/threerings/io/streamers/DelegatingStreamer.as
rename to aslib/src/main/as/com/threerings/io/streamers/DelegatingStreamer.as
diff --git a/core/src/main/as/com/threerings/io/streamers/EnumStreamer.as b/aslib/src/main/as/com/threerings/io/streamers/EnumStreamer.as
similarity index 100%
rename from core/src/main/as/com/threerings/io/streamers/EnumStreamer.as
rename to aslib/src/main/as/com/threerings/io/streamers/EnumStreamer.as
diff --git a/core/src/main/as/com/threerings/io/streamers/MapStreamer.as b/aslib/src/main/as/com/threerings/io/streamers/MapStreamer.as
similarity index 100%
rename from core/src/main/as/com/threerings/io/streamers/MapStreamer.as
rename to aslib/src/main/as/com/threerings/io/streamers/MapStreamer.as
diff --git a/core/src/main/as/com/threerings/io/streamers/NumberStreamer.as b/aslib/src/main/as/com/threerings/io/streamers/NumberStreamer.as
similarity index 100%
rename from core/src/main/as/com/threerings/io/streamers/NumberStreamer.as
rename to aslib/src/main/as/com/threerings/io/streamers/NumberStreamer.as
diff --git a/core/src/main/as/com/threerings/io/streamers/SetStreamer.as b/aslib/src/main/as/com/threerings/io/streamers/SetStreamer.as
similarity index 100%
rename from core/src/main/as/com/threerings/io/streamers/SetStreamer.as
rename to aslib/src/main/as/com/threerings/io/streamers/SetStreamer.as
diff --git a/core/src/main/as/com/threerings/io/streamers/StringStreamer.as b/aslib/src/main/as/com/threerings/io/streamers/StringStreamer.as
similarity index 100%
rename from core/src/main/as/com/threerings/io/streamers/StringStreamer.as
rename to aslib/src/main/as/com/threerings/io/streamers/StringStreamer.as
diff --git a/core/src/main/as/com/threerings/presents/client/BasicDirector.as b/aslib/src/main/as/com/threerings/presents/client/BasicDirector.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/client/BasicDirector.as
rename to aslib/src/main/as/com/threerings/presents/client/BasicDirector.as
diff --git a/core/src/main/as/com/threerings/presents/client/Client.as b/aslib/src/main/as/com/threerings/presents/client/Client.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/client/Client.as
rename to aslib/src/main/as/com/threerings/presents/client/Client.as
diff --git a/core/src/main/as/com/threerings/presents/client/ClientAdapter.as b/aslib/src/main/as/com/threerings/presents/client/ClientAdapter.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/client/ClientAdapter.as
rename to aslib/src/main/as/com/threerings/presents/client/ClientAdapter.as
diff --git a/core/src/main/as/com/threerings/presents/client/ClientDObjectMgr.as b/aslib/src/main/as/com/threerings/presents/client/ClientDObjectMgr.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/client/ClientDObjectMgr.as
rename to aslib/src/main/as/com/threerings/presents/client/ClientDObjectMgr.as
diff --git a/core/src/main/as/com/threerings/presents/client/ClientEvent.as b/aslib/src/main/as/com/threerings/presents/client/ClientEvent.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/client/ClientEvent.as
rename to aslib/src/main/as/com/threerings/presents/client/ClientEvent.as
diff --git a/core/src/main/as/com/threerings/presents/client/ClientObserver.as b/aslib/src/main/as/com/threerings/presents/client/ClientObserver.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/client/ClientObserver.as
rename to aslib/src/main/as/com/threerings/presents/client/ClientObserver.as
diff --git a/core/src/main/as/com/threerings/presents/client/Communicator.as b/aslib/src/main/as/com/threerings/presents/client/Communicator.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/client/Communicator.as
rename to aslib/src/main/as/com/threerings/presents/client/Communicator.as
diff --git a/core/src/main/as/com/threerings/presents/client/ConfirmAdapter.as b/aslib/src/main/as/com/threerings/presents/client/ConfirmAdapter.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/client/ConfirmAdapter.as
rename to aslib/src/main/as/com/threerings/presents/client/ConfirmAdapter.as
diff --git a/core/src/main/as/com/threerings/presents/client/DeltaCalculator.as b/aslib/src/main/as/com/threerings/presents/client/DeltaCalculator.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/client/DeltaCalculator.as
rename to aslib/src/main/as/com/threerings/presents/client/DeltaCalculator.as
diff --git a/core/src/main/as/com/threerings/presents/client/InvocationAdapter.as b/aslib/src/main/as/com/threerings/presents/client/InvocationAdapter.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/client/InvocationAdapter.as
rename to aslib/src/main/as/com/threerings/presents/client/InvocationAdapter.as
diff --git a/core/src/main/as/com/threerings/presents/client/InvocationDecoder.as b/aslib/src/main/as/com/threerings/presents/client/InvocationDecoder.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/client/InvocationDecoder.as
rename to aslib/src/main/as/com/threerings/presents/client/InvocationDecoder.as
diff --git a/core/src/main/as/com/threerings/presents/client/InvocationDirector.as b/aslib/src/main/as/com/threerings/presents/client/InvocationDirector.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/client/InvocationDirector.as
rename to aslib/src/main/as/com/threerings/presents/client/InvocationDirector.as
diff --git a/core/src/main/as/com/threerings/presents/client/InvocationReceiver.as b/aslib/src/main/as/com/threerings/presents/client/InvocationReceiver.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/client/InvocationReceiver.as
rename to aslib/src/main/as/com/threerings/presents/client/InvocationReceiver.as
diff --git a/core/src/main/as/com/threerings/presents/client/InvocationReceiver_Registration.as b/aslib/src/main/as/com/threerings/presents/client/InvocationReceiver_Registration.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/client/InvocationReceiver_Registration.as
rename to aslib/src/main/as/com/threerings/presents/client/InvocationReceiver_Registration.as
diff --git a/core/src/main/as/com/threerings/presents/client/InvocationService.as b/aslib/src/main/as/com/threerings/presents/client/InvocationService.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/client/InvocationService.as
rename to aslib/src/main/as/com/threerings/presents/client/InvocationService.as
diff --git a/core/src/main/as/com/threerings/presents/client/InvocationService_ConfirmListener.as b/aslib/src/main/as/com/threerings/presents/client/InvocationService_ConfirmListener.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/client/InvocationService_ConfirmListener.as
rename to aslib/src/main/as/com/threerings/presents/client/InvocationService_ConfirmListener.as
diff --git a/core/src/main/as/com/threerings/presents/client/InvocationService_InvocationListener.as b/aslib/src/main/as/com/threerings/presents/client/InvocationService_InvocationListener.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/client/InvocationService_InvocationListener.as
rename to aslib/src/main/as/com/threerings/presents/client/InvocationService_InvocationListener.as
diff --git a/core/src/main/as/com/threerings/presents/client/InvocationService_ResultListener.as b/aslib/src/main/as/com/threerings/presents/client/InvocationService_ResultListener.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/client/InvocationService_ResultListener.as
rename to aslib/src/main/as/com/threerings/presents/client/InvocationService_ResultListener.as
diff --git a/core/src/main/as/com/threerings/presents/client/LogonError.as b/aslib/src/main/as/com/threerings/presents/client/LogonError.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/client/LogonError.as
rename to aslib/src/main/as/com/threerings/presents/client/LogonError.as
diff --git a/core/src/main/as/com/threerings/presents/client/PresentsPrefs.as b/aslib/src/main/as/com/threerings/presents/client/PresentsPrefs.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/client/PresentsPrefs.as
rename to aslib/src/main/as/com/threerings/presents/client/PresentsPrefs.as
diff --git a/core/src/main/as/com/threerings/presents/client/ResultAdapter.as b/aslib/src/main/as/com/threerings/presents/client/ResultAdapter.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/client/ResultAdapter.as
rename to aslib/src/main/as/com/threerings/presents/client/ResultAdapter.as
diff --git a/core/src/main/as/com/threerings/presents/client/ServerSwitcher.as b/aslib/src/main/as/com/threerings/presents/client/ServerSwitcher.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/client/ServerSwitcher.as
rename to aslib/src/main/as/com/threerings/presents/client/ServerSwitcher.as
diff --git a/core/src/main/as/com/threerings/presents/client/SessionObserver.as b/aslib/src/main/as/com/threerings/presents/client/SessionObserver.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/client/SessionObserver.as
rename to aslib/src/main/as/com/threerings/presents/client/SessionObserver.as
diff --git a/core/src/main/as/com/threerings/presents/client/TimeBaseService.as b/aslib/src/main/as/com/threerings/presents/client/TimeBaseService.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/client/TimeBaseService.as
rename to aslib/src/main/as/com/threerings/presents/client/TimeBaseService.as
diff --git a/core/src/main/as/com/threerings/presents/client/TimeBaseService_GotTimeBaseListener.as b/aslib/src/main/as/com/threerings/presents/client/TimeBaseService_GotTimeBaseListener.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/client/TimeBaseService_GotTimeBaseListener.as
rename to aslib/src/main/as/com/threerings/presents/client/TimeBaseService_GotTimeBaseListener.as
diff --git a/core/src/main/as/com/threerings/presents/data/AuthCodes.as b/aslib/src/main/as/com/threerings/presents/data/AuthCodes.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/data/AuthCodes.as
rename to aslib/src/main/as/com/threerings/presents/data/AuthCodes.as
diff --git a/core/src/main/as/com/threerings/presents/data/ClientObject.as b/aslib/src/main/as/com/threerings/presents/data/ClientObject.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/data/ClientObject.as
rename to aslib/src/main/as/com/threerings/presents/data/ClientObject.as
diff --git a/core/src/main/as/com/threerings/presents/data/ConMgrStats.as b/aslib/src/main/as/com/threerings/presents/data/ConMgrStats.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/data/ConMgrStats.as
rename to aslib/src/main/as/com/threerings/presents/data/ConMgrStats.as
diff --git a/core/src/main/as/com/threerings/presents/data/InvocationCodes.as b/aslib/src/main/as/com/threerings/presents/data/InvocationCodes.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/data/InvocationCodes.as
rename to aslib/src/main/as/com/threerings/presents/data/InvocationCodes.as
diff --git a/core/src/main/as/com/threerings/presents/data/InvocationMarshaller.as b/aslib/src/main/as/com/threerings/presents/data/InvocationMarshaller.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/data/InvocationMarshaller.as
rename to aslib/src/main/as/com/threerings/presents/data/InvocationMarshaller.as
diff --git a/core/src/main/as/com/threerings/presents/data/InvocationMarshaller_ConfirmMarshaller.as b/aslib/src/main/as/com/threerings/presents/data/InvocationMarshaller_ConfirmMarshaller.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/data/InvocationMarshaller_ConfirmMarshaller.as
rename to aslib/src/main/as/com/threerings/presents/data/InvocationMarshaller_ConfirmMarshaller.as
diff --git a/core/src/main/as/com/threerings/presents/data/InvocationMarshaller_ListenerMarshaller.as b/aslib/src/main/as/com/threerings/presents/data/InvocationMarshaller_ListenerMarshaller.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/data/InvocationMarshaller_ListenerMarshaller.as
rename to aslib/src/main/as/com/threerings/presents/data/InvocationMarshaller_ListenerMarshaller.as
diff --git a/core/src/main/as/com/threerings/presents/data/InvocationMarshaller_ResultMarshaller.as b/aslib/src/main/as/com/threerings/presents/data/InvocationMarshaller_ResultMarshaller.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/data/InvocationMarshaller_ResultMarshaller.as
rename to aslib/src/main/as/com/threerings/presents/data/InvocationMarshaller_ResultMarshaller.as
diff --git a/core/src/main/as/com/threerings/presents/data/Permission.as b/aslib/src/main/as/com/threerings/presents/data/Permission.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/data/Permission.as
rename to aslib/src/main/as/com/threerings/presents/data/Permission.as
diff --git a/core/src/main/as/com/threerings/presents/data/PermissionPolicy.as b/aslib/src/main/as/com/threerings/presents/data/PermissionPolicy.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/data/PermissionPolicy.as
rename to aslib/src/main/as/com/threerings/presents/data/PermissionPolicy.as
diff --git a/core/src/main/as/com/threerings/presents/data/TimeBaseMarshaller.as b/aslib/src/main/as/com/threerings/presents/data/TimeBaseMarshaller.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/data/TimeBaseMarshaller.as
rename to aslib/src/main/as/com/threerings/presents/data/TimeBaseMarshaller.as
diff --git a/core/src/main/as/com/threerings/presents/data/TimeBaseMarshaller_GotTimeBaseMarshaller.as b/aslib/src/main/as/com/threerings/presents/data/TimeBaseMarshaller_GotTimeBaseMarshaller.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/data/TimeBaseMarshaller_GotTimeBaseMarshaller.as
rename to aslib/src/main/as/com/threerings/presents/data/TimeBaseMarshaller_GotTimeBaseMarshaller.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/AttributeChangeAdapter.as b/aslib/src/main/as/com/threerings/presents/dobj/AttributeChangeAdapter.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/AttributeChangeAdapter.as
rename to aslib/src/main/as/com/threerings/presents/dobj/AttributeChangeAdapter.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/AttributeChangeListener.as b/aslib/src/main/as/com/threerings/presents/dobj/AttributeChangeListener.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/AttributeChangeListener.as
rename to aslib/src/main/as/com/threerings/presents/dobj/AttributeChangeListener.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/AttributeChangedEvent.as b/aslib/src/main/as/com/threerings/presents/dobj/AttributeChangedEvent.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/AttributeChangedEvent.as
rename to aslib/src/main/as/com/threerings/presents/dobj/AttributeChangedEvent.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/ChangeListener.as b/aslib/src/main/as/com/threerings/presents/dobj/ChangeListener.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/ChangeListener.as
rename to aslib/src/main/as/com/threerings/presents/dobj/ChangeListener.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/CompoundEvent.as b/aslib/src/main/as/com/threerings/presents/dobj/CompoundEvent.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/CompoundEvent.as
rename to aslib/src/main/as/com/threerings/presents/dobj/CompoundEvent.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/DEvent.as b/aslib/src/main/as/com/threerings/presents/dobj/DEvent.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/DEvent.as
rename to aslib/src/main/as/com/threerings/presents/dobj/DEvent.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/DObject.as b/aslib/src/main/as/com/threerings/presents/dobj/DObject.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/DObject.as
rename to aslib/src/main/as/com/threerings/presents/dobj/DObject.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/DObjectManager.as b/aslib/src/main/as/com/threerings/presents/dobj/DObjectManager.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/DObjectManager.as
rename to aslib/src/main/as/com/threerings/presents/dobj/DObjectManager.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/DSet.as b/aslib/src/main/as/com/threerings/presents/dobj/DSet.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/DSet.as
rename to aslib/src/main/as/com/threerings/presents/dobj/DSet.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/DSet_Entry.as b/aslib/src/main/as/com/threerings/presents/dobj/DSet_Entry.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/DSet_Entry.as
rename to aslib/src/main/as/com/threerings/presents/dobj/DSet_Entry.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/DummyEntry.as b/aslib/src/main/as/com/threerings/presents/dobj/DummyEntry.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/DummyEntry.as
rename to aslib/src/main/as/com/threerings/presents/dobj/DummyEntry.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/ElementUpdateListener.as b/aslib/src/main/as/com/threerings/presents/dobj/ElementUpdateListener.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/ElementUpdateListener.as
rename to aslib/src/main/as/com/threerings/presents/dobj/ElementUpdateListener.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/ElementUpdatedEvent.as b/aslib/src/main/as/com/threerings/presents/dobj/ElementUpdatedEvent.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/ElementUpdatedEvent.as
rename to aslib/src/main/as/com/threerings/presents/dobj/ElementUpdatedEvent.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/EntryAddedEvent.as b/aslib/src/main/as/com/threerings/presents/dobj/EntryAddedEvent.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/EntryAddedEvent.as
rename to aslib/src/main/as/com/threerings/presents/dobj/EntryAddedEvent.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/EntryRemovedEvent.as b/aslib/src/main/as/com/threerings/presents/dobj/EntryRemovedEvent.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/EntryRemovedEvent.as
rename to aslib/src/main/as/com/threerings/presents/dobj/EntryRemovedEvent.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/EntryUpdatedEvent.as b/aslib/src/main/as/com/threerings/presents/dobj/EntryUpdatedEvent.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/EntryUpdatedEvent.as
rename to aslib/src/main/as/com/threerings/presents/dobj/EntryUpdatedEvent.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/EventAdapter.as b/aslib/src/main/as/com/threerings/presents/dobj/EventAdapter.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/EventAdapter.as
rename to aslib/src/main/as/com/threerings/presents/dobj/EventAdapter.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/EventListener.as b/aslib/src/main/as/com/threerings/presents/dobj/EventListener.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/EventListener.as
rename to aslib/src/main/as/com/threerings/presents/dobj/EventListener.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/InvocationNotificationEvent.as b/aslib/src/main/as/com/threerings/presents/dobj/InvocationNotificationEvent.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/InvocationNotificationEvent.as
rename to aslib/src/main/as/com/threerings/presents/dobj/InvocationNotificationEvent.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/InvocationRequestEvent.as b/aslib/src/main/as/com/threerings/presents/dobj/InvocationRequestEvent.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/InvocationRequestEvent.as
rename to aslib/src/main/as/com/threerings/presents/dobj/InvocationRequestEvent.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/InvocationResponseEvent.as b/aslib/src/main/as/com/threerings/presents/dobj/InvocationResponseEvent.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/InvocationResponseEvent.as
rename to aslib/src/main/as/com/threerings/presents/dobj/InvocationResponseEvent.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/MessageAdapter.as b/aslib/src/main/as/com/threerings/presents/dobj/MessageAdapter.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/MessageAdapter.as
rename to aslib/src/main/as/com/threerings/presents/dobj/MessageAdapter.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/MessageEvent.as b/aslib/src/main/as/com/threerings/presents/dobj/MessageEvent.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/MessageEvent.as
rename to aslib/src/main/as/com/threerings/presents/dobj/MessageEvent.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/MessageListener.as b/aslib/src/main/as/com/threerings/presents/dobj/MessageListener.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/MessageListener.as
rename to aslib/src/main/as/com/threerings/presents/dobj/MessageListener.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/NamedEvent.as b/aslib/src/main/as/com/threerings/presents/dobj/NamedEvent.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/NamedEvent.as
rename to aslib/src/main/as/com/threerings/presents/dobj/NamedEvent.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/ObjectAccessError.as b/aslib/src/main/as/com/threerings/presents/dobj/ObjectAccessError.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/ObjectAccessError.as
rename to aslib/src/main/as/com/threerings/presents/dobj/ObjectAccessError.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/ObjectAddedEvent.as b/aslib/src/main/as/com/threerings/presents/dobj/ObjectAddedEvent.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/ObjectAddedEvent.as
rename to aslib/src/main/as/com/threerings/presents/dobj/ObjectAddedEvent.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/ObjectDeathAdapter.as b/aslib/src/main/as/com/threerings/presents/dobj/ObjectDeathAdapter.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/ObjectDeathAdapter.as
rename to aslib/src/main/as/com/threerings/presents/dobj/ObjectDeathAdapter.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/ObjectDeathListener.as b/aslib/src/main/as/com/threerings/presents/dobj/ObjectDeathListener.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/ObjectDeathListener.as
rename to aslib/src/main/as/com/threerings/presents/dobj/ObjectDeathListener.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/ObjectDestroyedEvent.as b/aslib/src/main/as/com/threerings/presents/dobj/ObjectDestroyedEvent.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/ObjectDestroyedEvent.as
rename to aslib/src/main/as/com/threerings/presents/dobj/ObjectDestroyedEvent.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/ObjectRemovedEvent.as b/aslib/src/main/as/com/threerings/presents/dobj/ObjectRemovedEvent.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/ObjectRemovedEvent.as
rename to aslib/src/main/as/com/threerings/presents/dobj/ObjectRemovedEvent.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/OidList.as b/aslib/src/main/as/com/threerings/presents/dobj/OidList.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/OidList.as
rename to aslib/src/main/as/com/threerings/presents/dobj/OidList.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/OidListListener.as b/aslib/src/main/as/com/threerings/presents/dobj/OidListListener.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/OidListListener.as
rename to aslib/src/main/as/com/threerings/presents/dobj/OidListListener.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/ServerMessageEvent.as b/aslib/src/main/as/com/threerings/presents/dobj/ServerMessageEvent.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/ServerMessageEvent.as
rename to aslib/src/main/as/com/threerings/presents/dobj/ServerMessageEvent.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/SetAdapter.as b/aslib/src/main/as/com/threerings/presents/dobj/SetAdapter.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/SetAdapter.as
rename to aslib/src/main/as/com/threerings/presents/dobj/SetAdapter.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/SetListener.as b/aslib/src/main/as/com/threerings/presents/dobj/SetListener.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/SetListener.as
rename to aslib/src/main/as/com/threerings/presents/dobj/SetListener.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/Subscriber.as b/aslib/src/main/as/com/threerings/presents/dobj/Subscriber.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/Subscriber.as
rename to aslib/src/main/as/com/threerings/presents/dobj/Subscriber.as
diff --git a/core/src/main/as/com/threerings/presents/dobj/SubscriberAdapter.as b/aslib/src/main/as/com/threerings/presents/dobj/SubscriberAdapter.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/dobj/SubscriberAdapter.as
rename to aslib/src/main/as/com/threerings/presents/dobj/SubscriberAdapter.as
diff --git a/core/src/main/as/com/threerings/presents/net/AuthRequest.as b/aslib/src/main/as/com/threerings/presents/net/AuthRequest.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/net/AuthRequest.as
rename to aslib/src/main/as/com/threerings/presents/net/AuthRequest.as
diff --git a/core/src/main/as/com/threerings/presents/net/AuthResponse.as b/aslib/src/main/as/com/threerings/presents/net/AuthResponse.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/net/AuthResponse.as
rename to aslib/src/main/as/com/threerings/presents/net/AuthResponse.as
diff --git a/core/src/main/as/com/threerings/presents/net/AuthResponseData.as b/aslib/src/main/as/com/threerings/presents/net/AuthResponseData.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/net/AuthResponseData.as
rename to aslib/src/main/as/com/threerings/presents/net/AuthResponseData.as
diff --git a/core/src/main/as/com/threerings/presents/net/BootstrapData.as b/aslib/src/main/as/com/threerings/presents/net/BootstrapData.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/net/BootstrapData.as
rename to aslib/src/main/as/com/threerings/presents/net/BootstrapData.as
diff --git a/core/src/main/as/com/threerings/presents/net/BootstrapNotification.as b/aslib/src/main/as/com/threerings/presents/net/BootstrapNotification.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/net/BootstrapNotification.as
rename to aslib/src/main/as/com/threerings/presents/net/BootstrapNotification.as
diff --git a/core/src/main/as/com/threerings/presents/net/CompoundDownstreamMessage.as b/aslib/src/main/as/com/threerings/presents/net/CompoundDownstreamMessage.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/net/CompoundDownstreamMessage.as
rename to aslib/src/main/as/com/threerings/presents/net/CompoundDownstreamMessage.as
diff --git a/core/src/main/as/com/threerings/presents/net/CompoundUpstreamMessage.as b/aslib/src/main/as/com/threerings/presents/net/CompoundUpstreamMessage.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/net/CompoundUpstreamMessage.as
rename to aslib/src/main/as/com/threerings/presents/net/CompoundUpstreamMessage.as
diff --git a/core/src/main/as/com/threerings/presents/net/Credentials.as b/aslib/src/main/as/com/threerings/presents/net/Credentials.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/net/Credentials.as
rename to aslib/src/main/as/com/threerings/presents/net/Credentials.as
diff --git a/core/src/main/as/com/threerings/presents/net/Credentials_HasLanguage.as b/aslib/src/main/as/com/threerings/presents/net/Credentials_HasLanguage.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/net/Credentials_HasLanguage.as
rename to aslib/src/main/as/com/threerings/presents/net/Credentials_HasLanguage.as
diff --git a/core/src/main/as/com/threerings/presents/net/Credentials_HasMachineIdent.as b/aslib/src/main/as/com/threerings/presents/net/Credentials_HasMachineIdent.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/net/Credentials_HasMachineIdent.as
rename to aslib/src/main/as/com/threerings/presents/net/Credentials_HasMachineIdent.as
diff --git a/core/src/main/as/com/threerings/presents/net/DownstreamMessage.as b/aslib/src/main/as/com/threerings/presents/net/DownstreamMessage.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/net/DownstreamMessage.as
rename to aslib/src/main/as/com/threerings/presents/net/DownstreamMessage.as
diff --git a/core/src/main/as/com/threerings/presents/net/EventNotification.as b/aslib/src/main/as/com/threerings/presents/net/EventNotification.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/net/EventNotification.as
rename to aslib/src/main/as/com/threerings/presents/net/EventNotification.as
diff --git a/core/src/main/as/com/threerings/presents/net/FailureResponse.as b/aslib/src/main/as/com/threerings/presents/net/FailureResponse.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/net/FailureResponse.as
rename to aslib/src/main/as/com/threerings/presents/net/FailureResponse.as
diff --git a/core/src/main/as/com/threerings/presents/net/ForwardEventRequest.as b/aslib/src/main/as/com/threerings/presents/net/ForwardEventRequest.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/net/ForwardEventRequest.as
rename to aslib/src/main/as/com/threerings/presents/net/ForwardEventRequest.as
diff --git a/core/src/main/as/com/threerings/presents/net/LogoffRequest.as b/aslib/src/main/as/com/threerings/presents/net/LogoffRequest.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/net/LogoffRequest.as
rename to aslib/src/main/as/com/threerings/presents/net/LogoffRequest.as
diff --git a/core/src/main/as/com/threerings/presents/net/ObjectResponse.as b/aslib/src/main/as/com/threerings/presents/net/ObjectResponse.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/net/ObjectResponse.as
rename to aslib/src/main/as/com/threerings/presents/net/ObjectResponse.as
diff --git a/core/src/main/as/com/threerings/presents/net/PingRequest.as b/aslib/src/main/as/com/threerings/presents/net/PingRequest.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/net/PingRequest.as
rename to aslib/src/main/as/com/threerings/presents/net/PingRequest.as
diff --git a/core/src/main/as/com/threerings/presents/net/PongResponse.as b/aslib/src/main/as/com/threerings/presents/net/PongResponse.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/net/PongResponse.as
rename to aslib/src/main/as/com/threerings/presents/net/PongResponse.as
diff --git a/core/src/main/as/com/threerings/presents/net/ServiceCreds.as b/aslib/src/main/as/com/threerings/presents/net/ServiceCreds.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/net/ServiceCreds.as
rename to aslib/src/main/as/com/threerings/presents/net/ServiceCreds.as
diff --git a/core/src/main/as/com/threerings/presents/net/SubscribeRequest.as b/aslib/src/main/as/com/threerings/presents/net/SubscribeRequest.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/net/SubscribeRequest.as
rename to aslib/src/main/as/com/threerings/presents/net/SubscribeRequest.as
diff --git a/core/src/main/as/com/threerings/presents/net/ThrottleUpdatedMessage.as b/aslib/src/main/as/com/threerings/presents/net/ThrottleUpdatedMessage.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/net/ThrottleUpdatedMessage.as
rename to aslib/src/main/as/com/threerings/presents/net/ThrottleUpdatedMessage.as
diff --git a/core/src/main/as/com/threerings/presents/net/UnsubscribeRequest.as b/aslib/src/main/as/com/threerings/presents/net/UnsubscribeRequest.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/net/UnsubscribeRequest.as
rename to aslib/src/main/as/com/threerings/presents/net/UnsubscribeRequest.as
diff --git a/core/src/main/as/com/threerings/presents/net/UnsubscribeResponse.as b/aslib/src/main/as/com/threerings/presents/net/UnsubscribeResponse.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/net/UnsubscribeResponse.as
rename to aslib/src/main/as/com/threerings/presents/net/UnsubscribeResponse.as
diff --git a/core/src/main/as/com/threerings/presents/net/UpdateThrottleMessage.as b/aslib/src/main/as/com/threerings/presents/net/UpdateThrottleMessage.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/net/UpdateThrottleMessage.as
rename to aslib/src/main/as/com/threerings/presents/net/UpdateThrottleMessage.as
diff --git a/core/src/main/as/com/threerings/presents/net/UpstreamMessage.as b/aslib/src/main/as/com/threerings/presents/net/UpstreamMessage.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/net/UpstreamMessage.as
rename to aslib/src/main/as/com/threerings/presents/net/UpstreamMessage.as
diff --git a/core/src/main/as/com/threerings/presents/net/UsernamePasswordCreds.as b/aslib/src/main/as/com/threerings/presents/net/UsernamePasswordCreds.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/net/UsernamePasswordCreds.as
rename to aslib/src/main/as/com/threerings/presents/net/UsernamePasswordCreds.as
diff --git a/core/src/main/as/com/threerings/presents/peer/data/ClientInfo.as b/aslib/src/main/as/com/threerings/presents/peer/data/ClientInfo.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/peer/data/ClientInfo.as
rename to aslib/src/main/as/com/threerings/presents/peer/data/ClientInfo.as
diff --git a/core/src/main/as/com/threerings/presents/util/PresentsContext.as b/aslib/src/main/as/com/threerings/presents/util/PresentsContext.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/util/PresentsContext.as
rename to aslib/src/main/as/com/threerings/presents/util/PresentsContext.as
diff --git a/core/src/main/as/com/threerings/presents/util/SafeObjectManager.as b/aslib/src/main/as/com/threerings/presents/util/SafeObjectManager.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/util/SafeObjectManager.as
rename to aslib/src/main/as/com/threerings/presents/util/SafeObjectManager.as
diff --git a/core/src/main/as/com/threerings/presents/util/SafeSubscriber.as b/aslib/src/main/as/com/threerings/presents/util/SafeSubscriber.as
similarity index 100%
rename from core/src/main/as/com/threerings/presents/util/SafeSubscriber.as
rename to aslib/src/main/as/com/threerings/presents/util/SafeSubscriber.as
diff --git a/core/src/main/as/com/threerings/util/ArrayIterator.as b/aslib/src/main/as/com/threerings/util/ArrayIterator.as
similarity index 100%
rename from core/src/main/as/com/threerings/util/ArrayIterator.as
rename to aslib/src/main/as/com/threerings/util/ArrayIterator.as
diff --git a/core/src/main/as/com/threerings/util/Boxed.as b/aslib/src/main/as/com/threerings/util/Boxed.as
similarity index 100%
rename from core/src/main/as/com/threerings/util/Boxed.as
rename to aslib/src/main/as/com/threerings/util/Boxed.as
diff --git a/core/src/main/as/com/threerings/util/Byte.as b/aslib/src/main/as/com/threerings/util/Byte.as
similarity index 100%
rename from core/src/main/as/com/threerings/util/Byte.as
rename to aslib/src/main/as/com/threerings/util/Byte.as
diff --git a/core/src/main/as/com/threerings/util/EmbeddedSwfLoader.as b/aslib/src/main/as/com/threerings/util/EmbeddedSwfLoader.as
similarity index 100%
rename from core/src/main/as/com/threerings/util/EmbeddedSwfLoader.as
rename to aslib/src/main/as/com/threerings/util/EmbeddedSwfLoader.as
diff --git a/core/src/main/as/com/threerings/util/Float.as b/aslib/src/main/as/com/threerings/util/Float.as
similarity index 100%
rename from core/src/main/as/com/threerings/util/Float.as
rename to aslib/src/main/as/com/threerings/util/Float.as
diff --git a/core/src/main/as/com/threerings/util/Integer.as b/aslib/src/main/as/com/threerings/util/Integer.as
similarity index 100%
rename from core/src/main/as/com/threerings/util/Integer.as
rename to aslib/src/main/as/com/threerings/util/Integer.as
diff --git a/core/src/main/as/com/threerings/util/Iterator.as b/aslib/src/main/as/com/threerings/util/Iterator.as
similarity index 100%
rename from core/src/main/as/com/threerings/util/Iterator.as
rename to aslib/src/main/as/com/threerings/util/Iterator.as
diff --git a/core/src/main/as/com/threerings/util/Long.as b/aslib/src/main/as/com/threerings/util/Long.as
similarity index 100%
rename from core/src/main/as/com/threerings/util/Long.as
rename to aslib/src/main/as/com/threerings/util/Long.as
diff --git a/core/src/main/as/com/threerings/util/MessageBundle.as b/aslib/src/main/as/com/threerings/util/MessageBundle.as
similarity index 100%
rename from core/src/main/as/com/threerings/util/MessageBundle.as
rename to aslib/src/main/as/com/threerings/util/MessageBundle.as
diff --git a/core/src/main/as/com/threerings/util/MessageManager.as b/aslib/src/main/as/com/threerings/util/MessageManager.as
similarity index 100%
rename from core/src/main/as/com/threerings/util/MessageManager.as
rename to aslib/src/main/as/com/threerings/util/MessageManager.as
diff --git a/core/src/main/as/com/threerings/util/Name.as b/aslib/src/main/as/com/threerings/util/Name.as
similarity index 100%
rename from core/src/main/as/com/threerings/util/Name.as
rename to aslib/src/main/as/com/threerings/util/Name.as
diff --git a/core/src/main/as/com/threerings/util/ObjectMarshaller.as b/aslib/src/main/as/com/threerings/util/ObjectMarshaller.as
similarity index 100%
rename from core/src/main/as/com/threerings/util/ObjectMarshaller.as
rename to aslib/src/main/as/com/threerings/util/ObjectMarshaller.as
diff --git a/core/src/main/as/com/threerings/util/ResultAdapter.as b/aslib/src/main/as/com/threerings/util/ResultAdapter.as
similarity index 100%
rename from core/src/main/as/com/threerings/util/ResultAdapter.as
rename to aslib/src/main/as/com/threerings/util/ResultAdapter.as
diff --git a/core/src/main/as/com/threerings/util/ResultListener.as b/aslib/src/main/as/com/threerings/util/ResultListener.as
similarity index 100%
rename from core/src/main/as/com/threerings/util/ResultListener.as
rename to aslib/src/main/as/com/threerings/util/ResultListener.as
diff --git a/core/src/main/as/com/threerings/util/Short.as b/aslib/src/main/as/com/threerings/util/Short.as
similarity index 100%
rename from core/src/main/as/com/threerings/util/Short.as
rename to aslib/src/main/as/com/threerings/util/Short.as
diff --git a/core/src/main/as/com/threerings/util/StreamableArrayList.as b/aslib/src/main/as/com/threerings/util/StreamableArrayList.as
similarity index 100%
rename from core/src/main/as/com/threerings/util/StreamableArrayList.as
rename to aslib/src/main/as/com/threerings/util/StreamableArrayList.as
diff --git a/core/src/main/as/com/threerings/util/StreamableHashMap.as b/aslib/src/main/as/com/threerings/util/StreamableHashMap.as
similarity index 100%
rename from core/src/main/as/com/threerings/util/StreamableHashMap.as
rename to aslib/src/main/as/com/threerings/util/StreamableHashMap.as
diff --git a/core/src/main/as/com/threerings/util/TimeUtil.as b/aslib/src/main/as/com/threerings/util/TimeUtil.as
similarity index 100%
rename from core/src/main/as/com/threerings/util/TimeUtil.as
rename to aslib/src/main/as/com/threerings/util/TimeUtil.as
diff --git a/core/src/main/as/com/threerings/util/langBoolean.as b/aslib/src/main/as/com/threerings/util/langBoolean.as
similarity index 100%
rename from core/src/main/as/com/threerings/util/langBoolean.as
rename to aslib/src/main/as/com/threerings/util/langBoolean.as
diff --git a/build.xml b/build.xml
index 872b74314..15064182c 100644
--- a/build.xml
+++ b/build.xml
@@ -3,7 +3,7 @@
 <project name="narya" default="compile" xmlns:artifact="urn:maven-artifact-ant">
   <property name="deploy.dir"   location="dist"/>
   <property name="src.dir"      location="core/src/main/java"/>
-  <property name="asrc.dir"     location="core/src/main/as"/>
+  <property name="asrc.dir"     location="aslib/src/main/as"/>
   <property name="tsrc.dir"     location="core/src/test/java"/>
   <property name="classes.dir"  location="${deploy.dir}/classes"/>
   <property name="tclasses.dir" location="${deploy.dir}/test-classes"/>
@@ -14,7 +14,12 @@
 
   <target name="-prepare" depends="-init-ooo">
     <mavendep pom="core/pom.xml" id="pom"/>
-    <mavendep pom="etc/as-pom.xml" pathProp="aslib.path"/>
+    <!-- we can't use <mavendep> here because we need to exclude our pom depends -->
+    <artifact:dependencies filesetId="aslib.fileset" cacheDependencyRefs="true" type="swc"
+      dependencyRefsBuildFile="${deploy.dir}/aslib-pom.dependencies">
+      <pom file="aslib/pom.xml"/>
+    </artifact:dependencies>
+    <pathconvert pathsep="," property="aslib.path" refid="aslib.fileset"/>
     <mavendep pom="core/pom.xml" id="test" scope="test"/>
     <mkdir dir="${deploy.dir}"/>
     <mkdir dir="${deploy.dir}/lib"/>
@@ -50,7 +55,7 @@
     <delete failonerror="false"><fileset dir="${deploy.dir}" includes="*.jar"/></delete>
     <delete failonerror="false"><fileset dir="${deploy.dir}" includes="*.swc"/></delete>
     <cleanmavendepcache pom="pom.xml"/>
-    <cleanmavendepcache pom="etc/as-pom.xml"/>
+    <cleanmavendepcache pom="aslib/pom.xml"/>
     <cleanmavendepcache id="test"/>
   </target>
 
@@ -194,7 +199,7 @@
       <fileset dir="${tsrc.dir}" includes="**/*Service.java"/>
     </genservice>
     <gencppservice header="etc/SOURCE_HEADER" classpathref="built.classpath"
-                   cpproot="core/src/cpp" checking="${gencheck}">
+                   cpproot="cpplib/src" checking="${gencheck}">
         <fileset dir="${src.dir}" includes="**/RegistrationService.java"/>
     </gencppservice>
   </target>
@@ -219,7 +224,7 @@
        everything for it -->
   <target name="gencppstream" depends="-preptools,compile"
           description="Generates C++ streamable classes.">
-    <gencppstreamable classpathref="built.classpath" cpproot="core/src/cpp" checking="${gencheck}">
+    <gencppstreamable classpathref="built.classpath" cpproot="cpplib/src" checking="${gencheck}">
       <generate class="com.threerings.presents.client.InvocationReceiver$Registration"/>
       <generate class="com.threerings.presents.data.ClientObject"/>
       <generate class="com.threerings.presents.dobj.DEvent"/>
@@ -264,7 +269,7 @@
           description="Installs artifacts to local Maven repository.">
     <maveninstall file="pom.xml" pom="pom.xml"/>
     <maveninstall file="${deploy.dir}/${ant.project.name}.jar" pom="core/pom.xml"/>
-    <maveninstall file="${deploy.dir}/${ant.project.name}lib.swc" pom="etc/as-pom.xml"/>
+    <maveninstall file="${deploy.dir}/${ant.project.name}lib.swc" pom="aslib/pom.xml"/>
   </target>
 
   <target name="deploy" depends="dist,aslib,tests,javadoc"
@@ -272,6 +277,6 @@
     <mavendeploy file="pom.xml" pom="pom.xml"/>
     <mavendeploy file="${deploy.dir}/${ant.project.name}.jar" pom="core/pom.xml"
                  srcdir="${src.dir}" docdir="${deploy.dir}/docs"/>
-    <mavendeploy file="${deploy.dir}/${ant.project.name}lib.swc" pom="etc/as-pom.xml"/>
+    <mavendeploy file="${deploy.dir}/${ant.project.name}lib.swc" pom="aslib/pom.xml"/>
   </target>
 </project>
diff --git a/core/narya.xcodeproj/project.pbxproj b/cpplib/narya.xcodeproj/project.pbxproj
similarity index 100%
rename from core/narya.xcodeproj/project.pbxproj
rename to cpplib/narya.xcodeproj/project.pbxproj
diff --git a/core/src/cpp/presents/ArrayMask.cpp b/cpplib/src/presents/ArrayMask.cpp
similarity index 100%
rename from core/src/cpp/presents/ArrayMask.cpp
rename to cpplib/src/presents/ArrayMask.cpp
diff --git a/core/src/cpp/presents/ArrayMask.h b/cpplib/src/presents/ArrayMask.h
similarity index 100%
rename from core/src/cpp/presents/ArrayMask.h
rename to cpplib/src/presents/ArrayMask.h
diff --git a/core/src/cpp/presents/ClassMapping.h b/cpplib/src/presents/ClassMapping.h
similarity index 100%
rename from core/src/cpp/presents/ClassMapping.h
rename to cpplib/src/presents/ClassMapping.h
diff --git a/core/src/cpp/presents/DisconnectReason.h b/cpplib/src/presents/DisconnectReason.h
similarity index 100%
rename from core/src/cpp/presents/DisconnectReason.h
rename to cpplib/src/presents/DisconnectReason.h
diff --git a/core/src/cpp/presents/InvocationDecoder.cpp b/cpplib/src/presents/InvocationDecoder.cpp
similarity index 100%
rename from core/src/cpp/presents/InvocationDecoder.cpp
rename to cpplib/src/presents/InvocationDecoder.cpp
diff --git a/core/src/cpp/presents/InvocationDecoder.h b/cpplib/src/presents/InvocationDecoder.h
similarity index 100%
rename from core/src/cpp/presents/InvocationDecoder.h
rename to cpplib/src/presents/InvocationDecoder.h
diff --git a/core/src/cpp/presents/ObjectInputStream.cpp b/cpplib/src/presents/ObjectInputStream.cpp
similarity index 100%
rename from core/src/cpp/presents/ObjectInputStream.cpp
rename to cpplib/src/presents/ObjectInputStream.cpp
diff --git a/core/src/cpp/presents/ObjectInputStream.h b/cpplib/src/presents/ObjectInputStream.h
similarity index 100%
rename from core/src/cpp/presents/ObjectInputStream.h
rename to cpplib/src/presents/ObjectInputStream.h
diff --git a/core/src/cpp/presents/ObjectOutputStream.cpp b/cpplib/src/presents/ObjectOutputStream.cpp
similarity index 100%
rename from core/src/cpp/presents/ObjectOutputStream.cpp
rename to cpplib/src/presents/ObjectOutputStream.cpp
diff --git a/core/src/cpp/presents/ObjectOutputStream.h b/cpplib/src/presents/ObjectOutputStream.h
similarity index 100%
rename from core/src/cpp/presents/ObjectOutputStream.h
rename to cpplib/src/presents/ObjectOutputStream.h
diff --git a/core/src/cpp/presents/PresentsClient.cpp b/cpplib/src/presents/PresentsClient.cpp
similarity index 100%
rename from core/src/cpp/presents/PresentsClient.cpp
rename to cpplib/src/presents/PresentsClient.cpp
diff --git a/core/src/cpp/presents/PresentsClient.h b/cpplib/src/presents/PresentsClient.h
similarity index 100%
rename from core/src/cpp/presents/PresentsClient.h
rename to cpplib/src/presents/PresentsClient.h
diff --git a/core/src/cpp/presents/PresentsError.h b/cpplib/src/presents/PresentsError.h
similarity index 100%
rename from core/src/cpp/presents/PresentsError.h
rename to cpplib/src/presents/PresentsError.h
diff --git a/core/src/cpp/presents/SocketStream.h b/cpplib/src/presents/SocketStream.h
similarity index 100%
rename from core/src/cpp/presents/SocketStream.h
rename to cpplib/src/presents/SocketStream.h
diff --git a/core/src/cpp/presents/Streamable.h b/cpplib/src/presents/Streamable.h
similarity index 100%
rename from core/src/cpp/presents/Streamable.h
rename to cpplib/src/presents/Streamable.h
diff --git a/core/src/cpp/presents/Streamer.cpp b/cpplib/src/presents/Streamer.cpp
similarity index 100%
rename from core/src/cpp/presents/Streamer.cpp
rename to cpplib/src/presents/Streamer.cpp
diff --git a/core/src/cpp/presents/Streamer.h b/cpplib/src/presents/Streamer.h
similarity index 100%
rename from core/src/cpp/presents/Streamer.h
rename to cpplib/src/presents/Streamer.h
diff --git a/core/src/cpp/presents/Util.cpp b/cpplib/src/presents/Util.cpp
similarity index 100%
rename from core/src/cpp/presents/Util.cpp
rename to cpplib/src/presents/Util.cpp
diff --git a/core/src/cpp/presents/Util.h b/cpplib/src/presents/Util.h
similarity index 100%
rename from core/src/cpp/presents/Util.h
rename to cpplib/src/presents/Util.h
diff --git a/core/src/cpp/presents/box/BoxedBoolean.cpp b/cpplib/src/presents/box/BoxedBoolean.cpp
similarity index 100%
rename from core/src/cpp/presents/box/BoxedBoolean.cpp
rename to cpplib/src/presents/box/BoxedBoolean.cpp
diff --git a/core/src/cpp/presents/box/BoxedBoolean.h b/cpplib/src/presents/box/BoxedBoolean.h
similarity index 100%
rename from core/src/cpp/presents/box/BoxedBoolean.h
rename to cpplib/src/presents/box/BoxedBoolean.h
diff --git a/core/src/cpp/presents/box/BoxedByte.cpp b/cpplib/src/presents/box/BoxedByte.cpp
similarity index 100%
rename from core/src/cpp/presents/box/BoxedByte.cpp
rename to cpplib/src/presents/box/BoxedByte.cpp
diff --git a/core/src/cpp/presents/box/BoxedByte.h b/cpplib/src/presents/box/BoxedByte.h
similarity index 100%
rename from core/src/cpp/presents/box/BoxedByte.h
rename to cpplib/src/presents/box/BoxedByte.h
diff --git a/core/src/cpp/presents/box/BoxedDouble.cpp b/cpplib/src/presents/box/BoxedDouble.cpp
similarity index 100%
rename from core/src/cpp/presents/box/BoxedDouble.cpp
rename to cpplib/src/presents/box/BoxedDouble.cpp
diff --git a/core/src/cpp/presents/box/BoxedDouble.h b/cpplib/src/presents/box/BoxedDouble.h
similarity index 100%
rename from core/src/cpp/presents/box/BoxedDouble.h
rename to cpplib/src/presents/box/BoxedDouble.h
diff --git a/core/src/cpp/presents/box/BoxedFloat.cpp b/cpplib/src/presents/box/BoxedFloat.cpp
similarity index 100%
rename from core/src/cpp/presents/box/BoxedFloat.cpp
rename to cpplib/src/presents/box/BoxedFloat.cpp
diff --git a/core/src/cpp/presents/box/BoxedFloat.h b/cpplib/src/presents/box/BoxedFloat.h
similarity index 100%
rename from core/src/cpp/presents/box/BoxedFloat.h
rename to cpplib/src/presents/box/BoxedFloat.h
diff --git a/core/src/cpp/presents/box/BoxedInt.cpp b/cpplib/src/presents/box/BoxedInt.cpp
similarity index 100%
rename from core/src/cpp/presents/box/BoxedInt.cpp
rename to cpplib/src/presents/box/BoxedInt.cpp
diff --git a/core/src/cpp/presents/box/BoxedInt.h b/cpplib/src/presents/box/BoxedInt.h
similarity index 100%
rename from core/src/cpp/presents/box/BoxedInt.h
rename to cpplib/src/presents/box/BoxedInt.h
diff --git a/core/src/cpp/presents/box/BoxedShort.cpp b/cpplib/src/presents/box/BoxedShort.cpp
similarity index 100%
rename from core/src/cpp/presents/box/BoxedShort.cpp
rename to cpplib/src/presents/box/BoxedShort.cpp
diff --git a/core/src/cpp/presents/box/BoxedShort.h b/cpplib/src/presents/box/BoxedShort.h
similarity index 100%
rename from core/src/cpp/presents/box/BoxedShort.h
rename to cpplib/src/presents/box/BoxedShort.h
diff --git a/core/src/cpp/presents/box/boxer.py b/cpplib/src/presents/box/boxer.py
similarity index 100%
rename from core/src/cpp/presents/box/boxer.py
rename to cpplib/src/presents/box/boxer.py
diff --git a/core/src/cpp/presents/client/Registration.cpp b/cpplib/src/presents/client/Registration.cpp
similarity index 100%
rename from core/src/cpp/presents/client/Registration.cpp
rename to cpplib/src/presents/client/Registration.cpp
diff --git a/core/src/cpp/presents/client/Registration.h b/cpplib/src/presents/client/Registration.h
similarity index 100%
rename from core/src/cpp/presents/client/Registration.h
rename to cpplib/src/presents/client/Registration.h
diff --git a/core/src/cpp/presents/data/ClientObject.cpp b/cpplib/src/presents/data/ClientObject.cpp
similarity index 100%
rename from core/src/cpp/presents/data/ClientObject.cpp
rename to cpplib/src/presents/data/ClientObject.cpp
diff --git a/core/src/cpp/presents/data/ClientObject.h b/cpplib/src/presents/data/ClientObject.h
similarity index 100%
rename from core/src/cpp/presents/data/ClientObject.h
rename to cpplib/src/presents/data/ClientObject.h
diff --git a/core/src/cpp/presents/data/InvocationMarshaller.cpp b/cpplib/src/presents/data/InvocationMarshaller.cpp
similarity index 100%
rename from core/src/cpp/presents/data/InvocationMarshaller.cpp
rename to cpplib/src/presents/data/InvocationMarshaller.cpp
diff --git a/core/src/cpp/presents/data/InvocationMarshaller.h b/cpplib/src/presents/data/InvocationMarshaller.h
similarity index 100%
rename from core/src/cpp/presents/data/InvocationMarshaller.h
rename to cpplib/src/presents/data/InvocationMarshaller.h
diff --git a/core/src/cpp/presents/data/PermissionPolicy.cpp b/cpplib/src/presents/data/PermissionPolicy.cpp
similarity index 100%
rename from core/src/cpp/presents/data/PermissionPolicy.cpp
rename to cpplib/src/presents/data/PermissionPolicy.cpp
diff --git a/core/src/cpp/presents/data/PermissionPolicy.h b/cpplib/src/presents/data/PermissionPolicy.h
similarity index 100%
rename from core/src/cpp/presents/data/PermissionPolicy.h
rename to cpplib/src/presents/data/PermissionPolicy.h
diff --git a/core/src/cpp/presents/data/RegistrationMarshaller.cpp b/cpplib/src/presents/data/RegistrationMarshaller.cpp
similarity index 100%
rename from core/src/cpp/presents/data/RegistrationMarshaller.cpp
rename to cpplib/src/presents/data/RegistrationMarshaller.cpp
diff --git a/core/src/cpp/presents/data/RegistrationMarshaller.h b/cpplib/src/presents/data/RegistrationMarshaller.h
similarity index 100%
rename from core/src/cpp/presents/data/RegistrationMarshaller.h
rename to cpplib/src/presents/data/RegistrationMarshaller.h
diff --git a/core/src/cpp/presents/dobj/DEvent.cpp b/cpplib/src/presents/dobj/DEvent.cpp
similarity index 100%
rename from core/src/cpp/presents/dobj/DEvent.cpp
rename to cpplib/src/presents/dobj/DEvent.cpp
diff --git a/core/src/cpp/presents/dobj/DEvent.h b/cpplib/src/presents/dobj/DEvent.h
similarity index 100%
rename from core/src/cpp/presents/dobj/DEvent.h
rename to cpplib/src/presents/dobj/DEvent.h
diff --git a/core/src/cpp/presents/dobj/DObject.cpp b/cpplib/src/presents/dobj/DObject.cpp
similarity index 100%
rename from core/src/cpp/presents/dobj/DObject.cpp
rename to cpplib/src/presents/dobj/DObject.cpp
diff --git a/core/src/cpp/presents/dobj/DObject.h b/cpplib/src/presents/dobj/DObject.h
similarity index 100%
rename from core/src/cpp/presents/dobj/DObject.h
rename to cpplib/src/presents/dobj/DObject.h
diff --git a/core/src/cpp/presents/dobj/DSet.cpp b/cpplib/src/presents/dobj/DSet.cpp
similarity index 100%
rename from core/src/cpp/presents/dobj/DSet.cpp
rename to cpplib/src/presents/dobj/DSet.cpp
diff --git a/core/src/cpp/presents/dobj/DSet.h b/cpplib/src/presents/dobj/DSet.h
similarity index 100%
rename from core/src/cpp/presents/dobj/DSet.h
rename to cpplib/src/presents/dobj/DSet.h
diff --git a/core/src/cpp/presents/dobj/EntryAddedEvent.cpp b/cpplib/src/presents/dobj/EntryAddedEvent.cpp
similarity index 100%
rename from core/src/cpp/presents/dobj/EntryAddedEvent.cpp
rename to cpplib/src/presents/dobj/EntryAddedEvent.cpp
diff --git a/core/src/cpp/presents/dobj/EntryAddedEvent.h b/cpplib/src/presents/dobj/EntryAddedEvent.h
similarity index 100%
rename from core/src/cpp/presents/dobj/EntryAddedEvent.h
rename to cpplib/src/presents/dobj/EntryAddedEvent.h
diff --git a/core/src/cpp/presents/dobj/EntryEvent.cpp b/cpplib/src/presents/dobj/EntryEvent.cpp
similarity index 100%
rename from core/src/cpp/presents/dobj/EntryEvent.cpp
rename to cpplib/src/presents/dobj/EntryEvent.cpp
diff --git a/core/src/cpp/presents/dobj/EntryEvent.h b/cpplib/src/presents/dobj/EntryEvent.h
similarity index 100%
rename from core/src/cpp/presents/dobj/EntryEvent.h
rename to cpplib/src/presents/dobj/EntryEvent.h
diff --git a/core/src/cpp/presents/dobj/EntryRemovedEvent.cpp b/cpplib/src/presents/dobj/EntryRemovedEvent.cpp
similarity index 100%
rename from core/src/cpp/presents/dobj/EntryRemovedEvent.cpp
rename to cpplib/src/presents/dobj/EntryRemovedEvent.cpp
diff --git a/core/src/cpp/presents/dobj/EntryRemovedEvent.h b/cpplib/src/presents/dobj/EntryRemovedEvent.h
similarity index 100%
rename from core/src/cpp/presents/dobj/EntryRemovedEvent.h
rename to cpplib/src/presents/dobj/EntryRemovedEvent.h
diff --git a/core/src/cpp/presents/dobj/EntryUpdatedEvent.cpp b/cpplib/src/presents/dobj/EntryUpdatedEvent.cpp
similarity index 100%
rename from core/src/cpp/presents/dobj/EntryUpdatedEvent.cpp
rename to cpplib/src/presents/dobj/EntryUpdatedEvent.cpp
diff --git a/core/src/cpp/presents/dobj/EntryUpdatedEvent.h b/cpplib/src/presents/dobj/EntryUpdatedEvent.h
similarity index 100%
rename from core/src/cpp/presents/dobj/EntryUpdatedEvent.h
rename to cpplib/src/presents/dobj/EntryUpdatedEvent.h
diff --git a/core/src/cpp/presents/dobj/InvocationNotificationEvent.cpp b/cpplib/src/presents/dobj/InvocationNotificationEvent.cpp
similarity index 100%
rename from core/src/cpp/presents/dobj/InvocationNotificationEvent.cpp
rename to cpplib/src/presents/dobj/InvocationNotificationEvent.cpp
diff --git a/core/src/cpp/presents/dobj/InvocationNotificationEvent.h b/cpplib/src/presents/dobj/InvocationNotificationEvent.h
similarity index 100%
rename from core/src/cpp/presents/dobj/InvocationNotificationEvent.h
rename to cpplib/src/presents/dobj/InvocationNotificationEvent.h
diff --git a/core/src/cpp/presents/dobj/InvocationRequestEvent.cpp b/cpplib/src/presents/dobj/InvocationRequestEvent.cpp
similarity index 100%
rename from core/src/cpp/presents/dobj/InvocationRequestEvent.cpp
rename to cpplib/src/presents/dobj/InvocationRequestEvent.cpp
diff --git a/core/src/cpp/presents/dobj/InvocationRequestEvent.h b/cpplib/src/presents/dobj/InvocationRequestEvent.h
similarity index 100%
rename from core/src/cpp/presents/dobj/InvocationRequestEvent.h
rename to cpplib/src/presents/dobj/InvocationRequestEvent.h
diff --git a/core/src/cpp/presents/dobj/NamedEvent.cpp b/cpplib/src/presents/dobj/NamedEvent.cpp
similarity index 100%
rename from core/src/cpp/presents/dobj/NamedEvent.cpp
rename to cpplib/src/presents/dobj/NamedEvent.cpp
diff --git a/core/src/cpp/presents/dobj/NamedEvent.h b/cpplib/src/presents/dobj/NamedEvent.h
similarity index 100%
rename from core/src/cpp/presents/dobj/NamedEvent.h
rename to cpplib/src/presents/dobj/NamedEvent.h
diff --git a/core/src/cpp/presents/io/FramedInputStream.cpp b/cpplib/src/presents/io/FramedInputStream.cpp
similarity index 100%
rename from core/src/cpp/presents/io/FramedInputStream.cpp
rename to cpplib/src/presents/io/FramedInputStream.cpp
diff --git a/core/src/cpp/presents/io/FramedInputStream.h b/cpplib/src/presents/io/FramedInputStream.h
similarity index 100%
rename from core/src/cpp/presents/io/FramedInputStream.h
rename to cpplib/src/presents/io/FramedInputStream.h
diff --git a/core/src/cpp/presents/io/FramingOutputStream.cpp b/cpplib/src/presents/io/FramingOutputStream.cpp
similarity index 100%
rename from core/src/cpp/presents/io/FramingOutputStream.cpp
rename to cpplib/src/presents/io/FramingOutputStream.cpp
diff --git a/core/src/cpp/presents/io/FramingOutputStream.h b/cpplib/src/presents/io/FramingOutputStream.h
similarity index 100%
rename from core/src/cpp/presents/io/FramingOutputStream.h
rename to cpplib/src/presents/io/FramingOutputStream.h
diff --git a/core/src/cpp/presents/io/InputStream.h b/cpplib/src/presents/io/InputStream.h
similarity index 100%
rename from core/src/cpp/presents/io/InputStream.h
rename to cpplib/src/presents/io/InputStream.h
diff --git a/core/src/cpp/presents/io/OutputStream.h b/cpplib/src/presents/io/OutputStream.h
similarity index 100%
rename from core/src/cpp/presents/io/OutputStream.h
rename to cpplib/src/presents/io/OutputStream.h
diff --git a/core/src/cpp/presents/net/AuthRequest.cpp b/cpplib/src/presents/net/AuthRequest.cpp
similarity index 100%
rename from core/src/cpp/presents/net/AuthRequest.cpp
rename to cpplib/src/presents/net/AuthRequest.cpp
diff --git a/core/src/cpp/presents/net/AuthRequest.h b/cpplib/src/presents/net/AuthRequest.h
similarity index 100%
rename from core/src/cpp/presents/net/AuthRequest.h
rename to cpplib/src/presents/net/AuthRequest.h
diff --git a/core/src/cpp/presents/net/AuthResponse.cpp b/cpplib/src/presents/net/AuthResponse.cpp
similarity index 100%
rename from core/src/cpp/presents/net/AuthResponse.cpp
rename to cpplib/src/presents/net/AuthResponse.cpp
diff --git a/core/src/cpp/presents/net/AuthResponse.h b/cpplib/src/presents/net/AuthResponse.h
similarity index 100%
rename from core/src/cpp/presents/net/AuthResponse.h
rename to cpplib/src/presents/net/AuthResponse.h
diff --git a/core/src/cpp/presents/net/AuthResponseData.cpp b/cpplib/src/presents/net/AuthResponseData.cpp
similarity index 100%
rename from core/src/cpp/presents/net/AuthResponseData.cpp
rename to cpplib/src/presents/net/AuthResponseData.cpp
diff --git a/core/src/cpp/presents/net/AuthResponseData.h b/cpplib/src/presents/net/AuthResponseData.h
similarity index 100%
rename from core/src/cpp/presents/net/AuthResponseData.h
rename to cpplib/src/presents/net/AuthResponseData.h
diff --git a/core/src/cpp/presents/net/BootstrapData.cpp b/cpplib/src/presents/net/BootstrapData.cpp
similarity index 100%
rename from core/src/cpp/presents/net/BootstrapData.cpp
rename to cpplib/src/presents/net/BootstrapData.cpp
diff --git a/core/src/cpp/presents/net/BootstrapData.h b/cpplib/src/presents/net/BootstrapData.h
similarity index 100%
rename from core/src/cpp/presents/net/BootstrapData.h
rename to cpplib/src/presents/net/BootstrapData.h
diff --git a/core/src/cpp/presents/net/BootstrapNotification.cpp b/cpplib/src/presents/net/BootstrapNotification.cpp
similarity index 100%
rename from core/src/cpp/presents/net/BootstrapNotification.cpp
rename to cpplib/src/presents/net/BootstrapNotification.cpp
diff --git a/core/src/cpp/presents/net/BootstrapNotification.h b/cpplib/src/presents/net/BootstrapNotification.h
similarity index 100%
rename from core/src/cpp/presents/net/BootstrapNotification.h
rename to cpplib/src/presents/net/BootstrapNotification.h
diff --git a/core/src/cpp/presents/net/Credentials.cpp b/cpplib/src/presents/net/Credentials.cpp
similarity index 100%
rename from core/src/cpp/presents/net/Credentials.cpp
rename to cpplib/src/presents/net/Credentials.cpp
diff --git a/core/src/cpp/presents/net/Credentials.h b/cpplib/src/presents/net/Credentials.h
similarity index 100%
rename from core/src/cpp/presents/net/Credentials.h
rename to cpplib/src/presents/net/Credentials.h
diff --git a/core/src/cpp/presents/net/DownstreamMessage.cpp b/cpplib/src/presents/net/DownstreamMessage.cpp
similarity index 100%
rename from core/src/cpp/presents/net/DownstreamMessage.cpp
rename to cpplib/src/presents/net/DownstreamMessage.cpp
diff --git a/core/src/cpp/presents/net/DownstreamMessage.h b/cpplib/src/presents/net/DownstreamMessage.h
similarity index 100%
rename from core/src/cpp/presents/net/DownstreamMessage.h
rename to cpplib/src/presents/net/DownstreamMessage.h
diff --git a/core/src/cpp/presents/net/EventNotification.cpp b/cpplib/src/presents/net/EventNotification.cpp
similarity index 100%
rename from core/src/cpp/presents/net/EventNotification.cpp
rename to cpplib/src/presents/net/EventNotification.cpp
diff --git a/core/src/cpp/presents/net/EventNotification.h b/cpplib/src/presents/net/EventNotification.h
similarity index 100%
rename from core/src/cpp/presents/net/EventNotification.h
rename to cpplib/src/presents/net/EventNotification.h
diff --git a/core/src/cpp/presents/net/ForwardEventRequest.cpp b/cpplib/src/presents/net/ForwardEventRequest.cpp
similarity index 100%
rename from core/src/cpp/presents/net/ForwardEventRequest.cpp
rename to cpplib/src/presents/net/ForwardEventRequest.cpp
diff --git a/core/src/cpp/presents/net/ForwardEventRequest.h b/cpplib/src/presents/net/ForwardEventRequest.h
similarity index 100%
rename from core/src/cpp/presents/net/ForwardEventRequest.h
rename to cpplib/src/presents/net/ForwardEventRequest.h
diff --git a/core/src/cpp/presents/net/ObjectResponse.cpp b/cpplib/src/presents/net/ObjectResponse.cpp
similarity index 100%
rename from core/src/cpp/presents/net/ObjectResponse.cpp
rename to cpplib/src/presents/net/ObjectResponse.cpp
diff --git a/core/src/cpp/presents/net/ObjectResponse.h b/cpplib/src/presents/net/ObjectResponse.h
similarity index 100%
rename from core/src/cpp/presents/net/ObjectResponse.h
rename to cpplib/src/presents/net/ObjectResponse.h
diff --git a/core/src/cpp/presents/net/PingRequest.cpp b/cpplib/src/presents/net/PingRequest.cpp
similarity index 100%
rename from core/src/cpp/presents/net/PingRequest.cpp
rename to cpplib/src/presents/net/PingRequest.cpp
diff --git a/core/src/cpp/presents/net/PingRequest.h b/cpplib/src/presents/net/PingRequest.h
similarity index 100%
rename from core/src/cpp/presents/net/PingRequest.h
rename to cpplib/src/presents/net/PingRequest.h
diff --git a/core/src/cpp/presents/net/PongResponse.cpp b/cpplib/src/presents/net/PongResponse.cpp
similarity index 100%
rename from core/src/cpp/presents/net/PongResponse.cpp
rename to cpplib/src/presents/net/PongResponse.cpp
diff --git a/core/src/cpp/presents/net/PongResponse.h b/cpplib/src/presents/net/PongResponse.h
similarity index 100%
rename from core/src/cpp/presents/net/PongResponse.h
rename to cpplib/src/presents/net/PongResponse.h
diff --git a/core/src/cpp/presents/net/UpstreamMessage.cpp b/cpplib/src/presents/net/UpstreamMessage.cpp
similarity index 100%
rename from core/src/cpp/presents/net/UpstreamMessage.cpp
rename to cpplib/src/presents/net/UpstreamMessage.cpp
diff --git a/core/src/cpp/presents/net/UpstreamMessage.h b/cpplib/src/presents/net/UpstreamMessage.h
similarity index 100%
rename from core/src/cpp/presents/net/UpstreamMessage.h
rename to cpplib/src/presents/net/UpstreamMessage.h
diff --git a/core/src/cpp/presents/net/UsernamePasswordCreds.cpp b/cpplib/src/presents/net/UsernamePasswordCreds.cpp
similarity index 100%
rename from core/src/cpp/presents/net/UsernamePasswordCreds.cpp
rename to cpplib/src/presents/net/UsernamePasswordCreds.cpp
diff --git a/core/src/cpp/presents/net/UsernamePasswordCreds.h b/cpplib/src/presents/net/UsernamePasswordCreds.h
similarity index 100%
rename from core/src/cpp/presents/net/UsernamePasswordCreds.h
rename to cpplib/src/presents/net/UsernamePasswordCreds.h
diff --git a/core/src/cpp/presents/platform/CFSocketStream.cpp b/cpplib/src/presents/platform/CFSocketStream.cpp
similarity index 100%
rename from core/src/cpp/presents/platform/CFSocketStream.cpp
rename to cpplib/src/presents/platform/CFSocketStream.cpp
diff --git a/core/src/cpp/presents/platform/NSLog.mm b/cpplib/src/presents/platform/NSLog.mm
similarity index 100%
rename from core/src/cpp/presents/platform/NSLog.mm
rename to cpplib/src/presents/platform/NSLog.mm
diff --git a/core/src/cpp/presents/stable.h b/cpplib/src/presents/stable.h
similarity index 100%
rename from core/src/cpp/presents/stable.h
rename to cpplib/src/presents/stable.h
diff --git a/core/src/cpp/presents/streamers/StreamableStreamer.h b/cpplib/src/presents/streamers/StreamableStreamer.h
similarity index 100%
rename from core/src/cpp/presents/streamers/StreamableStreamer.h
rename to cpplib/src/presents/streamers/StreamableStreamer.h
diff --git a/core/src/cpp/presents/streamers/StringStreamer.cpp b/cpplib/src/presents/streamers/StringStreamer.cpp
similarity index 100%
rename from core/src/cpp/presents/streamers/StringStreamer.cpp
rename to cpplib/src/presents/streamers/StringStreamer.cpp
diff --git a/core/src/cpp/presents/streamers/StringStreamer.h b/cpplib/src/presents/streamers/StringStreamer.h
similarity index 100%
rename from core/src/cpp/presents/streamers/StringStreamer.h
rename to cpplib/src/presents/streamers/StringStreamer.h
diff --git a/core/src/cpp/presents/streamers/VectorStreamer.h b/cpplib/src/presents/streamers/VectorStreamer.h
similarity index 100%
rename from core/src/cpp/presents/streamers/VectorStreamer.h
rename to cpplib/src/presents/streamers/VectorStreamer.h
diff --git a/core/src/cpp/util/Name.cpp b/cpplib/src/util/Name.cpp
similarity index 100%
rename from core/src/cpp/util/Name.cpp
rename to cpplib/src/util/Name.cpp
diff --git a/core/src/cpp/util/Name.h b/cpplib/src/util/Name.h
similarity index 100%
rename from core/src/cpp/util/Name.h
rename to cpplib/src/util/Name.h
diff --git a/etc/as-pom.xml b/etc/as-pom.xml
deleted file mode 100644
index 3b4032edc..000000000
--- a/etc/as-pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.threerings</groupId>
-  <artifactId>naryalib</artifactId>
-  <packaging>swc</packaging>
-  <version>1.12-SNAPSHOT</version>
-
-  <name>Narya for ActionScript</name>
-  <description>Facilities for making networked multiplayer games.</description>
-
-  <url>http://code.google.com/p/narya/</url>
-  <issueManagement>
-    <url>http://code.google.com/p/narya/issues/list</url>
-  </issueManagement>
-
-  <repositories>
-    <repository>
-      <id>ooo-external</id>
-      <url>http://ooo-maven.googlecode.com/hg/repository</url>
-    </repository>
-  </repositories>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.threerings</groupId>
-      <artifactId>aspirin</artifactId>
-      <version>1.11</version>
-      <type>swc</type>
-    </dependency>
-    <dependency>
-      <groupId>com.adobe</groupId>
-      <artifactId>as3corelib</artifactId>
-      <version>0.93</version>
-      <type>swc</type>
-    </dependency>
-    <dependency>
-      <groupId>org.osflash</groupId>
-      <artifactId>signals</artifactId>
-      <version>0.8</version>
-      <type>swc</type>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/pom.xml b/pom.xml
index 824f5200f..4f884f7e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,7 @@
   <modules>
     <module>core</module>
     <module>tools</module>
+    <module>aslib</module>
   </modules>
 
   <build>