diff --git a/as-pom.xml b/as-pom.xml
new file mode 100644
index 000000000..7e8cc3619
--- /dev/null
+++ b/as-pom.xml
@@ -0,0 +1,38 @@
+
+
+ 4.0.0
+ com.threerings
+ naryalib
+ swc
+ 1.2-SNAPSHOT
+ narya
+ Facilities for making networked multiplayer games.
+ http://code.google.com/p/narya/
+
+ http://code.google.com/p/narya/issues/list
+
+
+
+
+ as3corelib-repo
+ https://github.com/samskivert/as3corelib/raw/master/repository
+
+
+
+
+
+ com.threerings
+ aspirin
+ 1.6
+ compile
+ swc
+
+
+ com.adobe
+ as3corelib
+ 0.93
+ compile
+ swc
+
+
+
diff --git a/build.xml b/build.xml
index 0c610adca..1fb4e124d 100644
--- a/build.xml
+++ b/build.xml
@@ -3,6 +3,7 @@
+
@@ -43,16 +44,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -103,13 +94,21 @@
-
+
-
+
+
+
+
+
+
+
+
@@ -121,8 +120,8 @@
-
-
+
+
@@ -153,7 +152,7 @@
-
+
@@ -235,7 +234,7 @@
-
+
@@ -319,7 +318,7 @@
-
+
@@ -357,5 +356,10 @@
+
+
+
+
+
diff --git a/pom.xml b/pom.xml
index 2ea1148c3..ab4141dc7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@
com.threerings
gwt-utils
- 1.1
+ 1.2
compile
true
diff --git a/src/as/com/threerings/bureau/client/Agent.as b/src/main/as/com/threerings/bureau/client/Agent.as
similarity index 100%
rename from src/as/com/threerings/bureau/client/Agent.as
rename to src/main/as/com/threerings/bureau/client/Agent.as
diff --git a/src/as/com/threerings/bureau/client/BureauClient.as b/src/main/as/com/threerings/bureau/client/BureauClient.as
similarity index 100%
rename from src/as/com/threerings/bureau/client/BureauClient.as
rename to src/main/as/com/threerings/bureau/client/BureauClient.as
diff --git a/src/as/com/threerings/bureau/client/BureauDecoder.as b/src/main/as/com/threerings/bureau/client/BureauDecoder.as
similarity index 100%
rename from src/as/com/threerings/bureau/client/BureauDecoder.as
rename to src/main/as/com/threerings/bureau/client/BureauDecoder.as
diff --git a/src/as/com/threerings/bureau/client/BureauDirector.as b/src/main/as/com/threerings/bureau/client/BureauDirector.as
similarity index 100%
rename from src/as/com/threerings/bureau/client/BureauDirector.as
rename to src/main/as/com/threerings/bureau/client/BureauDirector.as
diff --git a/src/as/com/threerings/bureau/client/BureauReceiver.as b/src/main/as/com/threerings/bureau/client/BureauReceiver.as
similarity index 100%
rename from src/as/com/threerings/bureau/client/BureauReceiver.as
rename to src/main/as/com/threerings/bureau/client/BureauReceiver.as
diff --git a/src/as/com/threerings/bureau/client/BureauService.as b/src/main/as/com/threerings/bureau/client/BureauService.as
similarity index 100%
rename from src/as/com/threerings/bureau/client/BureauService.as
rename to src/main/as/com/threerings/bureau/client/BureauService.as
diff --git a/src/as/com/threerings/bureau/data/AgentObject.as b/src/main/as/com/threerings/bureau/data/AgentObject.as
similarity index 100%
rename from src/as/com/threerings/bureau/data/AgentObject.as
rename to src/main/as/com/threerings/bureau/data/AgentObject.as
diff --git a/src/as/com/threerings/bureau/data/BureauAuthName.as b/src/main/as/com/threerings/bureau/data/BureauAuthName.as
similarity index 100%
rename from src/as/com/threerings/bureau/data/BureauAuthName.as
rename to src/main/as/com/threerings/bureau/data/BureauAuthName.as
diff --git a/src/as/com/threerings/bureau/data/BureauClientObject.as b/src/main/as/com/threerings/bureau/data/BureauClientObject.as
similarity index 100%
rename from src/as/com/threerings/bureau/data/BureauClientObject.as
rename to src/main/as/com/threerings/bureau/data/BureauClientObject.as
diff --git a/src/as/com/threerings/bureau/data/BureauCodes.as b/src/main/as/com/threerings/bureau/data/BureauCodes.as
similarity index 100%
rename from src/as/com/threerings/bureau/data/BureauCodes.as
rename to src/main/as/com/threerings/bureau/data/BureauCodes.as
diff --git a/src/as/com/threerings/bureau/data/BureauCredentials.as b/src/main/as/com/threerings/bureau/data/BureauCredentials.as
similarity index 100%
rename from src/as/com/threerings/bureau/data/BureauCredentials.as
rename to src/main/as/com/threerings/bureau/data/BureauCredentials.as
diff --git a/src/as/com/threerings/bureau/data/BureauMarshaller.as b/src/main/as/com/threerings/bureau/data/BureauMarshaller.as
similarity index 100%
rename from src/as/com/threerings/bureau/data/BureauMarshaller.as
rename to src/main/as/com/threerings/bureau/data/BureauMarshaller.as
diff --git a/src/as/com/threerings/bureau/util/BureauContext.as b/src/main/as/com/threerings/bureau/util/BureauContext.as
similarity index 100%
rename from src/as/com/threerings/bureau/util/BureauContext.as
rename to src/main/as/com/threerings/bureau/util/BureauContext.as
diff --git a/src/as/com/threerings/crowd/chat/client/BroadcastHandler.as b/src/main/as/com/threerings/crowd/chat/client/BroadcastHandler.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/client/BroadcastHandler.as
rename to src/main/as/com/threerings/crowd/chat/client/BroadcastHandler.as
diff --git a/src/as/com/threerings/crowd/chat/client/ChannelSpeakService.as b/src/main/as/com/threerings/crowd/chat/client/ChannelSpeakService.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/client/ChannelSpeakService.as
rename to src/main/as/com/threerings/crowd/chat/client/ChannelSpeakService.as
diff --git a/src/as/com/threerings/crowd/chat/client/ChatCantStealFocus.as b/src/main/as/com/threerings/crowd/chat/client/ChatCantStealFocus.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/client/ChatCantStealFocus.as
rename to src/main/as/com/threerings/crowd/chat/client/ChatCantStealFocus.as
diff --git a/src/as/com/threerings/crowd/chat/client/ChatDirector.as b/src/main/as/com/threerings/crowd/chat/client/ChatDirector.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/client/ChatDirector.as
rename to src/main/as/com/threerings/crowd/chat/client/ChatDirector.as
diff --git a/src/as/com/threerings/crowd/chat/client/ChatDisplay.as b/src/main/as/com/threerings/crowd/chat/client/ChatDisplay.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/client/ChatDisplay.as
rename to src/main/as/com/threerings/crowd/chat/client/ChatDisplay.as
diff --git a/src/as/com/threerings/crowd/chat/client/ChatFilter.as b/src/main/as/com/threerings/crowd/chat/client/ChatFilter.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/client/ChatFilter.as
rename to src/main/as/com/threerings/crowd/chat/client/ChatFilter.as
diff --git a/src/as/com/threerings/crowd/chat/client/ChatService.as b/src/main/as/com/threerings/crowd/chat/client/ChatService.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/client/ChatService.as
rename to src/main/as/com/threerings/crowd/chat/client/ChatService.as
diff --git a/src/as/com/threerings/crowd/chat/client/ChatService_TellListener.as b/src/main/as/com/threerings/crowd/chat/client/ChatService_TellListener.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/client/ChatService_TellListener.as
rename to src/main/as/com/threerings/crowd/chat/client/ChatService_TellListener.as
diff --git a/src/as/com/threerings/crowd/chat/client/ChatSnooper.as b/src/main/as/com/threerings/crowd/chat/client/ChatSnooper.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/client/ChatSnooper.as
rename to src/main/as/com/threerings/crowd/chat/client/ChatSnooper.as
diff --git a/src/as/com/threerings/crowd/chat/client/ChatterObserver.as b/src/main/as/com/threerings/crowd/chat/client/ChatterObserver.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/client/ChatterObserver.as
rename to src/main/as/com/threerings/crowd/chat/client/ChatterObserver.as
diff --git a/src/as/com/threerings/crowd/chat/client/ChatterValidator.as b/src/main/as/com/threerings/crowd/chat/client/ChatterValidator.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/client/ChatterValidator.as
rename to src/main/as/com/threerings/crowd/chat/client/ChatterValidator.as
diff --git a/src/as/com/threerings/crowd/chat/client/ClearHandler.as b/src/main/as/com/threerings/crowd/chat/client/ClearHandler.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/client/ClearHandler.as
rename to src/main/as/com/threerings/crowd/chat/client/ClearHandler.as
diff --git a/src/as/com/threerings/crowd/chat/client/CommandHandler.as b/src/main/as/com/threerings/crowd/chat/client/CommandHandler.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/client/CommandHandler.as
rename to src/main/as/com/threerings/crowd/chat/client/CommandHandler.as
diff --git a/src/as/com/threerings/crowd/chat/client/CurseFilter.as b/src/main/as/com/threerings/crowd/chat/client/CurseFilter.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/client/CurseFilter.as
rename to src/main/as/com/threerings/crowd/chat/client/CurseFilter.as
diff --git a/src/as/com/threerings/crowd/chat/client/EmoteHandler.as b/src/main/as/com/threerings/crowd/chat/client/EmoteHandler.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/client/EmoteHandler.as
rename to src/main/as/com/threerings/crowd/chat/client/EmoteHandler.as
diff --git a/src/as/com/threerings/crowd/chat/client/HelpHandler.as b/src/main/as/com/threerings/crowd/chat/client/HelpHandler.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/client/HelpHandler.as
rename to src/main/as/com/threerings/crowd/chat/client/HelpHandler.as
diff --git a/src/as/com/threerings/crowd/chat/client/MuteDirector.as b/src/main/as/com/threerings/crowd/chat/client/MuteDirector.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/client/MuteDirector.as
rename to src/main/as/com/threerings/crowd/chat/client/MuteDirector.as
diff --git a/src/as/com/threerings/crowd/chat/client/MuteObserver.as b/src/main/as/com/threerings/crowd/chat/client/MuteObserver.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/client/MuteObserver.as
rename to src/main/as/com/threerings/crowd/chat/client/MuteObserver.as
diff --git a/src/as/com/threerings/crowd/chat/client/SpeakHandler.as b/src/main/as/com/threerings/crowd/chat/client/SpeakHandler.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/client/SpeakHandler.as
rename to src/main/as/com/threerings/crowd/chat/client/SpeakHandler.as
diff --git a/src/as/com/threerings/crowd/chat/client/SpeakService.as b/src/main/as/com/threerings/crowd/chat/client/SpeakService.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/client/SpeakService.as
rename to src/main/as/com/threerings/crowd/chat/client/SpeakService.as
diff --git a/src/as/com/threerings/crowd/chat/client/TellAdapter.as b/src/main/as/com/threerings/crowd/chat/client/TellAdapter.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/client/TellAdapter.as
rename to src/main/as/com/threerings/crowd/chat/client/TellAdapter.as
diff --git a/src/as/com/threerings/crowd/chat/client/TellHandler.as b/src/main/as/com/threerings/crowd/chat/client/TellHandler.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/client/TellHandler.as
rename to src/main/as/com/threerings/crowd/chat/client/TellHandler.as
diff --git a/src/as/com/threerings/crowd/chat/client/ThinkHandler.as b/src/main/as/com/threerings/crowd/chat/client/ThinkHandler.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/client/ThinkHandler.as
rename to src/main/as/com/threerings/crowd/chat/client/ThinkHandler.as
diff --git a/src/as/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.as b/src/main/as/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.as
rename to src/main/as/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.as
diff --git a/src/as/com/threerings/crowd/chat/data/ChatChannel.as b/src/main/as/com/threerings/crowd/chat/data/ChatChannel.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/data/ChatChannel.as
rename to src/main/as/com/threerings/crowd/chat/data/ChatChannel.as
diff --git a/src/as/com/threerings/crowd/chat/data/ChatCodes.as b/src/main/as/com/threerings/crowd/chat/data/ChatCodes.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/data/ChatCodes.as
rename to src/main/as/com/threerings/crowd/chat/data/ChatCodes.as
diff --git a/src/as/com/threerings/crowd/chat/data/ChatMarshaller.as b/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/data/ChatMarshaller.as
rename to src/main/as/com/threerings/crowd/chat/data/ChatMarshaller.as
diff --git a/src/as/com/threerings/crowd/chat/data/ChatMarshaller_TellMarshaller.as b/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller_TellMarshaller.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/data/ChatMarshaller_TellMarshaller.as
rename to src/main/as/com/threerings/crowd/chat/data/ChatMarshaller_TellMarshaller.as
diff --git a/src/as/com/threerings/crowd/chat/data/ChatMessage.as b/src/main/as/com/threerings/crowd/chat/data/ChatMessage.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/data/ChatMessage.as
rename to src/main/as/com/threerings/crowd/chat/data/ChatMessage.as
diff --git a/src/as/com/threerings/crowd/chat/data/SpeakMarshaller.as b/src/main/as/com/threerings/crowd/chat/data/SpeakMarshaller.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/data/SpeakMarshaller.as
rename to src/main/as/com/threerings/crowd/chat/data/SpeakMarshaller.as
diff --git a/src/as/com/threerings/crowd/chat/data/SystemMessage.as b/src/main/as/com/threerings/crowd/chat/data/SystemMessage.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/data/SystemMessage.as
rename to src/main/as/com/threerings/crowd/chat/data/SystemMessage.as
diff --git a/src/as/com/threerings/crowd/chat/data/TellFeedbackMessage.as b/src/main/as/com/threerings/crowd/chat/data/TellFeedbackMessage.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/data/TellFeedbackMessage.as
rename to src/main/as/com/threerings/crowd/chat/data/TellFeedbackMessage.as
diff --git a/src/as/com/threerings/crowd/chat/data/UserMessage.as b/src/main/as/com/threerings/crowd/chat/data/UserMessage.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/data/UserMessage.as
rename to src/main/as/com/threerings/crowd/chat/data/UserMessage.as
diff --git a/src/as/com/threerings/crowd/chat/data/UserSystemMessage.as b/src/main/as/com/threerings/crowd/chat/data/UserSystemMessage.as
similarity index 100%
rename from src/as/com/threerings/crowd/chat/data/UserSystemMessage.as
rename to src/main/as/com/threerings/crowd/chat/data/UserSystemMessage.as
diff --git a/src/as/com/threerings/crowd/client/BodyService.as b/src/main/as/com/threerings/crowd/client/BodyService.as
similarity index 100%
rename from src/as/com/threerings/crowd/client/BodyService.as
rename to src/main/as/com/threerings/crowd/client/BodyService.as
diff --git a/src/as/com/threerings/crowd/client/CrowdClient.as b/src/main/as/com/threerings/crowd/client/CrowdClient.as
similarity index 100%
rename from src/as/com/threerings/crowd/client/CrowdClient.as
rename to src/main/as/com/threerings/crowd/client/CrowdClient.as
diff --git a/src/as/com/threerings/crowd/client/LocationAdapter.as b/src/main/as/com/threerings/crowd/client/LocationAdapter.as
similarity index 100%
rename from src/as/com/threerings/crowd/client/LocationAdapter.as
rename to src/main/as/com/threerings/crowd/client/LocationAdapter.as
diff --git a/src/as/com/threerings/crowd/client/LocationDecoder.as b/src/main/as/com/threerings/crowd/client/LocationDecoder.as
similarity index 100%
rename from src/as/com/threerings/crowd/client/LocationDecoder.as
rename to src/main/as/com/threerings/crowd/client/LocationDecoder.as
diff --git a/src/as/com/threerings/crowd/client/LocationDirector.as b/src/main/as/com/threerings/crowd/client/LocationDirector.as
similarity index 100%
rename from src/as/com/threerings/crowd/client/LocationDirector.as
rename to src/main/as/com/threerings/crowd/client/LocationDirector.as
diff --git a/src/as/com/threerings/crowd/client/LocationDirector_FailureHandler.as b/src/main/as/com/threerings/crowd/client/LocationDirector_FailureHandler.as
similarity index 100%
rename from src/as/com/threerings/crowd/client/LocationDirector_FailureHandler.as
rename to src/main/as/com/threerings/crowd/client/LocationDirector_FailureHandler.as
diff --git a/src/as/com/threerings/crowd/client/LocationObserver.as b/src/main/as/com/threerings/crowd/client/LocationObserver.as
similarity index 100%
rename from src/as/com/threerings/crowd/client/LocationObserver.as
rename to src/main/as/com/threerings/crowd/client/LocationObserver.as
diff --git a/src/as/com/threerings/crowd/client/LocationReceiver.as b/src/main/as/com/threerings/crowd/client/LocationReceiver.as
similarity index 100%
rename from src/as/com/threerings/crowd/client/LocationReceiver.as
rename to src/main/as/com/threerings/crowd/client/LocationReceiver.as
diff --git a/src/as/com/threerings/crowd/client/LocationService.as b/src/main/as/com/threerings/crowd/client/LocationService.as
similarity index 100%
rename from src/as/com/threerings/crowd/client/LocationService.as
rename to src/main/as/com/threerings/crowd/client/LocationService.as
diff --git a/src/as/com/threerings/crowd/client/LocationService_MoveListener.as b/src/main/as/com/threerings/crowd/client/LocationService_MoveListener.as
similarity index 100%
rename from src/as/com/threerings/crowd/client/LocationService_MoveListener.as
rename to src/main/as/com/threerings/crowd/client/LocationService_MoveListener.as
diff --git a/src/as/com/threerings/crowd/client/MoveAdapter.as b/src/main/as/com/threerings/crowd/client/MoveAdapter.as
similarity index 100%
rename from src/as/com/threerings/crowd/client/MoveAdapter.as
rename to src/main/as/com/threerings/crowd/client/MoveAdapter.as
diff --git a/src/as/com/threerings/crowd/client/MoveFailedError.as b/src/main/as/com/threerings/crowd/client/MoveFailedError.as
similarity index 100%
rename from src/as/com/threerings/crowd/client/MoveFailedError.as
rename to src/main/as/com/threerings/crowd/client/MoveFailedError.as
diff --git a/src/as/com/threerings/crowd/client/MoveVetoedError.as b/src/main/as/com/threerings/crowd/client/MoveVetoedError.as
similarity index 100%
rename from src/as/com/threerings/crowd/client/MoveVetoedError.as
rename to src/main/as/com/threerings/crowd/client/MoveVetoedError.as
diff --git a/src/as/com/threerings/crowd/client/OccupantAdapter.as b/src/main/as/com/threerings/crowd/client/OccupantAdapter.as
similarity index 100%
rename from src/as/com/threerings/crowd/client/OccupantAdapter.as
rename to src/main/as/com/threerings/crowd/client/OccupantAdapter.as
diff --git a/src/as/com/threerings/crowd/client/OccupantDirector.as b/src/main/as/com/threerings/crowd/client/OccupantDirector.as
similarity index 100%
rename from src/as/com/threerings/crowd/client/OccupantDirector.as
rename to src/main/as/com/threerings/crowd/client/OccupantDirector.as
diff --git a/src/as/com/threerings/crowd/client/OccupantObserver.as b/src/main/as/com/threerings/crowd/client/OccupantObserver.as
similarity index 100%
rename from src/as/com/threerings/crowd/client/OccupantObserver.as
rename to src/main/as/com/threerings/crowd/client/OccupantObserver.as
diff --git a/src/as/com/threerings/crowd/client/PlaceController.as b/src/main/as/com/threerings/crowd/client/PlaceController.as
similarity index 100%
rename from src/as/com/threerings/crowd/client/PlaceController.as
rename to src/main/as/com/threerings/crowd/client/PlaceController.as
diff --git a/src/as/com/threerings/crowd/client/PlaceControllerDelegate.as b/src/main/as/com/threerings/crowd/client/PlaceControllerDelegate.as
similarity index 100%
rename from src/as/com/threerings/crowd/client/PlaceControllerDelegate.as
rename to src/main/as/com/threerings/crowd/client/PlaceControllerDelegate.as
diff --git a/src/as/com/threerings/crowd/client/PlaceView.as b/src/main/as/com/threerings/crowd/client/PlaceView.as
similarity index 100%
rename from src/as/com/threerings/crowd/client/PlaceView.as
rename to src/main/as/com/threerings/crowd/client/PlaceView.as
diff --git a/src/as/com/threerings/crowd/client/PlaceViewUtil.as b/src/main/as/com/threerings/crowd/client/PlaceViewUtil.as
similarity index 100%
rename from src/as/com/threerings/crowd/client/PlaceViewUtil.as
rename to src/main/as/com/threerings/crowd/client/PlaceViewUtil.as
diff --git a/src/as/com/threerings/crowd/data/BodyMarshaller.as b/src/main/as/com/threerings/crowd/data/BodyMarshaller.as
similarity index 100%
rename from src/as/com/threerings/crowd/data/BodyMarshaller.as
rename to src/main/as/com/threerings/crowd/data/BodyMarshaller.as
diff --git a/src/as/com/threerings/crowd/data/BodyObject.as b/src/main/as/com/threerings/crowd/data/BodyObject.as
similarity index 100%
rename from src/as/com/threerings/crowd/data/BodyObject.as
rename to src/main/as/com/threerings/crowd/data/BodyObject.as
diff --git a/src/as/com/threerings/crowd/data/CrowdCodes.as b/src/main/as/com/threerings/crowd/data/CrowdCodes.as
similarity index 100%
rename from src/as/com/threerings/crowd/data/CrowdCodes.as
rename to src/main/as/com/threerings/crowd/data/CrowdCodes.as
diff --git a/src/as/com/threerings/crowd/data/CrowdPermissionPolicy.as b/src/main/as/com/threerings/crowd/data/CrowdPermissionPolicy.as
similarity index 100%
rename from src/as/com/threerings/crowd/data/CrowdPermissionPolicy.as
rename to src/main/as/com/threerings/crowd/data/CrowdPermissionPolicy.as
diff --git a/src/as/com/threerings/crowd/data/LocationCodes.as b/src/main/as/com/threerings/crowd/data/LocationCodes.as
similarity index 100%
rename from src/as/com/threerings/crowd/data/LocationCodes.as
rename to src/main/as/com/threerings/crowd/data/LocationCodes.as
diff --git a/src/as/com/threerings/crowd/data/LocationMarshaller.as b/src/main/as/com/threerings/crowd/data/LocationMarshaller.as
similarity index 100%
rename from src/as/com/threerings/crowd/data/LocationMarshaller.as
rename to src/main/as/com/threerings/crowd/data/LocationMarshaller.as
diff --git a/src/as/com/threerings/crowd/data/LocationMarshaller_MoveMarshaller.as b/src/main/as/com/threerings/crowd/data/LocationMarshaller_MoveMarshaller.as
similarity index 100%
rename from src/as/com/threerings/crowd/data/LocationMarshaller_MoveMarshaller.as
rename to src/main/as/com/threerings/crowd/data/LocationMarshaller_MoveMarshaller.as
diff --git a/src/as/com/threerings/crowd/data/ManagerCaller.as b/src/main/as/com/threerings/crowd/data/ManagerCaller.as
similarity index 100%
rename from src/as/com/threerings/crowd/data/ManagerCaller.as
rename to src/main/as/com/threerings/crowd/data/ManagerCaller.as
diff --git a/src/as/com/threerings/crowd/data/OccupantInfo.as b/src/main/as/com/threerings/crowd/data/OccupantInfo.as
similarity index 100%
rename from src/as/com/threerings/crowd/data/OccupantInfo.as
rename to src/main/as/com/threerings/crowd/data/OccupantInfo.as
diff --git a/src/as/com/threerings/crowd/data/Place.as b/src/main/as/com/threerings/crowd/data/Place.as
similarity index 100%
rename from src/as/com/threerings/crowd/data/Place.as
rename to src/main/as/com/threerings/crowd/data/Place.as
diff --git a/src/as/com/threerings/crowd/data/PlaceConfig.as b/src/main/as/com/threerings/crowd/data/PlaceConfig.as
similarity index 100%
rename from src/as/com/threerings/crowd/data/PlaceConfig.as
rename to src/main/as/com/threerings/crowd/data/PlaceConfig.as
diff --git a/src/as/com/threerings/crowd/data/PlaceObject.as b/src/main/as/com/threerings/crowd/data/PlaceObject.as
similarity index 100%
rename from src/as/com/threerings/crowd/data/PlaceObject.as
rename to src/main/as/com/threerings/crowd/data/PlaceObject.as
diff --git a/src/as/com/threerings/crowd/data/TokenRing.as b/src/main/as/com/threerings/crowd/data/TokenRing.as
similarity index 100%
rename from src/as/com/threerings/crowd/data/TokenRing.as
rename to src/main/as/com/threerings/crowd/data/TokenRing.as
diff --git a/src/as/com/threerings/crowd/peer/data/CrowdClientInfo.as b/src/main/as/com/threerings/crowd/peer/data/CrowdClientInfo.as
similarity index 100%
rename from src/as/com/threerings/crowd/peer/data/CrowdClientInfo.as
rename to src/main/as/com/threerings/crowd/peer/data/CrowdClientInfo.as
diff --git a/src/as/com/threerings/crowd/util/CrowdContext.as b/src/main/as/com/threerings/crowd/util/CrowdContext.as
similarity index 100%
rename from src/as/com/threerings/crowd/util/CrowdContext.as
rename to src/main/as/com/threerings/crowd/util/CrowdContext.as
diff --git a/src/as/com/threerings/io/ArrayMask.as b/src/main/as/com/threerings/io/ArrayMask.as
similarity index 100%
rename from src/as/com/threerings/io/ArrayMask.as
rename to src/main/as/com/threerings/io/ArrayMask.as
diff --git a/src/as/com/threerings/io/ClassMapping.as b/src/main/as/com/threerings/io/ClassMapping.as
similarity index 100%
rename from src/as/com/threerings/io/ClassMapping.as
rename to src/main/as/com/threerings/io/ClassMapping.as
diff --git a/src/as/com/threerings/io/FrameAvailableEvent.as b/src/main/as/com/threerings/io/FrameAvailableEvent.as
similarity index 100%
rename from src/as/com/threerings/io/FrameAvailableEvent.as
rename to src/main/as/com/threerings/io/FrameAvailableEvent.as
diff --git a/src/as/com/threerings/io/FrameReader.as b/src/main/as/com/threerings/io/FrameReader.as
similarity index 100%
rename from src/as/com/threerings/io/FrameReader.as
rename to src/main/as/com/threerings/io/FrameReader.as
diff --git a/src/as/com/threerings/io/ObjectInputStream.as b/src/main/as/com/threerings/io/ObjectInputStream.as
similarity index 100%
rename from src/as/com/threerings/io/ObjectInputStream.as
rename to src/main/as/com/threerings/io/ObjectInputStream.as
diff --git a/src/as/com/threerings/io/ObjectOutputStream.as b/src/main/as/com/threerings/io/ObjectOutputStream.as
similarity index 100%
rename from src/as/com/threerings/io/ObjectOutputStream.as
rename to src/main/as/com/threerings/io/ObjectOutputStream.as
diff --git a/src/as/com/threerings/io/SimpleStreamableObject.as b/src/main/as/com/threerings/io/SimpleStreamableObject.as
similarity index 100%
rename from src/as/com/threerings/io/SimpleStreamableObject.as
rename to src/main/as/com/threerings/io/SimpleStreamableObject.as
diff --git a/src/as/com/threerings/io/Streamable.as b/src/main/as/com/threerings/io/Streamable.as
similarity index 100%
rename from src/as/com/threerings/io/Streamable.as
rename to src/main/as/com/threerings/io/Streamable.as
diff --git a/src/as/com/threerings/io/Streamer.as b/src/main/as/com/threerings/io/Streamer.as
similarity index 100%
rename from src/as/com/threerings/io/Streamer.as
rename to src/main/as/com/threerings/io/Streamer.as
diff --git a/src/as/com/threerings/io/Translations.as b/src/main/as/com/threerings/io/Translations.as
similarity index 100%
rename from src/as/com/threerings/io/Translations.as
rename to src/main/as/com/threerings/io/Translations.as
diff --git a/src/as/com/threerings/io/TypedArray.as b/src/main/as/com/threerings/io/TypedArray.as
similarity index 100%
rename from src/as/com/threerings/io/TypedArray.as
rename to src/main/as/com/threerings/io/TypedArray.as
diff --git a/src/as/com/threerings/io/streamers/ArrayStreamer.as b/src/main/as/com/threerings/io/streamers/ArrayStreamer.as
similarity index 100%
rename from src/as/com/threerings/io/streamers/ArrayStreamer.as
rename to src/main/as/com/threerings/io/streamers/ArrayStreamer.as
diff --git a/src/as/com/threerings/io/streamers/ByteArrayStreamer.as b/src/main/as/com/threerings/io/streamers/ByteArrayStreamer.as
similarity index 100%
rename from src/as/com/threerings/io/streamers/ByteArrayStreamer.as
rename to src/main/as/com/threerings/io/streamers/ByteArrayStreamer.as
diff --git a/src/as/com/threerings/io/streamers/ByteEnumStreamer.as b/src/main/as/com/threerings/io/streamers/ByteEnumStreamer.as
similarity index 100%
rename from src/as/com/threerings/io/streamers/ByteEnumStreamer.as
rename to src/main/as/com/threerings/io/streamers/ByteEnumStreamer.as
diff --git a/src/as/com/threerings/io/streamers/EnumStreamer.as b/src/main/as/com/threerings/io/streamers/EnumStreamer.as
similarity index 100%
rename from src/as/com/threerings/io/streamers/EnumStreamer.as
rename to src/main/as/com/threerings/io/streamers/EnumStreamer.as
diff --git a/src/as/com/threerings/io/streamers/MapStreamer.as b/src/main/as/com/threerings/io/streamers/MapStreamer.as
similarity index 100%
rename from src/as/com/threerings/io/streamers/MapStreamer.as
rename to src/main/as/com/threerings/io/streamers/MapStreamer.as
diff --git a/src/as/com/threerings/io/streamers/NumberStreamer.as b/src/main/as/com/threerings/io/streamers/NumberStreamer.as
similarity index 100%
rename from src/as/com/threerings/io/streamers/NumberStreamer.as
rename to src/main/as/com/threerings/io/streamers/NumberStreamer.as
diff --git a/src/as/com/threerings/io/streamers/SetStreamer.as b/src/main/as/com/threerings/io/streamers/SetStreamer.as
similarity index 100%
rename from src/as/com/threerings/io/streamers/SetStreamer.as
rename to src/main/as/com/threerings/io/streamers/SetStreamer.as
diff --git a/src/as/com/threerings/io/streamers/StringStreamer.as b/src/main/as/com/threerings/io/streamers/StringStreamer.as
similarity index 100%
rename from src/as/com/threerings/io/streamers/StringStreamer.as
rename to src/main/as/com/threerings/io/streamers/StringStreamer.as
diff --git a/src/as/com/threerings/presents/client/BasicDirector.as b/src/main/as/com/threerings/presents/client/BasicDirector.as
similarity index 100%
rename from src/as/com/threerings/presents/client/BasicDirector.as
rename to src/main/as/com/threerings/presents/client/BasicDirector.as
diff --git a/src/as/com/threerings/presents/client/Client.as b/src/main/as/com/threerings/presents/client/Client.as
similarity index 100%
rename from src/as/com/threerings/presents/client/Client.as
rename to src/main/as/com/threerings/presents/client/Client.as
diff --git a/src/as/com/threerings/presents/client/ClientAdapter.as b/src/main/as/com/threerings/presents/client/ClientAdapter.as
similarity index 100%
rename from src/as/com/threerings/presents/client/ClientAdapter.as
rename to src/main/as/com/threerings/presents/client/ClientAdapter.as
diff --git a/src/as/com/threerings/presents/client/ClientDObjectMgr.as b/src/main/as/com/threerings/presents/client/ClientDObjectMgr.as
similarity index 100%
rename from src/as/com/threerings/presents/client/ClientDObjectMgr.as
rename to src/main/as/com/threerings/presents/client/ClientDObjectMgr.as
diff --git a/src/as/com/threerings/presents/client/ClientEvent.as b/src/main/as/com/threerings/presents/client/ClientEvent.as
similarity index 100%
rename from src/as/com/threerings/presents/client/ClientEvent.as
rename to src/main/as/com/threerings/presents/client/ClientEvent.as
diff --git a/src/as/com/threerings/presents/client/ClientObserver.as b/src/main/as/com/threerings/presents/client/ClientObserver.as
similarity index 100%
rename from src/as/com/threerings/presents/client/ClientObserver.as
rename to src/main/as/com/threerings/presents/client/ClientObserver.as
diff --git a/src/as/com/threerings/presents/client/Communicator.as b/src/main/as/com/threerings/presents/client/Communicator.as
similarity index 100%
rename from src/as/com/threerings/presents/client/Communicator.as
rename to src/main/as/com/threerings/presents/client/Communicator.as
diff --git a/src/as/com/threerings/presents/client/ConfirmAdapter.as b/src/main/as/com/threerings/presents/client/ConfirmAdapter.as
similarity index 100%
rename from src/as/com/threerings/presents/client/ConfirmAdapter.as
rename to src/main/as/com/threerings/presents/client/ConfirmAdapter.as
diff --git a/src/as/com/threerings/presents/client/InvocationAdapter.as b/src/main/as/com/threerings/presents/client/InvocationAdapter.as
similarity index 100%
rename from src/as/com/threerings/presents/client/InvocationAdapter.as
rename to src/main/as/com/threerings/presents/client/InvocationAdapter.as
diff --git a/src/as/com/threerings/presents/client/InvocationDecoder.as b/src/main/as/com/threerings/presents/client/InvocationDecoder.as
similarity index 100%
rename from src/as/com/threerings/presents/client/InvocationDecoder.as
rename to src/main/as/com/threerings/presents/client/InvocationDecoder.as
diff --git a/src/as/com/threerings/presents/client/InvocationDirector.as b/src/main/as/com/threerings/presents/client/InvocationDirector.as
similarity index 100%
rename from src/as/com/threerings/presents/client/InvocationDirector.as
rename to src/main/as/com/threerings/presents/client/InvocationDirector.as
diff --git a/src/as/com/threerings/presents/client/InvocationReceiver.as b/src/main/as/com/threerings/presents/client/InvocationReceiver.as
similarity index 100%
rename from src/as/com/threerings/presents/client/InvocationReceiver.as
rename to src/main/as/com/threerings/presents/client/InvocationReceiver.as
diff --git a/src/as/com/threerings/presents/client/InvocationReceiver_Registration.as b/src/main/as/com/threerings/presents/client/InvocationReceiver_Registration.as
similarity index 100%
rename from src/as/com/threerings/presents/client/InvocationReceiver_Registration.as
rename to src/main/as/com/threerings/presents/client/InvocationReceiver_Registration.as
diff --git a/src/as/com/threerings/presents/client/InvocationService.as b/src/main/as/com/threerings/presents/client/InvocationService.as
similarity index 100%
rename from src/as/com/threerings/presents/client/InvocationService.as
rename to src/main/as/com/threerings/presents/client/InvocationService.as
diff --git a/src/as/com/threerings/presents/client/InvocationService_ConfirmListener.as b/src/main/as/com/threerings/presents/client/InvocationService_ConfirmListener.as
similarity index 100%
rename from src/as/com/threerings/presents/client/InvocationService_ConfirmListener.as
rename to src/main/as/com/threerings/presents/client/InvocationService_ConfirmListener.as
diff --git a/src/as/com/threerings/presents/client/InvocationService_InvocationListener.as b/src/main/as/com/threerings/presents/client/InvocationService_InvocationListener.as
similarity index 100%
rename from src/as/com/threerings/presents/client/InvocationService_InvocationListener.as
rename to src/main/as/com/threerings/presents/client/InvocationService_InvocationListener.as
diff --git a/src/as/com/threerings/presents/client/InvocationService_ResultListener.as b/src/main/as/com/threerings/presents/client/InvocationService_ResultListener.as
similarity index 100%
rename from src/as/com/threerings/presents/client/InvocationService_ResultListener.as
rename to src/main/as/com/threerings/presents/client/InvocationService_ResultListener.as
diff --git a/src/as/com/threerings/presents/client/LogonError.as b/src/main/as/com/threerings/presents/client/LogonError.as
similarity index 100%
rename from src/as/com/threerings/presents/client/LogonError.as
rename to src/main/as/com/threerings/presents/client/LogonError.as
diff --git a/src/as/com/threerings/presents/client/PresentsPrefs.as b/src/main/as/com/threerings/presents/client/PresentsPrefs.as
similarity index 100%
rename from src/as/com/threerings/presents/client/PresentsPrefs.as
rename to src/main/as/com/threerings/presents/client/PresentsPrefs.as
diff --git a/src/as/com/threerings/presents/client/ResultAdapter.as b/src/main/as/com/threerings/presents/client/ResultAdapter.as
similarity index 100%
rename from src/as/com/threerings/presents/client/ResultAdapter.as
rename to src/main/as/com/threerings/presents/client/ResultAdapter.as
diff --git a/src/as/com/threerings/presents/client/ServerSwitcher.as b/src/main/as/com/threerings/presents/client/ServerSwitcher.as
similarity index 100%
rename from src/as/com/threerings/presents/client/ServerSwitcher.as
rename to src/main/as/com/threerings/presents/client/ServerSwitcher.as
diff --git a/src/as/com/threerings/presents/client/SessionObserver.as b/src/main/as/com/threerings/presents/client/SessionObserver.as
similarity index 100%
rename from src/as/com/threerings/presents/client/SessionObserver.as
rename to src/main/as/com/threerings/presents/client/SessionObserver.as
diff --git a/src/as/com/threerings/presents/client/TimeBaseService.as b/src/main/as/com/threerings/presents/client/TimeBaseService.as
similarity index 100%
rename from src/as/com/threerings/presents/client/TimeBaseService.as
rename to src/main/as/com/threerings/presents/client/TimeBaseService.as
diff --git a/src/as/com/threerings/presents/client/TimeBaseService_GotTimeBaseListener.as b/src/main/as/com/threerings/presents/client/TimeBaseService_GotTimeBaseListener.as
similarity index 100%
rename from src/as/com/threerings/presents/client/TimeBaseService_GotTimeBaseListener.as
rename to src/main/as/com/threerings/presents/client/TimeBaseService_GotTimeBaseListener.as
diff --git a/src/as/com/threerings/presents/data/AuthCodes.as b/src/main/as/com/threerings/presents/data/AuthCodes.as
similarity index 100%
rename from src/as/com/threerings/presents/data/AuthCodes.as
rename to src/main/as/com/threerings/presents/data/AuthCodes.as
diff --git a/src/as/com/threerings/presents/data/ClientObject.as b/src/main/as/com/threerings/presents/data/ClientObject.as
similarity index 100%
rename from src/as/com/threerings/presents/data/ClientObject.as
rename to src/main/as/com/threerings/presents/data/ClientObject.as
diff --git a/src/as/com/threerings/presents/data/ConMgrStats.as b/src/main/as/com/threerings/presents/data/ConMgrStats.as
similarity index 100%
rename from src/as/com/threerings/presents/data/ConMgrStats.as
rename to src/main/as/com/threerings/presents/data/ConMgrStats.as
diff --git a/src/as/com/threerings/presents/data/InvocationCodes.as b/src/main/as/com/threerings/presents/data/InvocationCodes.as
similarity index 100%
rename from src/as/com/threerings/presents/data/InvocationCodes.as
rename to src/main/as/com/threerings/presents/data/InvocationCodes.as
diff --git a/src/as/com/threerings/presents/data/InvocationMarshaller.as b/src/main/as/com/threerings/presents/data/InvocationMarshaller.as
similarity index 100%
rename from src/as/com/threerings/presents/data/InvocationMarshaller.as
rename to src/main/as/com/threerings/presents/data/InvocationMarshaller.as
diff --git a/src/as/com/threerings/presents/data/InvocationMarshaller_ConfirmMarshaller.as b/src/main/as/com/threerings/presents/data/InvocationMarshaller_ConfirmMarshaller.as
similarity index 100%
rename from src/as/com/threerings/presents/data/InvocationMarshaller_ConfirmMarshaller.as
rename to src/main/as/com/threerings/presents/data/InvocationMarshaller_ConfirmMarshaller.as
diff --git a/src/as/com/threerings/presents/data/InvocationMarshaller_ListenerMarshaller.as b/src/main/as/com/threerings/presents/data/InvocationMarshaller_ListenerMarshaller.as
similarity index 100%
rename from src/as/com/threerings/presents/data/InvocationMarshaller_ListenerMarshaller.as
rename to src/main/as/com/threerings/presents/data/InvocationMarshaller_ListenerMarshaller.as
diff --git a/src/as/com/threerings/presents/data/InvocationMarshaller_ResultMarshaller.as b/src/main/as/com/threerings/presents/data/InvocationMarshaller_ResultMarshaller.as
similarity index 100%
rename from src/as/com/threerings/presents/data/InvocationMarshaller_ResultMarshaller.as
rename to src/main/as/com/threerings/presents/data/InvocationMarshaller_ResultMarshaller.as
diff --git a/src/as/com/threerings/presents/data/Permission.as b/src/main/as/com/threerings/presents/data/Permission.as
similarity index 100%
rename from src/as/com/threerings/presents/data/Permission.as
rename to src/main/as/com/threerings/presents/data/Permission.as
diff --git a/src/as/com/threerings/presents/data/PermissionPolicy.as b/src/main/as/com/threerings/presents/data/PermissionPolicy.as
similarity index 100%
rename from src/as/com/threerings/presents/data/PermissionPolicy.as
rename to src/main/as/com/threerings/presents/data/PermissionPolicy.as
diff --git a/src/as/com/threerings/presents/data/TimeBaseMarshaller.as b/src/main/as/com/threerings/presents/data/TimeBaseMarshaller.as
similarity index 100%
rename from src/as/com/threerings/presents/data/TimeBaseMarshaller.as
rename to src/main/as/com/threerings/presents/data/TimeBaseMarshaller.as
diff --git a/src/as/com/threerings/presents/data/TimeBaseMarshaller_GotTimeBaseMarshaller.as b/src/main/as/com/threerings/presents/data/TimeBaseMarshaller_GotTimeBaseMarshaller.as
similarity index 100%
rename from src/as/com/threerings/presents/data/TimeBaseMarshaller_GotTimeBaseMarshaller.as
rename to src/main/as/com/threerings/presents/data/TimeBaseMarshaller_GotTimeBaseMarshaller.as
diff --git a/src/as/com/threerings/presents/dobj/AttributeChangeAdapter.as b/src/main/as/com/threerings/presents/dobj/AttributeChangeAdapter.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/AttributeChangeAdapter.as
rename to src/main/as/com/threerings/presents/dobj/AttributeChangeAdapter.as
diff --git a/src/as/com/threerings/presents/dobj/AttributeChangeListener.as b/src/main/as/com/threerings/presents/dobj/AttributeChangeListener.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/AttributeChangeListener.as
rename to src/main/as/com/threerings/presents/dobj/AttributeChangeListener.as
diff --git a/src/as/com/threerings/presents/dobj/AttributeChangedEvent.as b/src/main/as/com/threerings/presents/dobj/AttributeChangedEvent.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/AttributeChangedEvent.as
rename to src/main/as/com/threerings/presents/dobj/AttributeChangedEvent.as
diff --git a/src/as/com/threerings/presents/dobj/ChangeListener.as b/src/main/as/com/threerings/presents/dobj/ChangeListener.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/ChangeListener.as
rename to src/main/as/com/threerings/presents/dobj/ChangeListener.as
diff --git a/src/as/com/threerings/presents/dobj/CompoundEvent.as b/src/main/as/com/threerings/presents/dobj/CompoundEvent.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/CompoundEvent.as
rename to src/main/as/com/threerings/presents/dobj/CompoundEvent.as
diff --git a/src/as/com/threerings/presents/dobj/DEvent.as b/src/main/as/com/threerings/presents/dobj/DEvent.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/DEvent.as
rename to src/main/as/com/threerings/presents/dobj/DEvent.as
diff --git a/src/as/com/threerings/presents/dobj/DObject.as b/src/main/as/com/threerings/presents/dobj/DObject.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/DObject.as
rename to src/main/as/com/threerings/presents/dobj/DObject.as
diff --git a/src/as/com/threerings/presents/dobj/DObjectManager.as b/src/main/as/com/threerings/presents/dobj/DObjectManager.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/DObjectManager.as
rename to src/main/as/com/threerings/presents/dobj/DObjectManager.as
diff --git a/src/as/com/threerings/presents/dobj/DSet.as b/src/main/as/com/threerings/presents/dobj/DSet.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/DSet.as
rename to src/main/as/com/threerings/presents/dobj/DSet.as
diff --git a/src/as/com/threerings/presents/dobj/DSet_Entry.as b/src/main/as/com/threerings/presents/dobj/DSet_Entry.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/DSet_Entry.as
rename to src/main/as/com/threerings/presents/dobj/DSet_Entry.as
diff --git a/src/as/com/threerings/presents/dobj/DummyEntry.as b/src/main/as/com/threerings/presents/dobj/DummyEntry.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/DummyEntry.as
rename to src/main/as/com/threerings/presents/dobj/DummyEntry.as
diff --git a/src/as/com/threerings/presents/dobj/ElementUpdateListener.as b/src/main/as/com/threerings/presents/dobj/ElementUpdateListener.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/ElementUpdateListener.as
rename to src/main/as/com/threerings/presents/dobj/ElementUpdateListener.as
diff --git a/src/as/com/threerings/presents/dobj/ElementUpdatedEvent.as b/src/main/as/com/threerings/presents/dobj/ElementUpdatedEvent.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/ElementUpdatedEvent.as
rename to src/main/as/com/threerings/presents/dobj/ElementUpdatedEvent.as
diff --git a/src/as/com/threerings/presents/dobj/EntryAddedEvent.as b/src/main/as/com/threerings/presents/dobj/EntryAddedEvent.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/EntryAddedEvent.as
rename to src/main/as/com/threerings/presents/dobj/EntryAddedEvent.as
diff --git a/src/as/com/threerings/presents/dobj/EntryRemovedEvent.as b/src/main/as/com/threerings/presents/dobj/EntryRemovedEvent.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/EntryRemovedEvent.as
rename to src/main/as/com/threerings/presents/dobj/EntryRemovedEvent.as
diff --git a/src/as/com/threerings/presents/dobj/EntryUpdatedEvent.as b/src/main/as/com/threerings/presents/dobj/EntryUpdatedEvent.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/EntryUpdatedEvent.as
rename to src/main/as/com/threerings/presents/dobj/EntryUpdatedEvent.as
diff --git a/src/as/com/threerings/presents/dobj/EventAdapter.as b/src/main/as/com/threerings/presents/dobj/EventAdapter.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/EventAdapter.as
rename to src/main/as/com/threerings/presents/dobj/EventAdapter.as
diff --git a/src/as/com/threerings/presents/dobj/EventListener.as b/src/main/as/com/threerings/presents/dobj/EventListener.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/EventListener.as
rename to src/main/as/com/threerings/presents/dobj/EventListener.as
diff --git a/src/as/com/threerings/presents/dobj/InvocationNotificationEvent.as b/src/main/as/com/threerings/presents/dobj/InvocationNotificationEvent.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/InvocationNotificationEvent.as
rename to src/main/as/com/threerings/presents/dobj/InvocationNotificationEvent.as
diff --git a/src/as/com/threerings/presents/dobj/InvocationRequestEvent.as b/src/main/as/com/threerings/presents/dobj/InvocationRequestEvent.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/InvocationRequestEvent.as
rename to src/main/as/com/threerings/presents/dobj/InvocationRequestEvent.as
diff --git a/src/as/com/threerings/presents/dobj/InvocationResponseEvent.as b/src/main/as/com/threerings/presents/dobj/InvocationResponseEvent.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/InvocationResponseEvent.as
rename to src/main/as/com/threerings/presents/dobj/InvocationResponseEvent.as
diff --git a/src/as/com/threerings/presents/dobj/MessageAdapter.as b/src/main/as/com/threerings/presents/dobj/MessageAdapter.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/MessageAdapter.as
rename to src/main/as/com/threerings/presents/dobj/MessageAdapter.as
diff --git a/src/as/com/threerings/presents/dobj/MessageEvent.as b/src/main/as/com/threerings/presents/dobj/MessageEvent.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/MessageEvent.as
rename to src/main/as/com/threerings/presents/dobj/MessageEvent.as
diff --git a/src/as/com/threerings/presents/dobj/MessageListener.as b/src/main/as/com/threerings/presents/dobj/MessageListener.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/MessageListener.as
rename to src/main/as/com/threerings/presents/dobj/MessageListener.as
diff --git a/src/as/com/threerings/presents/dobj/NamedEvent.as b/src/main/as/com/threerings/presents/dobj/NamedEvent.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/NamedEvent.as
rename to src/main/as/com/threerings/presents/dobj/NamedEvent.as
diff --git a/src/as/com/threerings/presents/dobj/ObjectAccessError.as b/src/main/as/com/threerings/presents/dobj/ObjectAccessError.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/ObjectAccessError.as
rename to src/main/as/com/threerings/presents/dobj/ObjectAccessError.as
diff --git a/src/as/com/threerings/presents/dobj/ObjectAddedEvent.as b/src/main/as/com/threerings/presents/dobj/ObjectAddedEvent.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/ObjectAddedEvent.as
rename to src/main/as/com/threerings/presents/dobj/ObjectAddedEvent.as
diff --git a/src/as/com/threerings/presents/dobj/ObjectDeathListener.as b/src/main/as/com/threerings/presents/dobj/ObjectDeathListener.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/ObjectDeathListener.as
rename to src/main/as/com/threerings/presents/dobj/ObjectDeathListener.as
diff --git a/src/as/com/threerings/presents/dobj/ObjectDestroyedEvent.as b/src/main/as/com/threerings/presents/dobj/ObjectDestroyedEvent.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/ObjectDestroyedEvent.as
rename to src/main/as/com/threerings/presents/dobj/ObjectDestroyedEvent.as
diff --git a/src/as/com/threerings/presents/dobj/ObjectRemovedEvent.as b/src/main/as/com/threerings/presents/dobj/ObjectRemovedEvent.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/ObjectRemovedEvent.as
rename to src/main/as/com/threerings/presents/dobj/ObjectRemovedEvent.as
diff --git a/src/as/com/threerings/presents/dobj/OidList.as b/src/main/as/com/threerings/presents/dobj/OidList.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/OidList.as
rename to src/main/as/com/threerings/presents/dobj/OidList.as
diff --git a/src/as/com/threerings/presents/dobj/OidListListener.as b/src/main/as/com/threerings/presents/dobj/OidListListener.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/OidListListener.as
rename to src/main/as/com/threerings/presents/dobj/OidListListener.as
diff --git a/src/as/com/threerings/presents/dobj/ServerMessageEvent.as b/src/main/as/com/threerings/presents/dobj/ServerMessageEvent.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/ServerMessageEvent.as
rename to src/main/as/com/threerings/presents/dobj/ServerMessageEvent.as
diff --git a/src/as/com/threerings/presents/dobj/SetAdapter.as b/src/main/as/com/threerings/presents/dobj/SetAdapter.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/SetAdapter.as
rename to src/main/as/com/threerings/presents/dobj/SetAdapter.as
diff --git a/src/as/com/threerings/presents/dobj/SetListener.as b/src/main/as/com/threerings/presents/dobj/SetListener.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/SetListener.as
rename to src/main/as/com/threerings/presents/dobj/SetListener.as
diff --git a/src/as/com/threerings/presents/dobj/Subscriber.as b/src/main/as/com/threerings/presents/dobj/Subscriber.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/Subscriber.as
rename to src/main/as/com/threerings/presents/dobj/Subscriber.as
diff --git a/src/as/com/threerings/presents/dobj/SubscriberAdapter.as b/src/main/as/com/threerings/presents/dobj/SubscriberAdapter.as
similarity index 100%
rename from src/as/com/threerings/presents/dobj/SubscriberAdapter.as
rename to src/main/as/com/threerings/presents/dobj/SubscriberAdapter.as
diff --git a/src/as/com/threerings/presents/net/AuthRequest.as b/src/main/as/com/threerings/presents/net/AuthRequest.as
similarity index 100%
rename from src/as/com/threerings/presents/net/AuthRequest.as
rename to src/main/as/com/threerings/presents/net/AuthRequest.as
diff --git a/src/as/com/threerings/presents/net/AuthResponse.as b/src/main/as/com/threerings/presents/net/AuthResponse.as
similarity index 100%
rename from src/as/com/threerings/presents/net/AuthResponse.as
rename to src/main/as/com/threerings/presents/net/AuthResponse.as
diff --git a/src/as/com/threerings/presents/net/AuthResponseData.as b/src/main/as/com/threerings/presents/net/AuthResponseData.as
similarity index 100%
rename from src/as/com/threerings/presents/net/AuthResponseData.as
rename to src/main/as/com/threerings/presents/net/AuthResponseData.as
diff --git a/src/as/com/threerings/presents/net/BootstrapData.as b/src/main/as/com/threerings/presents/net/BootstrapData.as
similarity index 100%
rename from src/as/com/threerings/presents/net/BootstrapData.as
rename to src/main/as/com/threerings/presents/net/BootstrapData.as
diff --git a/src/as/com/threerings/presents/net/BootstrapNotification.as b/src/main/as/com/threerings/presents/net/BootstrapNotification.as
similarity index 100%
rename from src/as/com/threerings/presents/net/BootstrapNotification.as
rename to src/main/as/com/threerings/presents/net/BootstrapNotification.as
diff --git a/src/as/com/threerings/presents/net/Credentials.as b/src/main/as/com/threerings/presents/net/Credentials.as
similarity index 100%
rename from src/as/com/threerings/presents/net/Credentials.as
rename to src/main/as/com/threerings/presents/net/Credentials.as
diff --git a/src/as/com/threerings/presents/net/DownstreamMessage.as b/src/main/as/com/threerings/presents/net/DownstreamMessage.as
similarity index 100%
rename from src/as/com/threerings/presents/net/DownstreamMessage.as
rename to src/main/as/com/threerings/presents/net/DownstreamMessage.as
diff --git a/src/as/com/threerings/presents/net/EventNotification.as b/src/main/as/com/threerings/presents/net/EventNotification.as
similarity index 100%
rename from src/as/com/threerings/presents/net/EventNotification.as
rename to src/main/as/com/threerings/presents/net/EventNotification.as
diff --git a/src/as/com/threerings/presents/net/FailureResponse.as b/src/main/as/com/threerings/presents/net/FailureResponse.as
similarity index 100%
rename from src/as/com/threerings/presents/net/FailureResponse.as
rename to src/main/as/com/threerings/presents/net/FailureResponse.as
diff --git a/src/as/com/threerings/presents/net/ForwardEventRequest.as b/src/main/as/com/threerings/presents/net/ForwardEventRequest.as
similarity index 100%
rename from src/as/com/threerings/presents/net/ForwardEventRequest.as
rename to src/main/as/com/threerings/presents/net/ForwardEventRequest.as
diff --git a/src/as/com/threerings/presents/net/LogoffRequest.as b/src/main/as/com/threerings/presents/net/LogoffRequest.as
similarity index 100%
rename from src/as/com/threerings/presents/net/LogoffRequest.as
rename to src/main/as/com/threerings/presents/net/LogoffRequest.as
diff --git a/src/as/com/threerings/presents/net/ObjectResponse.as b/src/main/as/com/threerings/presents/net/ObjectResponse.as
similarity index 100%
rename from src/as/com/threerings/presents/net/ObjectResponse.as
rename to src/main/as/com/threerings/presents/net/ObjectResponse.as
diff --git a/src/as/com/threerings/presents/net/PingRequest.as b/src/main/as/com/threerings/presents/net/PingRequest.as
similarity index 100%
rename from src/as/com/threerings/presents/net/PingRequest.as
rename to src/main/as/com/threerings/presents/net/PingRequest.as
diff --git a/src/as/com/threerings/presents/net/PongResponse.as b/src/main/as/com/threerings/presents/net/PongResponse.as
similarity index 100%
rename from src/as/com/threerings/presents/net/PongResponse.as
rename to src/main/as/com/threerings/presents/net/PongResponse.as
diff --git a/src/as/com/threerings/presents/net/ServiceCreds.as b/src/main/as/com/threerings/presents/net/ServiceCreds.as
similarity index 100%
rename from src/as/com/threerings/presents/net/ServiceCreds.as
rename to src/main/as/com/threerings/presents/net/ServiceCreds.as
diff --git a/src/as/com/threerings/presents/net/SubscribeRequest.as b/src/main/as/com/threerings/presents/net/SubscribeRequest.as
similarity index 100%
rename from src/as/com/threerings/presents/net/SubscribeRequest.as
rename to src/main/as/com/threerings/presents/net/SubscribeRequest.as
diff --git a/src/as/com/threerings/presents/net/ThrottleUpdatedMessage.as b/src/main/as/com/threerings/presents/net/ThrottleUpdatedMessage.as
similarity index 100%
rename from src/as/com/threerings/presents/net/ThrottleUpdatedMessage.as
rename to src/main/as/com/threerings/presents/net/ThrottleUpdatedMessage.as
diff --git a/src/as/com/threerings/presents/net/UnsubscribeRequest.as b/src/main/as/com/threerings/presents/net/UnsubscribeRequest.as
similarity index 100%
rename from src/as/com/threerings/presents/net/UnsubscribeRequest.as
rename to src/main/as/com/threerings/presents/net/UnsubscribeRequest.as
diff --git a/src/as/com/threerings/presents/net/UnsubscribeResponse.as b/src/main/as/com/threerings/presents/net/UnsubscribeResponse.as
similarity index 100%
rename from src/as/com/threerings/presents/net/UnsubscribeResponse.as
rename to src/main/as/com/threerings/presents/net/UnsubscribeResponse.as
diff --git a/src/as/com/threerings/presents/net/UpdateThrottleMessage.as b/src/main/as/com/threerings/presents/net/UpdateThrottleMessage.as
similarity index 100%
rename from src/as/com/threerings/presents/net/UpdateThrottleMessage.as
rename to src/main/as/com/threerings/presents/net/UpdateThrottleMessage.as
diff --git a/src/as/com/threerings/presents/net/UpstreamMessage.as b/src/main/as/com/threerings/presents/net/UpstreamMessage.as
similarity index 100%
rename from src/as/com/threerings/presents/net/UpstreamMessage.as
rename to src/main/as/com/threerings/presents/net/UpstreamMessage.as
diff --git a/src/as/com/threerings/presents/net/UsernamePasswordCreds.as b/src/main/as/com/threerings/presents/net/UsernamePasswordCreds.as
similarity index 100%
rename from src/as/com/threerings/presents/net/UsernamePasswordCreds.as
rename to src/main/as/com/threerings/presents/net/UsernamePasswordCreds.as
diff --git a/src/as/com/threerings/presents/peer/data/ClientInfo.as b/src/main/as/com/threerings/presents/peer/data/ClientInfo.as
similarity index 100%
rename from src/as/com/threerings/presents/peer/data/ClientInfo.as
rename to src/main/as/com/threerings/presents/peer/data/ClientInfo.as
diff --git a/src/as/com/threerings/presents/util/PresentsContext.as b/src/main/as/com/threerings/presents/util/PresentsContext.as
similarity index 100%
rename from src/as/com/threerings/presents/util/PresentsContext.as
rename to src/main/as/com/threerings/presents/util/PresentsContext.as
diff --git a/src/as/com/threerings/presents/util/SafeObjectManager.as b/src/main/as/com/threerings/presents/util/SafeObjectManager.as
similarity index 100%
rename from src/as/com/threerings/presents/util/SafeObjectManager.as
rename to src/main/as/com/threerings/presents/util/SafeObjectManager.as
diff --git a/src/as/com/threerings/presents/util/SafeSubscriber.as b/src/main/as/com/threerings/presents/util/SafeSubscriber.as
similarity index 100%
rename from src/as/com/threerings/presents/util/SafeSubscriber.as
rename to src/main/as/com/threerings/presents/util/SafeSubscriber.as
diff --git a/src/as/com/threerings/util/ArrayIterator.as b/src/main/as/com/threerings/util/ArrayIterator.as
similarity index 100%
rename from src/as/com/threerings/util/ArrayIterator.as
rename to src/main/as/com/threerings/util/ArrayIterator.as
diff --git a/src/as/com/threerings/util/Boxed.as b/src/main/as/com/threerings/util/Boxed.as
similarity index 100%
rename from src/as/com/threerings/util/Boxed.as
rename to src/main/as/com/threerings/util/Boxed.as
diff --git a/src/as/com/threerings/util/Byte.as b/src/main/as/com/threerings/util/Byte.as
similarity index 100%
rename from src/as/com/threerings/util/Byte.as
rename to src/main/as/com/threerings/util/Byte.as
diff --git a/src/as/com/threerings/util/EmbeddedSwfLoader.as b/src/main/as/com/threerings/util/EmbeddedSwfLoader.as
similarity index 100%
rename from src/as/com/threerings/util/EmbeddedSwfLoader.as
rename to src/main/as/com/threerings/util/EmbeddedSwfLoader.as
diff --git a/src/as/com/threerings/util/Float.as b/src/main/as/com/threerings/util/Float.as
similarity index 100%
rename from src/as/com/threerings/util/Float.as
rename to src/main/as/com/threerings/util/Float.as
diff --git a/src/as/com/threerings/util/Integer.as b/src/main/as/com/threerings/util/Integer.as
similarity index 100%
rename from src/as/com/threerings/util/Integer.as
rename to src/main/as/com/threerings/util/Integer.as
diff --git a/src/as/com/threerings/util/Iterator.as b/src/main/as/com/threerings/util/Iterator.as
similarity index 100%
rename from src/as/com/threerings/util/Iterator.as
rename to src/main/as/com/threerings/util/Iterator.as
diff --git a/src/as/com/threerings/util/Long.as b/src/main/as/com/threerings/util/Long.as
similarity index 100%
rename from src/as/com/threerings/util/Long.as
rename to src/main/as/com/threerings/util/Long.as
diff --git a/src/as/com/threerings/util/MessageBundle.as b/src/main/as/com/threerings/util/MessageBundle.as
similarity index 100%
rename from src/as/com/threerings/util/MessageBundle.as
rename to src/main/as/com/threerings/util/MessageBundle.as
diff --git a/src/as/com/threerings/util/MessageManager.as b/src/main/as/com/threerings/util/MessageManager.as
similarity index 100%
rename from src/as/com/threerings/util/MessageManager.as
rename to src/main/as/com/threerings/util/MessageManager.as
diff --git a/src/as/com/threerings/util/Name.as b/src/main/as/com/threerings/util/Name.as
similarity index 100%
rename from src/as/com/threerings/util/Name.as
rename to src/main/as/com/threerings/util/Name.as
diff --git a/src/as/com/threerings/util/ObjectMarshaller.as b/src/main/as/com/threerings/util/ObjectMarshaller.as
similarity index 100%
rename from src/as/com/threerings/util/ObjectMarshaller.as
rename to src/main/as/com/threerings/util/ObjectMarshaller.as
diff --git a/src/as/com/threerings/util/ResultAdapter.as b/src/main/as/com/threerings/util/ResultAdapter.as
similarity index 100%
rename from src/as/com/threerings/util/ResultAdapter.as
rename to src/main/as/com/threerings/util/ResultAdapter.as
diff --git a/src/as/com/threerings/util/ResultListener.as b/src/main/as/com/threerings/util/ResultListener.as
similarity index 100%
rename from src/as/com/threerings/util/ResultListener.as
rename to src/main/as/com/threerings/util/ResultListener.as
diff --git a/src/as/com/threerings/util/Short.as b/src/main/as/com/threerings/util/Short.as
similarity index 100%
rename from src/as/com/threerings/util/Short.as
rename to src/main/as/com/threerings/util/Short.as
diff --git a/src/as/com/threerings/util/StreamableArrayList.as b/src/main/as/com/threerings/util/StreamableArrayList.as
similarity index 100%
rename from src/as/com/threerings/util/StreamableArrayList.as
rename to src/main/as/com/threerings/util/StreamableArrayList.as
diff --git a/src/as/com/threerings/util/StreamableHashMap.as b/src/main/as/com/threerings/util/StreamableHashMap.as
similarity index 100%
rename from src/as/com/threerings/util/StreamableHashMap.as
rename to src/main/as/com/threerings/util/StreamableHashMap.as
diff --git a/src/as/com/threerings/util/TimeUtil.as b/src/main/as/com/threerings/util/TimeUtil.as
similarity index 100%
rename from src/as/com/threerings/util/TimeUtil.as
rename to src/main/as/com/threerings/util/TimeUtil.as
diff --git a/src/as/com/threerings/util/langBoolean.as b/src/main/as/com/threerings/util/langBoolean.as
similarity index 100%
rename from src/as/com/threerings/util/langBoolean.as
rename to src/main/as/com/threerings/util/langBoolean.as