From 9d2ca42eacbaeebf3f892056404d0a67d062d46e Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Fri, 22 Oct 2010 21:12:29 +0000
Subject: [PATCH] Convert Narya (most of the way) over to a Maven Ant task
 based build. The ActionScript bits remain belligerent, but the Java stuff is
 mostly shipshape.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6222 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .classpath                                    |   4 +-
 build.xml                                     | 347 ++++++++----------
 {tests/etc => etc}/astest-config.xml.in       |   0
 etc/libs-incl.xml                             |  18 -
 {tests/etc => etc}/thane-config.xml.in        |   0
 .../java/com/threerings/NaryaLog.java         |   0
 .../java/com/threerings/admin/Log.java        |   0
 .../threerings/admin/client/AdminService.java |   0
 .../admin/client/AsStringFieldEditor.java     |   0
 .../admin/client/BooleanFieldEditor.java      |   0
 .../admin/client/ConfigEditorPanel.java       |   0
 .../admin/client/ConfigObjectManager.java     |   0
 .../threerings/admin/client/DSetEditor.java   |   0
 .../threerings/admin/client/FieldEditor.java  |   0
 .../admin/client/ObjectEditorPanel.java       |   0
 .../admin/client/PulldownFieldEditor.java     |   0
 .../admin/client/TabbedDSetEditor.java        |   0
 .../com/threerings/admin/data/AdminCodes.java |   0
 .../admin/data/AdminMarshaller.java           |   0
 .../threerings/admin/data/ConfigObject.java   |   0
 .../admin/server/AdminDispatcher.java         |   0
 .../threerings/admin/server/AdminManager.java |   0
 .../admin/server/AdminProvider.java           |   0
 .../admin/server/ConfigRegistry.java          |   0
 .../admin/server/DatabaseConfigRegistry.java  |   0
 .../server/PeeredDatabaseConfigRegistry.java  |   0
 .../admin/server/PrefsConfigRegistry.java     |   0
 .../admin/server/persist/ConfigDatum.java     |   0
 .../admin/server/persist/ConfigRecord.java    |   0
 .../server/persist/ConfigRepository.java      |   0
 .../com/threerings/admin/web/Admin.gwt.xml    |   0
 .../admin/web/client/ConfigEditorPanel.java   |   0
 .../admin/web/client/ConfigEditorTab.java     |   0
 .../admin/web/client/ConfigFieldEditor.java   |   0
 .../threerings/admin/web/gwt/ConfigField.java |   0
 .../admin/web/gwt/ConfigService.java          |   0
 .../admin/web/gwt/ConfigServiceAsync.java     |   0
 .../admin/web/server/ConfigServlet.java       |   0
 .../java/com/threerings/bureau/Log.java       |   0
 .../com/threerings/bureau/client/Agent.java   |   0
 .../bureau/client/BureauClient.java           |   0
 .../bureau/client/BureauDecoder.java          |   0
 .../bureau/client/BureauDirector.java         |   0
 .../bureau/client/BureauReceiver.java         |   0
 .../bureau/client/BureauService.java          |   0
 .../threerings/bureau/data/AgentObject.java   |   0
 .../bureau/data/BureauAuthName.java           |   0
 .../bureau/data/BureauClientObject.java       |   0
 .../threerings/bureau/data/BureauCodes.java   |   0
 .../bureau/data/BureauCredentials.java        |   0
 .../bureau/data/BureauMarshaller.java         |   0
 .../bureau/server/BureauClientResolver.java   |   0
 .../bureau/server/BureauDispatcher.java       |   0
 .../bureau/server/BureauProvider.java         |   0
 .../bureau/server/BureauRegistry.java         |   0
 .../bureau/server/BureauSender.java           |   0
 .../bureau/server/BureauSession.java          |   0
 .../threerings/bureau/util/BureauContext.java |   0
 .../bureau/util/BureauLogRedirector.java      |   0
 .../java/com/threerings/crowd/Log.java        |   0
 .../chat/client/ChannelSpeakService.java      |   0
 .../crowd/chat/client/ChatDirector.java       |   0
 .../crowd/chat/client/ChatDisplay.java        |   0
 .../crowd/chat/client/ChatFilter.java         |   0
 .../crowd/chat/client/ChatService.java        |   0
 .../crowd/chat/client/CurseFilter.java        |   0
 .../crowd/chat/client/HistoryList.java        |   0
 .../crowd/chat/client/MuteDirector.java       |   0
 .../crowd/chat/client/SpeakService.java       |   0
 .../chat/data/ChannelSpeakMarshaller.java     |   0
 .../crowd/chat/data/ChatChannel.java          |   0
 .../threerings/crowd/chat/data/ChatCodes.java |   0
 .../crowd/chat/data/ChatMarshaller.java       |   0
 .../crowd/chat/data/ChatMessage.java          |   0
 .../crowd/chat/data/KeepNoHistory.java        |   0
 .../crowd/chat/data/SpeakMarshaller.java      |   0
 .../crowd/chat/data/SpeakObject.java          |   0
 .../crowd/chat/data/SystemMessage.java        |   0
 .../crowd/chat/data/TellFeedbackMessage.java  |   0
 .../crowd/chat/data/UserMessage.java          |   0
 .../crowd/chat/data/UserSystemMessage.java    |   0
 .../chat/server/ChannelSpeakDispatcher.java   |   0
 .../chat/server/ChannelSpeakProvider.java     |   0
 .../crowd/chat/server/ChatChannelManager.java |   0
 .../crowd/chat/server/ChatDispatcher.java     |   0
 .../crowd/chat/server/ChatProvider.java       |   0
 .../crowd/chat/server/SpeakDispatcher.java    |   0
 .../crowd/chat/server/SpeakHandler.java       |   0
 .../crowd/chat/server/SpeakProvider.java      |   0
 .../crowd/chat/server/SpeakUtil.java          |   0
 .../threerings/crowd/client/BodyService.java  |   0
 .../crowd/client/LocationAdapter.java         |   0
 .../crowd/client/LocationDecoder.java         |   0
 .../crowd/client/LocationDirector.java        |   0
 .../crowd/client/LocationObserver.java        |   0
 .../crowd/client/LocationReceiver.java        |   0
 .../crowd/client/LocationService.java         |   0
 .../crowd/client/MoveFailedException.java     |   0
 .../crowd/client/MoveVetoedException.java     |   0
 .../crowd/client/OccupantAdapter.java         |   0
 .../crowd/client/OccupantDirector.java        |   0
 .../crowd/client/OccupantObserver.java        |   0
 .../crowd/client/PlaceController.java         |   0
 .../crowd/client/PlaceControllerDelegate.java |   0
 .../threerings/crowd/client/PlacePanel.java   |   0
 .../threerings/crowd/client/PlaceView.java    |   0
 .../crowd/client/PlaceViewUtil.java           |   0
 .../threerings/crowd/data/BodyMarshaller.java |   0
 .../com/threerings/crowd/data/BodyObject.java |   0
 .../com/threerings/crowd/data/CrowdCodes.java |   0
 .../crowd/data/CrowdPermissionPolicy.java     |   0
 .../threerings/crowd/data/LocationCodes.java  |   0
 .../crowd/data/LocationMarshaller.java        |   0
 .../threerings/crowd/data/OccupantInfo.java   |   0
 .../java/com/threerings/crowd/data/Place.java |   0
 .../threerings/crowd/data/PlaceConfig.java    |   0
 .../threerings/crowd/data/PlaceObject.java    |   0
 .../com/threerings/crowd/data/TokenRing.java  |   0
 .../java/com/threerings/crowd/package.html    |   0
 .../crowd/peer/client/CrowdPeerService.java   |   0
 .../crowd/peer/data/CrowdClientInfo.java      |   0
 .../crowd/peer/data/CrowdNodeObject.java      |   0
 .../crowd/peer/data/CrowdPeerMarshaller.java  |   0
 .../peer/server/CrowdPeerDispatcher.java      |   0
 .../crowd/peer/server/CrowdPeerManager.java   |   0
 .../crowd/peer/server/CrowdPeerProvider.java  |   0
 .../crowd/server/BodyDispatcher.java          |   0
 .../threerings/crowd/server/BodyLocal.java    |   0
 .../threerings/crowd/server/BodyLocator.java  |   0
 .../threerings/crowd/server/BodyManager.java  |   0
 .../threerings/crowd/server/BodyProvider.java |   0
 .../crowd/server/CrowdClientResolver.java     |   0
 .../crowd/server/CrowdObjectAccess.java       |   0
 .../threerings/crowd/server/CrowdServer.java  |   0
 .../threerings/crowd/server/CrowdSession.java |   0
 .../crowd/server/LocationDispatcher.java      |   0
 .../crowd/server/LocationManager.java         |   0
 .../crowd/server/LocationProvider.java        |   0
 .../crowd/server/LocationSender.java          |   0
 .../threerings/crowd/server/OccupantOp.java   |   0
 .../threerings/crowd/server/PlaceManager.java |   0
 .../crowd/server/PlaceManagerDelegate.java    |   0
 .../crowd/server/PlaceRegistry.java           |   0
 .../threerings/crowd/util/CrowdContext.java   |   0
 .../java/com/threerings/io/ArrayMask.java     |   0
 .../com/threerings/io/BasicStreamers.java     |   0
 .../threerings/io/ByteBufferInputStream.java  |   0
 .../threerings/io/ByteBufferOutputStream.java |   0
 .../java/com/threerings/io/ClassMapping.java  |   0
 .../com/threerings/io/FieldMarshaller.java    |   0
 .../com/threerings/io/FramedInputStream.java  |   0
 .../threerings/io/FramingOutputStream.java    |   0
 .../java/com/threerings/io/Intern.java        |   0
 .../java/com/threerings/io/NotStreamable.java |   0
 .../com/threerings/io/ObjectInputStream.java  |   0
 .../com/threerings/io/ObjectOutputStream.java |   0
 .../threerings/io/SimpleStreamableObject.java |   0
 .../java/com/threerings/io/Streamable.java    |   0
 .../java/com/threerings/io/Streamer.java      |   0
 .../io/UnreliableObjectInputStream.java       |   0
 .../io/UnreliableObjectOutputStream.java      |   0
 .../com/threerings/nio/SelectorIterable.java  |   0
 .../java/com/threerings/presents/Log.java     |   0
 .../presents/annotation/AnyThread.java        |   0
 .../presents/annotation/AuthInvoker.java      |   0
 .../presents/annotation/BlockingThread.java   |   0
 .../presents/annotation/EventQueue.java       |   0
 .../presents/annotation/EventThread.java      |   0
 .../presents/annotation/MainInvoker.java      |   0
 .../presents/annotation/TransportHint.java    |   0
 .../presents/client/BasicDirector.java        |   0
 .../presents/client/BlockingCommunicator.java |   0
 .../threerings/presents/client/Client.java    |   0
 .../presents/client/ClientAdapter.java        |   0
 .../presents/client/ClientCommunicator.java   |   0
 .../presents/client/ClientDObjectMgr.java     |   0
 .../presents/client/ClientObserver.java       |   0
 .../presents/client/Communicator.java         |   0
 .../presents/client/DeltaCalculator.java      |   0
 .../presents/client/InvocationDecoder.java    |   0
 .../presents/client/InvocationDirector.java   |   0
 .../presents/client/InvocationReceiver.java   |   0
 .../presents/client/InvocationService.java    |   0
 .../presents/client/LoggingListener.java      |   0
 .../presents/client/LogonException.java       |   0
 .../presents/client/MessageTracker.java       |   0
 .../presents/client/ObserverOps.java          |   0
 .../presents/client/PresentsPrefs.java        |   0
 .../presents/client/SessionObserver.java      |   0
 .../presents/client/TimeBaseService.java      |   0
 .../threerings/presents/data/AuthCodes.java   |   0
 .../presents/data/ClientObject.java           |   0
 .../threerings/presents/data/ConMgrStats.java |   0
 .../presents/data/InvocationCodes.java        |   0
 .../presents/data/InvocationMarshaller.java   |   0
 .../presents/data/InvocationObject.java       |   0
 .../threerings/presents/data/Permission.java  |   0
 .../presents/data/PermissionPolicy.java       |   0
 .../presents/data/TimeBaseCodes.java          |   0
 .../presents/data/TimeBaseMarshaller.java     |   0
 .../presents/data/TimeBaseObject.java         |   0
 .../presents/dobj/AccessController.java       |   0
 .../dobj/AttributeChangeListener.java         |   0
 .../presents/dobj/AttributeChangedEvent.java  |   0
 .../presents/dobj/ChangeListener.java         |   0
 .../presents/dobj/CompoundEvent.java          |   0
 .../com/threerings/presents/dobj/DEvent.java  |   0
 .../com/threerings/presents/dobj/DObject.java |   0
 .../presents/dobj/DObjectManager.java         |   0
 .../com/threerings/presents/dobj/DSet.java    |   0
 .../presents/dobj/DynamicListener.java        |   0
 .../presents/dobj/ElementUpdateListener.java  |   0
 .../presents/dobj/ElementUpdatedEvent.java    |   0
 .../presents/dobj/EntryAddedEvent.java        |   0
 .../presents/dobj/EntryRemovedEvent.java      |   0
 .../presents/dobj/EntryUpdatedEvent.java      |   0
 .../presents/dobj/EventListener.java          |   0
 .../dobj/InvocationNotificationEvent.java     |   0
 .../presents/dobj/InvocationRequestEvent.java |   0
 .../dobj/InvocationResponseEvent.java         |   0
 .../presents/dobj/MessageEvent.java           |   0
 .../presents/dobj/MessageListener.java        |   0
 .../presents/dobj/NamedAttributeListener.java |   0
 .../dobj/NamedElementUpdateListener.java      |   0
 .../threerings/presents/dobj/NamedEvent.java  |   0
 .../presents/dobj/NamedSetAdapter.java        |   0
 .../presents/dobj/NoSuchObjectException.java  |   0
 .../presents/dobj/ObjectAccessException.java  |   0
 .../presents/dobj/ObjectAddedEvent.java       |   0
 .../presents/dobj/ObjectDeathListener.java    |   0
 .../presents/dobj/ObjectDestroyedEvent.java   |   0
 .../presents/dobj/ObjectRemovedEvent.java     |   0
 .../com/threerings/presents/dobj/OidList.java |   0
 .../presents/dobj/OidListListener.java        |   0
 .../presents/dobj/ProxySubscriber.java        |   0
 .../presents/dobj/ReleaseLockEvent.java       |   0
 .../presents/dobj/RootDObjectManager.java     |   0
 .../presents/dobj/ServerMessageEvent.java     |   0
 .../threerings/presents/dobj/SetAdapter.java  |   0
 .../threerings/presents/dobj/SetListener.java |   0
 .../threerings/presents/dobj/SimpleEntry.java |   0
 .../threerings/presents/dobj/Subscriber.java  |   0
 .../threerings/presents/net/AuthRequest.java  |   0
 .../threerings/presents/net/AuthResponse.java |   0
 .../presents/net/AuthResponseData.java        |   0
 .../presents/net/BootstrapData.java           |   0
 .../presents/net/BootstrapNotification.java   |   0
 .../threerings/presents/net/Credentials.java  |   0
 .../presents/net/DownstreamMessage.java       |   0
 .../presents/net/EventNotification.java       |   0
 .../presents/net/FailureResponse.java         |   0
 .../presents/net/ForwardEventRequest.java     |   0
 .../presents/net/LogoffRequest.java           |   0
 .../com/threerings/presents/net/Message.java  |   0
 .../presents/net/ObjectResponse.java          |   0
 .../threerings/presents/net/PingRequest.java  |   0
 .../threerings/presents/net/PongResponse.java |   0
 .../threerings/presents/net/ServiceCreds.java |   0
 .../presents/net/SubscribeRequest.java        |   0
 .../presents/net/ThrottleUpdatedMessage.java  |   0
 .../net/TransmitDatagramsRequest.java         |   0
 .../threerings/presents/net/Transport.java    |   0
 .../presents/net/UnsubscribeRequest.java      |   0
 .../presents/net/UnsubscribeResponse.java     |   0
 .../presents/net/UpdateThrottleMessage.java   |   0
 .../presents/net/UpstreamMessage.java         |   0
 .../presents/net/UsernamePasswordCreds.java   |   0
 .../java/com/threerings/presents/package.html |   0
 .../presents/peer/client/PeerService.java     |   0
 .../presents/peer/data/ClientInfo.java        |   0
 .../presents/peer/data/NodeObject.java        |   0
 .../presents/peer/data/PeerAuthName.java      |   0
 .../presents/peer/data/PeerMarshaller.java    |   0
 .../presents/peer/net/PeerBootstrapData.java  |   0
 .../presents/peer/net/PeerCreds.java          |   0
 .../peer/server/EHCachePeerCoordinator.java   |   0
 .../peer/server/NodeRequestsListener.java     |   0
 .../peer/server/PeerClientResolver.java       |   0
 .../presents/peer/server/PeerDispatcher.java  |   0
 .../presents/peer/server/PeerManager.java     |   0
 .../presents/peer/server/PeerNode.java        |   0
 .../presents/peer/server/PeerProvider.java    |   0
 .../presents/peer/server/PeerSession.java     |   0
 .../peer/server/persist/NodeRecord.java       |   0
 .../peer/server/persist/NodeRepository.java   |   0
 .../presents/peer/util/PeerUtil.java          |   0
 .../server/AbstractSignalHandler.java         |   0
 .../presents/server/Authenticator.java        |   0
 .../presents/server/ChainedAuthenticator.java |   0
 .../presents/server/ClientLocal.java          |   0
 .../presents/server/ClientManager.java        |   0
 .../server/ClientResolutionListener.java      |   0
 .../presents/server/ClientResolver.java       |   0
 .../presents/server/DummyAuthenticator.java   |   0
 .../presents/server/InvocationDispatcher.java |   0
 .../presents/server/InvocationException.java  |   0
 .../presents/server/InvocationManager.java    |   0
 .../presents/server/InvocationProvider.java   |   0
 .../presents/server/InvocationSender.java     |   0
 .../presents/server/LocalDObjectMgr.java      |   0
 .../presents/server/NativeSignalHandler.java  |   0
 .../presents/server/PresentsAuthInvoker.java  |   0
 .../presents/server/PresentsDObjectMgr.java   |   0
 .../presents/server/PresentsInvoker.java      |   0
 .../presents/server/PresentsObjectAccess.java |   0
 .../presents/server/PresentsServer.java       |   0
 .../presents/server/PresentsSession.java      |   0
 .../presents/server/RebootManager.java        |   0
 .../threerings/presents/server/Rejector.java  |   0
 .../presents/server/ReportManager.java        |   0
 .../presents/server/ReportingInvoker.java     |   0
 .../presents/server/ServiceAuthenticator.java |   0
 .../presents/server/SessionFactory.java       |   0
 .../presents/server/ShutdownManager.java      |   0
 .../presents/server/SignalReceiver.java       |   0
 .../presents/server/SunSignalHandler.java     |   0
 .../presents/server/TimeBaseDispatcher.java   |   0
 .../presents/server/TimeBaseProvider.java     |   0
 .../server/net/AuthingConnection.java         |   0
 .../server/net/BindingConnectionManager.java  |   0
 .../presents/server/net/Connection.java       |   0
 .../server/net/ConnectionManager.java         |   0
 .../presents/server/net/NetEventHandler.java  |   0
 .../server/net/ServerCommunicator.java        |   0
 .../com/threerings/presents/tools.properties  |   0
 .../presents/tools/ActionScriptSource.java    |   0
 .../tools/GenActionScriptBundlesTask.java     |   0
 .../tools/GenActionScriptStreamableTask.java  |   0
 .../presents/tools/GenActionScriptTask.java   |   0
 .../presents/tools/GenDObjectTask.java        |   0
 .../presents/tools/GenReceiverTask.java       |   0
 .../presents/tools/GenServiceTask.java        |   0
 .../presents/tools/GenStreamableTask.java     |   0
 .../threerings/presents/tools/GenTask.java    |   0
 .../threerings/presents/tools/GenUtil.java    |   0
 .../presents/tools/GeneratedSourceMerger.java |   0
 .../threerings/presents/tools/ImportSet.java  |   0
 .../tools/InstrumentStreamableTask.java       |   0
 .../presents/tools/InvocationTask.java        |   0
 .../threerings/presents/tools/SourceFile.java |   0
 .../tools/StreamableClassRequirements.java    |   0
 .../threerings/presents/tools/decoder.tmpl    |   0
 .../threerings/presents/tools/dispatcher.tmpl |   0
 .../presents/tools/dobject_field.tmpl         |   0
 .../presents/tools/dobject_name.tmpl          |   0
 .../presents/tools/dobject_oidlist.tmpl       |   0
 .../presents/tools/dobject_set.tmpl           |   0
 .../threerings/presents/tools/marshaller.tmpl |   0
 .../presents/tools/marshaller_as.tmpl         |   0
 .../tools/marshaller_listener_as.tmpl         |   0
 .../threerings/presents/tools/provider.tmpl   |   0
 .../com/threerings/presents/tools/sender.tmpl |   0
 .../threerings/presents/tools/service_as.tmpl |   0
 .../tools/service_listener_adapter_as.tmpl    |   0
 .../presents/tools/service_listener_as.tmpl   |   0
 .../presents/tools/streamable_as.tmpl         |   0
 .../threerings/presents/util/ClassUtil.java   |   0
 .../presents/util/ConfirmAdapter.java         |   0
 .../presents/util/DatagramSequencer.java      |   0
 .../presents/util/FutureResult.java           |   0
 .../presents/util/IgnoreConfirmAdapter.java   |   0
 .../presents/util/InvocationAdapter.java      |   0
 .../presents/util/PersistingUnit.java         |   0
 .../presents/util/PresentsContext.java        |   0
 .../presents/util/ResultAdapter.java          |   0
 .../presents/util/ResultListenerList.java     |   0
 .../presents/util/SafeSubscriber.java         |   0
 .../com/threerings/util/ActionScript.java     |   0
 .../java/com/threerings/util/DefaultMap.java  |   0
 .../com/threerings/util/MessageBundle.java    |   0
 .../com/threerings/util/MessageManager.java   |   0
 .../com/threerings/util/MethodProfiler.java   |   0
 .../java/com/threerings/util/Name.java        |   0
 .../java/com/threerings/util/RandomUtil.java  |   0
 .../com/threerings/util/RunningStats.java     |   0
 .../util/StreamableArrayIntSet.java           |   0
 .../threerings/util/StreamableArrayList.java  |   0
 .../threerings/util/StreamableEnumSet.java    |   0
 .../threerings/util/StreamableHashIntMap.java |   0
 .../threerings/util/StreamableHashMap.java    |   0
 .../threerings/util/StreamableHashSet.java    |   0
 .../threerings/util/StreamableIntIntMap.java  |   0
 .../com/threerings/util/StreamablePoint.java  |   0
 .../threerings/util/StreamableRectangle.java  |   0
 .../com/threerings/util/StreamableTuple.java  |   0
 .../java/com/threerings/util/TimeUtil.java    |   0
 .../threerings/util/signal/FreeBSD/Makefile   |   0
 ...com_threerings_util_signal_SignalManager.c |   0
 .../util/signal/FreeBSD/libsignal.so          | Bin
 .../com/threerings/util/signal/Linux/Makefile |   0
 ...com_threerings_util_signal_SignalManager.c |   0
 .../threerings/util/signal/Linux/libsignal.so | Bin
 .../threerings/util/signal/Mac OS X/Makefile  |   0
 ...com_threerings_util_signal_SignalManager.c |   0
 .../util/signal/Mac OS X/libsignal.jnilib     | Bin
 .../threerings/util/signal/SignalManager.java |   0
 ...com_threerings_util_signal_SignalManager.h |   0
 .../java/com/threerings/web/Base.gwt.xml      |   0
 .../threerings/web/gwt/ServiceException.java  |   0
 .../threerings/web/server/ServletWaiter.java  |   0
 .../threerings/bureau/client/TestClient.java  |   0
 .../bureau/server/RegistryTester.java         |   0
 .../threerings/bureau/server/TestServer.java  |   0
 .../threerings/crowd/client/JabberApp.java    |   0
 .../threerings/crowd/client/JabberClient.java |   0
 .../crowd/client/JabberController.java        |   0
 .../threerings/crowd/client/JabberPanel.java  |   0
 .../threerings/crowd/client/TestClient.java   |   0
 .../threerings/crowd/data/JabberConfig.java   |   0
 .../threerings/crowd/server/JabberServer.java |   0
 .../com/threerings/io/ASStreamableSubset.java |   0
 .../java/com/threerings/io/FrameTest.java     |   0
 .../com/threerings/io/StreamableTest.java     |   0
 .../presents/client/TestClient.java           |   0
 .../presents/client/TestDecoder.java          |   0
 .../presents/client/TestReceiver.java         |   0
 .../presents/client/TestService.java          |   0
 .../presents/data/TestMarshaller.java         |   0
 .../threerings/presents/data/TestObject.java  |   0
 .../threerings/presents/dobj/DSetTest.java    |   0
 .../presents/dobj/LocalAttrTest.java          |   0
 .../threerings/presents/server/DOMTest.java   |   0
 .../presents/server/DestroyedRefTest.java     |   0
 .../presents/server/OMgrIntervalTest.java     |   0
 .../presents/server/PresentsTestBase.java     |   0
 .../threerings/presents/server/RefTest.java   |   0
 .../presents/server/TestDispatcher.java       |   0
 .../presents/server/TestManager.java          |   0
 .../presents/server/TestProvider.java         |   0
 .../presents/server/TestSender.java           |   0
 .../presents/server/TestServer.java           |   0
 .../threerings/util/MessageBundleTest.java    |   2 +-
 .../config/presents/server.properties         |   0
 .../test/resources}/i18n/messages.properties  |   0
 434 files changed, 163 insertions(+), 208 deletions(-)
 rename {tests/etc => etc}/astest-config.xml.in (100%)
 rename {tests/etc => etc}/thane-config.xml.in (100%)
 rename src/{ => main}/java/com/threerings/NaryaLog.java (100%)
 rename src/{ => main}/java/com/threerings/admin/Log.java (100%)
 rename src/{ => main}/java/com/threerings/admin/client/AdminService.java (100%)
 rename src/{ => main}/java/com/threerings/admin/client/AsStringFieldEditor.java (100%)
 rename src/{ => main}/java/com/threerings/admin/client/BooleanFieldEditor.java (100%)
 rename src/{ => main}/java/com/threerings/admin/client/ConfigEditorPanel.java (100%)
 rename src/{ => main}/java/com/threerings/admin/client/ConfigObjectManager.java (100%)
 rename src/{ => main}/java/com/threerings/admin/client/DSetEditor.java (100%)
 rename src/{ => main}/java/com/threerings/admin/client/FieldEditor.java (100%)
 rename src/{ => main}/java/com/threerings/admin/client/ObjectEditorPanel.java (100%)
 rename src/{ => main}/java/com/threerings/admin/client/PulldownFieldEditor.java (100%)
 rename src/{ => main}/java/com/threerings/admin/client/TabbedDSetEditor.java (100%)
 rename src/{ => main}/java/com/threerings/admin/data/AdminCodes.java (100%)
 rename src/{ => main}/java/com/threerings/admin/data/AdminMarshaller.java (100%)
 rename src/{ => main}/java/com/threerings/admin/data/ConfigObject.java (100%)
 rename src/{ => main}/java/com/threerings/admin/server/AdminDispatcher.java (100%)
 rename src/{ => main}/java/com/threerings/admin/server/AdminManager.java (100%)
 rename src/{ => main}/java/com/threerings/admin/server/AdminProvider.java (100%)
 rename src/{ => main}/java/com/threerings/admin/server/ConfigRegistry.java (100%)
 rename src/{ => main}/java/com/threerings/admin/server/DatabaseConfigRegistry.java (100%)
 rename src/{ => main}/java/com/threerings/admin/server/PeeredDatabaseConfigRegistry.java (100%)
 rename src/{ => main}/java/com/threerings/admin/server/PrefsConfigRegistry.java (100%)
 rename src/{ => main}/java/com/threerings/admin/server/persist/ConfigDatum.java (100%)
 rename src/{ => main}/java/com/threerings/admin/server/persist/ConfigRecord.java (100%)
 rename src/{ => main}/java/com/threerings/admin/server/persist/ConfigRepository.java (100%)
 rename src/{ => main}/java/com/threerings/admin/web/Admin.gwt.xml (100%)
 rename src/{ => main}/java/com/threerings/admin/web/client/ConfigEditorPanel.java (100%)
 rename src/{ => main}/java/com/threerings/admin/web/client/ConfigEditorTab.java (100%)
 rename src/{ => main}/java/com/threerings/admin/web/client/ConfigFieldEditor.java (100%)
 rename src/{ => main}/java/com/threerings/admin/web/gwt/ConfigField.java (100%)
 rename src/{ => main}/java/com/threerings/admin/web/gwt/ConfigService.java (100%)
 rename src/{ => main}/java/com/threerings/admin/web/gwt/ConfigServiceAsync.java (100%)
 rename src/{ => main}/java/com/threerings/admin/web/server/ConfigServlet.java (100%)
 rename src/{ => main}/java/com/threerings/bureau/Log.java (100%)
 rename src/{ => main}/java/com/threerings/bureau/client/Agent.java (100%)
 rename src/{ => main}/java/com/threerings/bureau/client/BureauClient.java (100%)
 rename src/{ => main}/java/com/threerings/bureau/client/BureauDecoder.java (100%)
 rename src/{ => main}/java/com/threerings/bureau/client/BureauDirector.java (100%)
 rename src/{ => main}/java/com/threerings/bureau/client/BureauReceiver.java (100%)
 rename src/{ => main}/java/com/threerings/bureau/client/BureauService.java (100%)
 rename src/{ => main}/java/com/threerings/bureau/data/AgentObject.java (100%)
 rename src/{ => main}/java/com/threerings/bureau/data/BureauAuthName.java (100%)
 rename src/{ => main}/java/com/threerings/bureau/data/BureauClientObject.java (100%)
 rename src/{ => main}/java/com/threerings/bureau/data/BureauCodes.java (100%)
 rename src/{ => main}/java/com/threerings/bureau/data/BureauCredentials.java (100%)
 rename src/{ => main}/java/com/threerings/bureau/data/BureauMarshaller.java (100%)
 rename src/{ => main}/java/com/threerings/bureau/server/BureauClientResolver.java (100%)
 rename src/{ => main}/java/com/threerings/bureau/server/BureauDispatcher.java (100%)
 rename src/{ => main}/java/com/threerings/bureau/server/BureauProvider.java (100%)
 rename src/{ => main}/java/com/threerings/bureau/server/BureauRegistry.java (100%)
 rename src/{ => main}/java/com/threerings/bureau/server/BureauSender.java (100%)
 rename src/{ => main}/java/com/threerings/bureau/server/BureauSession.java (100%)
 rename src/{ => main}/java/com/threerings/bureau/util/BureauContext.java (100%)
 rename src/{ => main}/java/com/threerings/bureau/util/BureauLogRedirector.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/Log.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/client/ChannelSpeakService.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/client/ChatDirector.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/client/ChatDisplay.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/client/ChatFilter.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/client/ChatService.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/client/CurseFilter.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/client/HistoryList.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/client/MuteDirector.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/client/SpeakService.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/data/ChatChannel.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/data/ChatCodes.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/data/ChatMarshaller.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/data/ChatMessage.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/data/KeepNoHistory.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/data/SpeakMarshaller.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/data/SpeakObject.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/data/SystemMessage.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/data/TellFeedbackMessage.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/data/UserMessage.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/data/UserSystemMessage.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/server/ChannelSpeakDispatcher.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/server/ChannelSpeakProvider.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/server/ChatChannelManager.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/server/ChatDispatcher.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/server/ChatProvider.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/server/SpeakDispatcher.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/server/SpeakHandler.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/server/SpeakProvider.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/chat/server/SpeakUtil.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/client/BodyService.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/client/LocationAdapter.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/client/LocationDecoder.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/client/LocationDirector.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/client/LocationObserver.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/client/LocationReceiver.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/client/LocationService.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/client/MoveFailedException.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/client/MoveVetoedException.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/client/OccupantAdapter.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/client/OccupantDirector.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/client/OccupantObserver.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/client/PlaceController.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/client/PlaceControllerDelegate.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/client/PlacePanel.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/client/PlaceView.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/client/PlaceViewUtil.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/data/BodyMarshaller.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/data/BodyObject.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/data/CrowdCodes.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/data/CrowdPermissionPolicy.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/data/LocationCodes.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/data/LocationMarshaller.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/data/OccupantInfo.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/data/Place.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/data/PlaceConfig.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/data/PlaceObject.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/data/TokenRing.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/package.html (100%)
 rename src/{ => main}/java/com/threerings/crowd/peer/client/CrowdPeerService.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/peer/data/CrowdClientInfo.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/peer/data/CrowdNodeObject.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/peer/server/CrowdPeerDispatcher.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/peer/server/CrowdPeerManager.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/peer/server/CrowdPeerProvider.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/server/BodyDispatcher.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/server/BodyLocal.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/server/BodyLocator.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/server/BodyManager.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/server/BodyProvider.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/server/CrowdClientResolver.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/server/CrowdObjectAccess.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/server/CrowdServer.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/server/CrowdSession.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/server/LocationDispatcher.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/server/LocationManager.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/server/LocationProvider.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/server/LocationSender.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/server/OccupantOp.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/server/PlaceManager.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/server/PlaceManagerDelegate.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/server/PlaceRegistry.java (100%)
 rename src/{ => main}/java/com/threerings/crowd/util/CrowdContext.java (100%)
 rename src/{ => main}/java/com/threerings/io/ArrayMask.java (100%)
 rename src/{ => main}/java/com/threerings/io/BasicStreamers.java (100%)
 rename src/{ => main}/java/com/threerings/io/ByteBufferInputStream.java (100%)
 rename src/{ => main}/java/com/threerings/io/ByteBufferOutputStream.java (100%)
 rename src/{ => main}/java/com/threerings/io/ClassMapping.java (100%)
 rename src/{ => main}/java/com/threerings/io/FieldMarshaller.java (100%)
 rename src/{ => main}/java/com/threerings/io/FramedInputStream.java (100%)
 rename src/{ => main}/java/com/threerings/io/FramingOutputStream.java (100%)
 rename src/{ => main}/java/com/threerings/io/Intern.java (100%)
 rename src/{ => main}/java/com/threerings/io/NotStreamable.java (100%)
 rename src/{ => main}/java/com/threerings/io/ObjectInputStream.java (100%)
 rename src/{ => main}/java/com/threerings/io/ObjectOutputStream.java (100%)
 rename src/{ => main}/java/com/threerings/io/SimpleStreamableObject.java (100%)
 rename src/{ => main}/java/com/threerings/io/Streamable.java (100%)
 rename src/{ => main}/java/com/threerings/io/Streamer.java (100%)
 rename src/{ => main}/java/com/threerings/io/UnreliableObjectInputStream.java (100%)
 rename src/{ => main}/java/com/threerings/io/UnreliableObjectOutputStream.java (100%)
 rename src/{ => main}/java/com/threerings/nio/SelectorIterable.java (100%)
 rename src/{ => main}/java/com/threerings/presents/Log.java (100%)
 rename src/{ => main}/java/com/threerings/presents/annotation/AnyThread.java (100%)
 rename src/{ => main}/java/com/threerings/presents/annotation/AuthInvoker.java (100%)
 rename src/{ => main}/java/com/threerings/presents/annotation/BlockingThread.java (100%)
 rename src/{ => main}/java/com/threerings/presents/annotation/EventQueue.java (100%)
 rename src/{ => main}/java/com/threerings/presents/annotation/EventThread.java (100%)
 rename src/{ => main}/java/com/threerings/presents/annotation/MainInvoker.java (100%)
 rename src/{ => main}/java/com/threerings/presents/annotation/TransportHint.java (100%)
 rename src/{ => main}/java/com/threerings/presents/client/BasicDirector.java (100%)
 rename src/{ => main}/java/com/threerings/presents/client/BlockingCommunicator.java (100%)
 rename src/{ => main}/java/com/threerings/presents/client/Client.java (100%)
 rename src/{ => main}/java/com/threerings/presents/client/ClientAdapter.java (100%)
 rename src/{ => main}/java/com/threerings/presents/client/ClientCommunicator.java (100%)
 rename src/{ => main}/java/com/threerings/presents/client/ClientDObjectMgr.java (100%)
 rename src/{ => main}/java/com/threerings/presents/client/ClientObserver.java (100%)
 rename src/{ => main}/java/com/threerings/presents/client/Communicator.java (100%)
 rename src/{ => main}/java/com/threerings/presents/client/DeltaCalculator.java (100%)
 rename src/{ => main}/java/com/threerings/presents/client/InvocationDecoder.java (100%)
 rename src/{ => main}/java/com/threerings/presents/client/InvocationDirector.java (100%)
 rename src/{ => main}/java/com/threerings/presents/client/InvocationReceiver.java (100%)
 rename src/{ => main}/java/com/threerings/presents/client/InvocationService.java (100%)
 rename src/{ => main}/java/com/threerings/presents/client/LoggingListener.java (100%)
 rename src/{ => main}/java/com/threerings/presents/client/LogonException.java (100%)
 rename src/{ => main}/java/com/threerings/presents/client/MessageTracker.java (100%)
 rename src/{ => main}/java/com/threerings/presents/client/ObserverOps.java (100%)
 rename src/{ => main}/java/com/threerings/presents/client/PresentsPrefs.java (100%)
 rename src/{ => main}/java/com/threerings/presents/client/SessionObserver.java (100%)
 rename src/{ => main}/java/com/threerings/presents/client/TimeBaseService.java (100%)
 rename src/{ => main}/java/com/threerings/presents/data/AuthCodes.java (100%)
 rename src/{ => main}/java/com/threerings/presents/data/ClientObject.java (100%)
 rename src/{ => main}/java/com/threerings/presents/data/ConMgrStats.java (100%)
 rename src/{ => main}/java/com/threerings/presents/data/InvocationCodes.java (100%)
 rename src/{ => main}/java/com/threerings/presents/data/InvocationMarshaller.java (100%)
 rename src/{ => main}/java/com/threerings/presents/data/InvocationObject.java (100%)
 rename src/{ => main}/java/com/threerings/presents/data/Permission.java (100%)
 rename src/{ => main}/java/com/threerings/presents/data/PermissionPolicy.java (100%)
 rename src/{ => main}/java/com/threerings/presents/data/TimeBaseCodes.java (100%)
 rename src/{ => main}/java/com/threerings/presents/data/TimeBaseMarshaller.java (100%)
 rename src/{ => main}/java/com/threerings/presents/data/TimeBaseObject.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/AccessController.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/AttributeChangeListener.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/AttributeChangedEvent.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/ChangeListener.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/CompoundEvent.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/DEvent.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/DObject.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/DObjectManager.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/DSet.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/DynamicListener.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/ElementUpdateListener.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/ElementUpdatedEvent.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/EntryAddedEvent.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/EntryRemovedEvent.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/EntryUpdatedEvent.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/EventListener.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/InvocationNotificationEvent.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/InvocationRequestEvent.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/InvocationResponseEvent.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/MessageEvent.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/MessageListener.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/NamedAttributeListener.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/NamedElementUpdateListener.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/NamedEvent.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/NamedSetAdapter.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/NoSuchObjectException.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/ObjectAccessException.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/ObjectAddedEvent.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/ObjectDeathListener.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/ObjectDestroyedEvent.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/ObjectRemovedEvent.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/OidList.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/OidListListener.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/ProxySubscriber.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/ReleaseLockEvent.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/RootDObjectManager.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/ServerMessageEvent.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/SetAdapter.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/SetListener.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/SimpleEntry.java (100%)
 rename src/{ => main}/java/com/threerings/presents/dobj/Subscriber.java (100%)
 rename src/{ => main}/java/com/threerings/presents/net/AuthRequest.java (100%)
 rename src/{ => main}/java/com/threerings/presents/net/AuthResponse.java (100%)
 rename src/{ => main}/java/com/threerings/presents/net/AuthResponseData.java (100%)
 rename src/{ => main}/java/com/threerings/presents/net/BootstrapData.java (100%)
 rename src/{ => main}/java/com/threerings/presents/net/BootstrapNotification.java (100%)
 rename src/{ => main}/java/com/threerings/presents/net/Credentials.java (100%)
 rename src/{ => main}/java/com/threerings/presents/net/DownstreamMessage.java (100%)
 rename src/{ => main}/java/com/threerings/presents/net/EventNotification.java (100%)
 rename src/{ => main}/java/com/threerings/presents/net/FailureResponse.java (100%)
 rename src/{ => main}/java/com/threerings/presents/net/ForwardEventRequest.java (100%)
 rename src/{ => main}/java/com/threerings/presents/net/LogoffRequest.java (100%)
 rename src/{ => main}/java/com/threerings/presents/net/Message.java (100%)
 rename src/{ => main}/java/com/threerings/presents/net/ObjectResponse.java (100%)
 rename src/{ => main}/java/com/threerings/presents/net/PingRequest.java (100%)
 rename src/{ => main}/java/com/threerings/presents/net/PongResponse.java (100%)
 rename src/{ => main}/java/com/threerings/presents/net/ServiceCreds.java (100%)
 rename src/{ => main}/java/com/threerings/presents/net/SubscribeRequest.java (100%)
 rename src/{ => main}/java/com/threerings/presents/net/ThrottleUpdatedMessage.java (100%)
 rename src/{ => main}/java/com/threerings/presents/net/TransmitDatagramsRequest.java (100%)
 rename src/{ => main}/java/com/threerings/presents/net/Transport.java (100%)
 rename src/{ => main}/java/com/threerings/presents/net/UnsubscribeRequest.java (100%)
 rename src/{ => main}/java/com/threerings/presents/net/UnsubscribeResponse.java (100%)
 rename src/{ => main}/java/com/threerings/presents/net/UpdateThrottleMessage.java (100%)
 rename src/{ => main}/java/com/threerings/presents/net/UpstreamMessage.java (100%)
 rename src/{ => main}/java/com/threerings/presents/net/UsernamePasswordCreds.java (100%)
 rename src/{ => main}/java/com/threerings/presents/package.html (100%)
 rename src/{ => main}/java/com/threerings/presents/peer/client/PeerService.java (100%)
 rename src/{ => main}/java/com/threerings/presents/peer/data/ClientInfo.java (100%)
 rename src/{ => main}/java/com/threerings/presents/peer/data/NodeObject.java (100%)
 rename src/{ => main}/java/com/threerings/presents/peer/data/PeerAuthName.java (100%)
 rename src/{ => main}/java/com/threerings/presents/peer/data/PeerMarshaller.java (100%)
 rename src/{ => main}/java/com/threerings/presents/peer/net/PeerBootstrapData.java (100%)
 rename src/{ => main}/java/com/threerings/presents/peer/net/PeerCreds.java (100%)
 rename src/{ => main}/java/com/threerings/presents/peer/server/EHCachePeerCoordinator.java (100%)
 rename src/{ => main}/java/com/threerings/presents/peer/server/NodeRequestsListener.java (100%)
 rename src/{ => main}/java/com/threerings/presents/peer/server/PeerClientResolver.java (100%)
 rename src/{ => main}/java/com/threerings/presents/peer/server/PeerDispatcher.java (100%)
 rename src/{ => main}/java/com/threerings/presents/peer/server/PeerManager.java (100%)
 rename src/{ => main}/java/com/threerings/presents/peer/server/PeerNode.java (100%)
 rename src/{ => main}/java/com/threerings/presents/peer/server/PeerProvider.java (100%)
 rename src/{ => main}/java/com/threerings/presents/peer/server/PeerSession.java (100%)
 rename src/{ => main}/java/com/threerings/presents/peer/server/persist/NodeRecord.java (100%)
 rename src/{ => main}/java/com/threerings/presents/peer/server/persist/NodeRepository.java (100%)
 rename src/{ => main}/java/com/threerings/presents/peer/util/PeerUtil.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/AbstractSignalHandler.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/Authenticator.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/ChainedAuthenticator.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/ClientLocal.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/ClientManager.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/ClientResolutionListener.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/ClientResolver.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/DummyAuthenticator.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/InvocationDispatcher.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/InvocationException.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/InvocationManager.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/InvocationProvider.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/InvocationSender.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/LocalDObjectMgr.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/NativeSignalHandler.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/PresentsAuthInvoker.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/PresentsDObjectMgr.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/PresentsInvoker.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/PresentsObjectAccess.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/PresentsServer.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/PresentsSession.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/RebootManager.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/Rejector.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/ReportManager.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/ReportingInvoker.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/ServiceAuthenticator.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/SessionFactory.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/ShutdownManager.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/SignalReceiver.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/SunSignalHandler.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/TimeBaseDispatcher.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/TimeBaseProvider.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/net/AuthingConnection.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/net/BindingConnectionManager.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/net/Connection.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/net/ConnectionManager.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/net/NetEventHandler.java (100%)
 rename src/{ => main}/java/com/threerings/presents/server/net/ServerCommunicator.java (100%)
 rename src/{ => main}/java/com/threerings/presents/tools.properties (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/ActionScriptSource.java (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/GenActionScriptBundlesTask.java (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/GenActionScriptStreamableTask.java (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/GenActionScriptTask.java (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/GenDObjectTask.java (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/GenReceiverTask.java (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/GenServiceTask.java (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/GenStreamableTask.java (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/GenTask.java (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/GenUtil.java (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/GeneratedSourceMerger.java (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/ImportSet.java (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/InstrumentStreamableTask.java (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/InvocationTask.java (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/SourceFile.java (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/StreamableClassRequirements.java (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/decoder.tmpl (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/dispatcher.tmpl (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/dobject_field.tmpl (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/dobject_name.tmpl (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/dobject_oidlist.tmpl (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/dobject_set.tmpl (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/marshaller.tmpl (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/marshaller_as.tmpl (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/marshaller_listener_as.tmpl (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/provider.tmpl (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/sender.tmpl (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/service_as.tmpl (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/service_listener_adapter_as.tmpl (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/service_listener_as.tmpl (100%)
 rename src/{ => main}/java/com/threerings/presents/tools/streamable_as.tmpl (100%)
 rename src/{ => main}/java/com/threerings/presents/util/ClassUtil.java (100%)
 rename src/{ => main}/java/com/threerings/presents/util/ConfirmAdapter.java (100%)
 rename src/{ => main}/java/com/threerings/presents/util/DatagramSequencer.java (100%)
 rename src/{ => main}/java/com/threerings/presents/util/FutureResult.java (100%)
 rename src/{ => main}/java/com/threerings/presents/util/IgnoreConfirmAdapter.java (100%)
 rename src/{ => main}/java/com/threerings/presents/util/InvocationAdapter.java (100%)
 rename src/{ => main}/java/com/threerings/presents/util/PersistingUnit.java (100%)
 rename src/{ => main}/java/com/threerings/presents/util/PresentsContext.java (100%)
 rename src/{ => main}/java/com/threerings/presents/util/ResultAdapter.java (100%)
 rename src/{ => main}/java/com/threerings/presents/util/ResultListenerList.java (100%)
 rename src/{ => main}/java/com/threerings/presents/util/SafeSubscriber.java (100%)
 rename src/{ => main}/java/com/threerings/util/ActionScript.java (100%)
 rename src/{ => main}/java/com/threerings/util/DefaultMap.java (100%)
 rename src/{ => main}/java/com/threerings/util/MessageBundle.java (100%)
 rename src/{ => main}/java/com/threerings/util/MessageManager.java (100%)
 rename src/{ => main}/java/com/threerings/util/MethodProfiler.java (100%)
 rename src/{ => main}/java/com/threerings/util/Name.java (100%)
 rename src/{ => main}/java/com/threerings/util/RandomUtil.java (100%)
 rename src/{ => main}/java/com/threerings/util/RunningStats.java (100%)
 rename src/{ => main}/java/com/threerings/util/StreamableArrayIntSet.java (100%)
 rename src/{ => main}/java/com/threerings/util/StreamableArrayList.java (100%)
 rename src/{ => main}/java/com/threerings/util/StreamableEnumSet.java (100%)
 rename src/{ => main}/java/com/threerings/util/StreamableHashIntMap.java (100%)
 rename src/{ => main}/java/com/threerings/util/StreamableHashMap.java (100%)
 rename src/{ => main}/java/com/threerings/util/StreamableHashSet.java (100%)
 rename src/{ => main}/java/com/threerings/util/StreamableIntIntMap.java (100%)
 rename src/{ => main}/java/com/threerings/util/StreamablePoint.java (100%)
 rename src/{ => main}/java/com/threerings/util/StreamableRectangle.java (100%)
 rename src/{ => main}/java/com/threerings/util/StreamableTuple.java (100%)
 rename src/{ => main}/java/com/threerings/util/TimeUtil.java (100%)
 rename src/{ => main}/java/com/threerings/util/signal/FreeBSD/Makefile (100%)
 rename src/{ => main}/java/com/threerings/util/signal/FreeBSD/com_threerings_util_signal_SignalManager.c (100%)
 rename src/{ => main}/java/com/threerings/util/signal/FreeBSD/libsignal.so (100%)
 rename src/{ => main}/java/com/threerings/util/signal/Linux/Makefile (100%)
 rename src/{ => main}/java/com/threerings/util/signal/Linux/com_threerings_util_signal_SignalManager.c (100%)
 rename src/{ => main}/java/com/threerings/util/signal/Linux/libsignal.so (100%)
 rename src/{ => main}/java/com/threerings/util/signal/Mac OS X/Makefile (100%)
 rename src/{ => main}/java/com/threerings/util/signal/Mac OS X/com_threerings_util_signal_SignalManager.c (100%)
 rename src/{ => main}/java/com/threerings/util/signal/Mac OS X/libsignal.jnilib (100%)
 rename src/{ => main}/java/com/threerings/util/signal/SignalManager.java (100%)
 rename src/{ => main}/java/com/threerings/util/signal/com_threerings_util_signal_SignalManager.h (100%)
 rename src/{ => main}/java/com/threerings/web/Base.gwt.xml (100%)
 rename src/{ => main}/java/com/threerings/web/gwt/ServiceException.java (100%)
 rename src/{ => main}/java/com/threerings/web/server/ServletWaiter.java (100%)
 rename {tests/src => src/test}/java/com/threerings/bureau/client/TestClient.java (100%)
 rename {tests/src => src/test}/java/com/threerings/bureau/server/RegistryTester.java (100%)
 rename {tests/src => src/test}/java/com/threerings/bureau/server/TestServer.java (100%)
 rename {tests/src => src/test}/java/com/threerings/crowd/client/JabberApp.java (100%)
 rename {tests/src => src/test}/java/com/threerings/crowd/client/JabberClient.java (100%)
 rename {tests/src => src/test}/java/com/threerings/crowd/client/JabberController.java (100%)
 rename {tests/src => src/test}/java/com/threerings/crowd/client/JabberPanel.java (100%)
 rename {tests/src => src/test}/java/com/threerings/crowd/client/TestClient.java (100%)
 rename {tests/src => src/test}/java/com/threerings/crowd/data/JabberConfig.java (100%)
 rename {tests/src => src/test}/java/com/threerings/crowd/server/JabberServer.java (100%)
 rename {tests/src => src/test}/java/com/threerings/io/ASStreamableSubset.java (100%)
 rename {tests/src => src/test}/java/com/threerings/io/FrameTest.java (100%)
 rename {tests/src => src/test}/java/com/threerings/io/StreamableTest.java (100%)
 rename {tests/src => src/test}/java/com/threerings/presents/client/TestClient.java (100%)
 rename {tests/src => src/test}/java/com/threerings/presents/client/TestDecoder.java (100%)
 rename {tests/src => src/test}/java/com/threerings/presents/client/TestReceiver.java (100%)
 rename {tests/src => src/test}/java/com/threerings/presents/client/TestService.java (100%)
 rename {tests/src => src/test}/java/com/threerings/presents/data/TestMarshaller.java (100%)
 rename {tests/src => src/test}/java/com/threerings/presents/data/TestObject.java (100%)
 rename {tests/src => src/test}/java/com/threerings/presents/dobj/DSetTest.java (100%)
 rename {tests/src => src/test}/java/com/threerings/presents/dobj/LocalAttrTest.java (100%)
 rename {tests/src => src/test}/java/com/threerings/presents/server/DOMTest.java (100%)
 rename {tests/src => src/test}/java/com/threerings/presents/server/DestroyedRefTest.java (100%)
 rename {tests/src => src/test}/java/com/threerings/presents/server/OMgrIntervalTest.java (100%)
 rename {tests/src => src/test}/java/com/threerings/presents/server/PresentsTestBase.java (100%)
 rename {tests/src => src/test}/java/com/threerings/presents/server/RefTest.java (100%)
 rename {tests/src => src/test}/java/com/threerings/presents/server/TestDispatcher.java (100%)
 rename {tests/src => src/test}/java/com/threerings/presents/server/TestManager.java (100%)
 rename {tests/src => src/test}/java/com/threerings/presents/server/TestProvider.java (100%)
 rename {tests/src => src/test}/java/com/threerings/presents/server/TestSender.java (100%)
 rename {tests/src => src/test}/java/com/threerings/presents/server/TestServer.java (100%)
 rename {tests/src => src/test}/java/com/threerings/util/MessageBundleTest.java (98%)
 rename {tests/rsrc => src/test/resources}/config/presents/server.properties (100%)
 rename {tests/rsrc => src/test/resources}/i18n/messages.properties (100%)

diff --git a/.classpath b/.classpath
index 81c4fbfeb..dbfefb4ec 100644
--- a/.classpath
+++ b/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="**/.svn/" kind="src" output="dist/classes" path="src/java"/>
-	<classpathentry excluding="**/.svn/" kind="src" output="tests/dist/classes" path="tests/src/java"/>
+	<classpathentry excluding="**/.svn/" kind="src" output="dist/classes" path="src/main/java"/>
+	<classpathentry excluding="**/.svn/" kind="src" output="tests/dist/classes" path="src/test/java"/>
 	<classpathentry kind="var" path="EXT_LIBS_DIR/javassist.jar"/>
 	<classpathentry exported="true" kind="var" path="EXT_LIBS_DIR/guice.jar">
 		<accessrules>
diff --git a/build.xml b/build.xml
index cda02f316..8d418312f 100644
--- a/build.xml
+++ b/build.xml
@@ -1,20 +1,13 @@
 <?xml version="1.0" standalone="yes"?>
 <!-- build configuration -->
 <project name="narya" default="compile" basedir="." xmlns:artifact="urn:maven-artifact-ant">
-
-  <!-- import overriding properties -->
-  <property file="build.properties"/>
-
-  <!-- configuration parameters -->
   <property name="lib.name"     value="narya"/>
   <property name="deploy.dir"   value="dist"/>
-  <property name="savedoc.dir"  value="docs"/>
-  <property name="javadoc.home" value="${deploy.dir}/docs"/>
+  <property name="src.dir"      value="src/main/java"/>
+  <property name="tsrc.dir"     value="src/test/java"/>
   <property name="classes.dir"  value="${deploy.dir}/classes"/>
-  <property name="libs.dir"     value="lib"/>
-  <property name="gwtjar.dir"  value="${deploy.dir}/gwt-jar"/>
-
-  <import file="etc/libs-incl.xml"/>
+  <property name="tclasses.dir" value="${deploy.dir}/test-classes"/>
+  <property name="gwtjar.dir"   value="${deploy.dir}/gwt-jar"/>
 
   <property name="maven-ant.vers" value="2.1.1"/>
   <property name="maven-ant.dir" value="${user.home}/.m2/ant-support"/>
@@ -31,88 +24,96 @@
   <target name="-init-maven-ant" depends="-download-maven-ant">
     <taskdef resource="org/apache/maven/artifact/ant/antlib.xml"
              uri="urn:maven-artifact-ant" classpath="${maven-ant.jar}"/>
-    <artifact:dependencies pathId="maven.classpath">
+    <artifact:dependencies pathId="compile.classpath">
+      <dependency groupId="com.google.inject" artifactId="guice" version="2.0"/>
+      <dependency groupId="jboss" artifactId="javassist" version="3.7.ga"/>
+      <dependency groupId="com.threerings" artifactId="gwt-utils" version="1.0"/>
+      <dependency groupId="com.google.gwt" artifactId="gwt-user" version="2.0.4"/>
+      <dependency groupId="org.apache.ant" artifactId="ant" version="1.7.1"/>
+      <dependency groupId="com.samskivert" artifactId="samskivert" version="1.1"/>
+      <dependency groupId="com.samskivert" artifactId="depot" version="1.0"/>
+      <dependency groupId="net.sf.ehcache" artifactId="ehcache" version="1.6.0"/>
+      <dependency groupId="com.google.guava" artifactId="guava" version="r05"/>
       <dependency groupId="com.samskivert" artifactId="jmustache" version="1.0"/>
     </artifact:dependencies>
+    <artifact:dependencies pathId="testlibs.classpath">
+      <dependency groupId="junit" artifactId="junit" version="4.8.1"/>
+    </artifact:dependencies>
   </target>
 
-  <!-- prepares the application directories -->
-  <target name="prepare" depends="-init-maven-ant">
-    <path id="classpath">
-      <path refId="maven.classpath"/>
-      <pathelement location="${classes.dir}"/>
-      <fileset dir="${deploy.dir}/lib" includes="**/*.jar"/>
-    </path>
+  <target name="-prepare" depends="-init-maven-ant">
     <mkdir dir="${deploy.dir}"/>
     <mkdir dir="${deploy.dir}/lib"/>
     <mkdir dir="${classes.dir}"/>
-    <mkdir dir="${javadoc.home}"/>
     <copy todir="${classes.dir}">
-      <fileset dir="src/java" includes="**/*.properties"/>
-      <fileset dir="src/java" includes="**/*.tmpl"/>
+      <fileset dir="${src.dir}" includes="**/*.properties"/>
+      <fileset dir="${src.dir}" includes="**/*.tmpl"/>
     </copy>
+    <path id="built.classpath">
+      <path refid="compile.classpath"/>
+      <pathelement location="${classes.dir}"/>
+    </path>
+    <path id="test.classpath">
+      <path refid="compile.classpath"/>
+      <path refid="testlibs.classpath"/>
+      <pathelement location="${classes.dir}"/>
+      <pathelement location="${tclasses.dir}"/>
+    </path>
+    <!-- TEMP: needed for ActionScript library build -->
+    <property name="libs.dir" value="lib"/>
     <copy todir="${deploy.dir}/lib" flatten="true">
-      <fileset refid="${lib.name}.libs"/>
+      <fileset dir="${libs.dir}">
+        <include name="aspirin.swc"/>
+        <include name="asunit.swc"/>
+        <include name="corelib.swc"/>
+      </fileset>
     </copy>
+    <!-- END TEMP -->
   </target>
 
-  <!-- checks the availability of certain libraries -->
-  <target name="check-available" depends="prepare">
-    <available property="ehcache.present" classpathref="classpath"
-               classname="net.sf.ehcache.CacheManager"/>
-    <echo level="info" message="Have EHCache: ${ehcache.present}"/>
-    <condition property="gwt.present"><and>
-        <available classname="com.google.gwt.core.client.GWT" classpathref="classpath"/>
-        <available classname="com.threerings.gwt.ui.Widgets" classpathref="classpath"/>
-    </and></condition>
-    <echo level="info" message="Have GWT: ${gwt.present}"/>
-  </target>
-
-  <!-- makes sure our tools are compiled and defines the ant tasks -->
-  <target name="preptools" depends="prepare">
-    <javac srcdir="src/java" destdir="${classes.dir}" includeAntRuntime="false"
-           debug="on" optimize="${build.optimize}" deprecation="on" source="1.5" target="1.5">
-      <classpath refid="classpath"/>
+  <target name="-preptools" depends="-prepare">
+    <javac srcdir="${src.dir}" destdir="${classes.dir}" includeAntRuntime="false"
+           debug="on" optimize="${build.optimize}" deprecation="on"
+           source="1.5" target="1.5" classpathref="compile.classpath">
       <compilerarg value="-Xlint"/>
       <compilerarg value="-Xlint:-serial"/>
       <include name="com/threerings/presents/tools/**"/>
     </javac>
-    <taskdef resource="com/threerings/presents/tools.properties" classpathref="classpath"/>
+    <taskdef resource="com/threerings/presents/tools.properties" classpathref="built.classpath"/>
   </target>
 
-  <!-- cleans out the intermediate build files -->
-  <target name="clean" depends="common-clean">
-    <delete dir="${deploy.dir}/classes"/>
+  <target name="clean" description="Cleans out build results">
+    <delete dir="${classes.dir}"/>
+    <delete dir="${tclasses.dir}"/>
     <delete dir="${deploy.dir}/docs"/>
     <delete dir="${gwtjar.dir}"/>
     <delete failonerror="false"><fileset dir="${deploy.dir}" includes="*.jar"/></delete>
     <delete failonerror="false"><fileset dir="${deploy.dir}" includes="*.swc"/></delete>
   </target>
 
-  <!-- wipes the entire build directory clean -->
-  <target name="distclean" depends="common-clean">
+  <target name="distclean" description="Scorched earth clean">
     <delete dir="${deploy.dir}"/>
   </target>
 
-  <!-- common clean tasks -->
-  <target name="common-clean">
-    <ant dir="tests" target="clean"/>
-  </target>
-
-  <!-- build the java class files -->
-  <target name="compile" depends="prepare,check-available">
-    <javac srcdir="src/java" destdir="${classes.dir}" includeAntRuntime="false"
-           debug="on" optimize="${build.optimize}" deprecation="on" source="1.5" target="1.5">
-      <classpath refid="classpath"/>
+  <target name="compile" depends="-prepare" description="Builds the Java code">
+    <javac srcdir="${src.dir}" destdir="${classes.dir}" includeAntRuntime="false"
+           debug="on" optimize="${build.optimize}" deprecation="on"
+           source="1.5" target="1.5" classpathref="compile.classpath">
+      <compilerarg value="-Xlint"/>
+      <compilerarg value="-Xlint:-serial"/>
+    </javac>
+
+    <mkdir dir="${tclasses.dir}"/>
+    <copy todir="${tclasses.dir}"><fileset dir="src/test/resources" includes="**"/></copy>
+    <javac srcdir="${tsrc.dir}" destdir="${tclasses.dir}" includeAntRuntime="false"
+           debug="on" optimize="${build.optimize}" source="1.5" target="1.5"
+           encoding="utf-8" classpathref="test.classpath">
       <compilerarg value="-Xlint"/>
       <compilerarg value="-Xlint:-serial"/>
-      <exclude name="com/threerings/presents/peer/server/EHCache*" unless="ehcache.present"/>
-      <exclude name="**/web/**/*.java" unless="gwt.present"/>
     </javac>
   </target>
 
-  <!-- checks whether our Flash library needs building -->
-  <target name="checkaslib">
+  <target name="-checkaslib">
     <condition property="no_build_aslib"><or>
       <not><available file="${flexsdk.dir}/lib/compc.jar"/></not>
       <and>
@@ -123,16 +124,15 @@
     </or></condition>
   </target>
 
-  <!-- builds our Flash library -->
-  <target name="aslib" unless="no_build_aslib" depends="checkaslib">
-    <!-- Generate aslib-config.xml for Flash Player and general compilation -->
+  <target name="aslib" unless="no_build_aslib" depends="-checkaslib"
+          description="Builds the ActionScript code">
+    <!-- generate aslib-config.xml for Flash Player and general compilation -->
     <copy file="etc/aslib-config.xml.in" tofile="${deploy.dir}/aslib-config.xml">
       <filterset>
         <filter token="flex_sdk_dir" value="${flexsdk.dir}"/>
         <filter token="lib_name" value="${lib.name}"/>
       </filterset>
     </copy>
-    <!-- Build Narya -->
     <java jar="${flexsdk.dir}/lib/compc.jar" fork="true" failonerror="true">
       <arg value="-load-config"/>
       <arg value="${deploy.dir}/aslib-config.xml"/>
@@ -145,22 +145,21 @@
     <delete file="${deploy.dir}/aslib-config.xml"/>
   </target>
 
-  <!-- build the native libraries -->
   <condition property="isunix"><os family="unix"/></condition>
-  <target name="ninstall" depends="prepare" if="isunix">
+  <target name="ninstall" depends="-prepare" if="isunix"
+          description="Builds the native libraries.">
     <echo level="info" message="Doing native compilation on ${os.name}..."/>
-    <exec dir="src/java/com/threerings/util/signal/${os.name}" executable="make">
+    <exec dir="${src.dir}/com/threerings/util/signal/${os.name}" executable="make">
        <arg line="install"/>
     </exec>
   </target>
 
-  <!-- build the javadoc documentation -->
-  <target name="javadoc" depends="prepare">
-    <javadoc sourcepath="src/java" packagenames="com.threerings.*"
-             destdir="${javadoc.home}" stylesheetfile="docs/stylesheet.css"
-             additionalparam="-breakiterator"
-             link="http://www.threerings.net/code/narya/docs/api">
-      <classpath refid="classpath"/>
+  <target name="javadoc" depends="-prepare" description="Builds the Java documentation">
+    <mkdir dir="${deploy.dir}/docs"/>
+    <javadoc sourcepath="${src.dir}" packagenames="com.threerings.*"
+             destdir="${deploy.dir}/docs" stylesheetfile="docs/stylesheet.css"
+             link="http://www.threerings.net/code/narya/docs/api"
+             additionalparam="-breakiterator" classpathref="compile.classpath">
       <link href="http://java.sun.com/j2se/1.5/docs/api/"/>
       <!-- ant documentation is not available online, sorry kids -->
       <link href="file:///usr/share/doc/ant-doc/javadocs"/>
@@ -168,17 +167,8 @@
     </javadoc>
   </target>
 
-  <!-- builds the javadocs and stuffs them in a directory where they -->
-  <!-- won't be blown away when we do "clean" next time -->
-  <target name="savedoc" depends="javadoc">
-    <delete dir="${savedoc.dir}/api"/>
-    <copy todir="${savedoc.dir}/api">
-      <fileset dir="${javadoc.home}" includes="**/*"/>
-    </copy>
-  </target>
-
-  <!-- builds the ActionScript documention -->
-  <target name="asdoc" unless="no_build_aslib" depends="checkaslib">
+  <target name="asdoc" unless="no_build_aslib" depends="-checkaslib"
+          description="Builds the ActionScript documention">
     <mkdir dir="${deploy.dir}/asdocs"/>
     <java classpath="${flexsdk.dir}/lib/asdoc.jar" classname="flex2.tools.ASDoc" fork="true">
       <jvmarg value="-Xmx1024m"/>
@@ -193,18 +183,26 @@
     </java>
   </target>
 
-  <!-- runs our tests -->
-  <target name="tests">
-    <ant dir="tests" target="tests"/>
+  <property name="test" value=""/>
+  <target name="tests" depends="compile" 
+          description="Runs unit tests. Use -Dtest=Foo to run only FooTest.">
+    <taskdef name="unit" classpathref="test.classpath"
+      classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
+    <unit printsummary="off" haltonfailure="yes">
+      <classpath refid="test.classpath"/>
+      <sysproperty key="test_dir" value="${tclasses.dir}"/>
+      <formatter type="brief" usefile="false"/>
+      <batchtest>
+        <fileset dir="${tsrc.dir}" includes="**/*${test}*Test.java"/>
+      </batchtest>
+    </unit>
   </target>
 
   <!-- a target for rebuilding everything -->
-  <target name="all" depends="clean,prepare,compile,aslib,ninstall,javadoc,dist"/>
+  <target name="all" depends="clean,compile,aslib,ninstall,javadoc,dist"/>
 
   <!-- builds our distribution files (war and jar) -->
-  <target name="dist" depends="prepare,compile,procstream,aslib,ninstall">
-    <!-- build our tests since that isn't otherwise normally done -->
-    <ant dir="tests" target="compile"/>
+  <target name="dist" depends="compile,procstream,aslib,ninstall">
     <!-- build our various jar files -->
     <jar destfile="${deploy.dir}/${lib.name}-base.jar">
       <fileset dir="${classes.dir}">
@@ -235,36 +233,37 @@
       </fileset>
     </jar>
     <jar destfile="${deploy.dir}/${lib.name}-tests.jar">
-      <fileset dir="tests/${classes.dir}" includes="com/threerings/**"/>
+      <fileset dir="${tclasses.dir}" includes="com/threerings/**"/>
     </jar>
-    <artifact:dependencies filesetId="mustache.fileset">
-      <dependency groupId="com.samskivert" artifactId="jmustache" version="1.0"/>
+
+    <!-- build a batteries-included jar for our tools -->
+    <artifact:dependencies pathId="jarjar.classpath">
+      <dependency groupId="com.tonicsystems" artifactId="jarjar" version="0.6"/>
+    </artifact:dependencies>
+    <artifact:dependencies filesetId="tools.fileset">
+      <dependency groupId="com.samskivert" artifactId="jmustache" version="1.0"/>
+      <dependency groupId="com.samskivert" artifactId="samskivert" version="1.0"/>
+      <dependency groupId="jboss" artifactId="javassist" version="3.7.ga"/>
+      <dependency groupId="com.google.guava" artifactId="guava" version="r05"/>
     </artifact:dependencies>
-    <!-- build a dependencies-included version of narya-tools -->
     <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
-             classpathref="classpath"/>
+             classpathref="jarjar.classpath"/>
     <jarjar destfile="${deploy.dir}/${lib.name}-tools-full.jar">
       <fileset dir="${classes.dir}">
         <include name="com/threerings/io/**"/>
         <include name="com/threerings/presents/**"/>
         <include name="com/threerings/util/**"/>
       </fileset>
-      <zipfileset src="${deploy.dir}/lib/samskivert.jar"/>
-      <zipfileset refid="mustache.fileset"/>
+      <zipgroupfileset refid="tools.fileset"/>
       <rule pattern="com.samskivert.**" result="cs.@1"/>
-      <zipfileset src="${deploy.dir}/lib/javassist.jar"/>
       <rule pattern="javassist.**" result="ja.@1"/>
-      <zipfileset src="${deploy.dir}/lib/guava.jar"/>
       <rule pattern="com.google.**" result="cgc.@1"/>
     </jarjar>
-    <antcall target="dist-gwt"/>
-  </target>
 
-  <target name="dist-gwt" if="gwt.present">
     <!-- we export a small selection of classes for use by GWT -->
     <mkdir dir="${gwtjar.dir}"/>
     <copy todir="${gwtjar.dir}">
-      <fileset dir="src/java">
+      <fileset dir="${src.dir}">
         <include name="**/web/server/*Exception.java"/>
         <include name="**/web/client/*.java"/>
         <include name="**/web/gwt/*.java"/>
@@ -276,47 +275,47 @@
   </target>
 
   <!-- generates fields for persistent record classes -->
-  <target name="genrecord" depends="prepare">
+  <target name="genrecord" depends="-prepare">
     <taskdef name="grecord" classname="com.samskivert.depot.tools.GenRecordTask"
-             classpathref="classpath"/>
+             classpathref="compile.classpath"/>
     <!-- make sure the record class files are all compiled -->
-    <javac srcdir="src/java" destdir="${classes.dir}" debug="on" optimize="${build.optimize}"
-           includeAntRuntime="false" deprecation="on" source="1.5" target="1.5">
-      <classpath refid="classpath"/>
+    <javac srcdir="${src.dir}" destdir="${classes.dir}" debug="on" optimize="${build.optimize}"
+           includeAntRuntime="false" deprecation="on" source="1.5" target="1.5"
+           classpathref="compile.classpath">
       <include name="**/*Record.java"/>
     </javac>
     <!-- now update the source files -->
-    <grecord classpathref="classpath">
-      <fileset dir="src/java" includes="**/*Record.java"/>
+    <grecord classpathref="built.classpath">
+      <fileset dir="${src.dir}" includes="**/*Record.java"/>
     </grecord>
   </target>
 
-  <!-- generates additional methods for distributed object classes -->
-  <target name="gendobj" depends="preptools">
+  <target name="gendobj" depends="-preptools"
+          description="Generates additional methods for distributed object classes">
     <!-- make sure the dobject class files are all compiled -->
-    <javac srcdir="src/java" destdir="${classes.dir}" includeAntRuntime="false" debug="on"
-           optimize="${build.optimize}" deprecation="on" source="1.5" target="1.5">
-      <classpath refid="classpath"/>
+    <javac srcdir="${src.dir}" destdir="${classes.dir}" includeAntRuntime="false" debug="on"
+           optimize="${build.optimize}" deprecation="on" source="1.5" target="1.5"
+           classpathref="compile.classpath">
       <include name="**/*Object.java"/>
     </javac>
     <!-- now generate the associated files -->
-    <gendobj classpathref="classpath">
-      <fileset dir="src/java" includes="**/*Object.java"/>
+    <gendobj classpathref="built.classpath">
+      <fileset dir="${src.dir}" includes="**/*Object.java"/>
     </gendobj>
   </target>
 
-  <!-- generates marshaller and dispatcher classes for all invocation service declarations -->
-  <target name="genservice" depends="preptools">
+  <target name="genservice" depends="-preptools"
+          description="Generates marshaller and dispatcher classes for all invocation services">
     <!-- make sure the service class files are all compiled -->
-    <javac srcdir="src/java" destdir="${classes.dir}" includeAntRuntime="false" debug="on"
-           optimize="${build.optimize}" deprecation="on" source="1.5" target="1.5">
-      <classpath refid="classpath"/>
+    <javac srcdir="${src.dir}" destdir="${classes.dir}" includeAntRuntime="false" debug="on"
+           optimize="${build.optimize}" deprecation="on" source="1.5" target="1.5"
+           classpathref="compile.classpath">
       <include name="**/*Service.java"/>
       <exclude name="**/InvocationService.java"/>
     </javac>
     <!-- now generate the associated files -->
-    <genservice header="lib/SOURCE_HEADER" asroot="src/as" classpathref="classpath">
-      <fileset dir="src/java" includes="**/*Service.java">
+    <genservice header="lib/SOURCE_HEADER" asroot="src/as" classpathref="built.classpath">
+      <fileset dir="${src.dir}" includes="**/*Service.java">
         <exclude name="**/InvocationService.java"/>
         <exclude name="**/peer/**"/>
         <exclude name="**/admin/**"/>
@@ -325,33 +324,32 @@
       <providerless service="SimulatorService"/>
       <providerless service="TimeBaseService"/>
     </genservice>
-    <genservice header="lib/SOURCE_HEADER" classpathref="classpath">
-      <fileset dir="src/java" includes="**/peer/**/*Service.java"/>
-      <fileset dir="src/java" includes="**/admin/**/*Service.java"/>
+    <genservice header="lib/SOURCE_HEADER" classpathref="built.classpath">
+      <fileset dir="${src.dir}" includes="**/peer/**/*Service.java"/>
+      <fileset dir="${src.dir}" includes="**/admin/**/*Service.java"/>
     </genservice>
   </target>
 
-  <!-- generates sender and decoder classes for all invocation receiver declarations -->
-  <target name="genreceiver" depends="preptools">
+  <target name="genreceiver" depends="-preptools"
+          description="Generates sender and decoder classes for all invocation receivers">
     <!-- make sure the receiver class files are all compiled -->
-    <javac srcdir="src/java" destdir="${classes.dir}" includeAntRuntime="false"
-           debug="on" optimize="${build.optimize}" deprecation="on" source="1.5" target="1.5">
-      <classpath refid="classpath"/>
+    <javac srcdir="${src.dir}" destdir="${classes.dir}" includeAntRuntime="false"
+           debug="on" optimize="${build.optimize}" deprecation="on" source="1.5" target="1.5"
+           classpathref="compile.classpath">
       <include name="**/*Receiver.java"/>
       <exclude name="**/InvocationReceiver.java"/>
     </javac>
     <!-- now generate the associated files -->
-    <genreceiver header="lib/SOURCE_HEADER" classpathref="classpath">
-      <fileset dir="src/java" includes="**/*Receiver.java"
+    <genreceiver header="lib/SOURCE_HEADER" classpathref="built.classpath">
+      <fileset dir="${src.dir}" includes="**/*Receiver.java"
         excludes="**/InvocationReceiver.java"/>
     </genreceiver>
   </target>
 
-  <!-- adds readField and writeField methods to Stremable classes -->
-  <target name="procstream" depends="preptools">
-    <!-- now instrument the associated files -->
+  <target name="procstream" depends="-preptools"
+          description="Adds readField and writeField methods to Streamable classes">
     <instream outdir="${classes.dir}">
-      <path refid="classpath"/>
+      <path refid="built.classpath"/>
       <fileset dir="${classes.dir}" includes="**/data/*.class"/>
       <fileset dir="${classes.dir}" includes="**/net/*.class"/>
       <fileset dir="${classes.dir}" includes="**/dobj/*.class"/>
@@ -359,10 +357,10 @@
     </instream>
   </target>
 
-  <!-- generates ActionScript versions of our Streamable classes -->
-  <target name="genascript" depends="preptools">
+  <target name="genascript" depends="-preptools"
+          description="Generates ActionScript versions of our Streamable classes">
     <genascript header="lib/SOURCE_HEADER" asroot="src/as">
-      <fileset dir="src/java" includes="**/data/*.java"/>
+      <fileset dir="${src.dir}" includes="**/data/*.java"/>
     </genascript>
   </target>
 
@@ -370,24 +368,12 @@
   <property name="inpre" value="${deploy.dir}/${lib.name}"/>
   <property name="outpre" value="${deploy.dir}/retro/${lib.name}"/>
 
-  <!-- a helper task for 'retro' -->
-  <target name="vweave">
-    <taskdef name="weave" classpathref="classpath"
-             classname="com.rc.retroweaver.ant.RetroWeaverTask"/>
-    <path id="retrocp">
-      <pathelement location="/usr/local/jdk1.4/jre/lib/rt.jar"/>
-      <fileset dir="lib" includes="**/*.jar"/>
-      <fileset dir="${deploy.dir}/retro" includes="*.jar"/>
-    </path>
-    <weave inputjar="${inpre}-${which}.jar" outputjar="${outpre}-${which}.jar"
-           failonerror="true">
-      <classpath refid="retrocp"/>
-    </weave>
-  </target>
-
-  <!-- converts our 1.5 code to a 1.4 compatible format -->
-  <target name="retro" depends="dist">
-    <taskdef name="weave" classpathref="classpath"
+  <target name="retro" depends="dist"
+          description="Converts our 1.5 code to a 1.4 compatible format">
+    <artifact:dependencies pathId="retroweaver.classpath">
+      <dependency groupId="net.sourceforge.retroweaver" artifactId="retroweaver" version="1.2.3"/>
+    </artifact:dependencies>
+    <taskdef name="weave" classpathref="retroweaver.classpath"
              classname="com.rc.retroweaver.ant.RetroWeaverTask"/>
     <mkdir dir="${deploy.dir}/retro"/>
 
@@ -397,41 +383,28 @@
     <weave inputjar="${inpre}-distrib.jar" outputjar="${outpre}-distrib.jar"/>
 
     <!-- now weave again with the verifier to check for unweavable 1.5isms -->
-    <antcall target="vweave"><param name="which" value="base"/></antcall>
-    <antcall target="vweave"><param name="which" value="distrib"/></antcall>
+    <antcall target="-vweave"><param name="which" value="base"/></antcall>
+    <antcall target="-vweave"><param name="which" value="distrib"/></antcall>
   </target>
 
-  <!-- generate a class hierarchy diagram -->
-  <target name="hierviz" depends="prepare,compile">
-    <taskdef name="viztool" classname="com.samskivert.viztool.DriverTask"/>
-    <viztool visualizer="com.samskivert.viztool.hierarchy.HierarchyVisualizer"
-      pkgroot="com.threerings.miso" classes="com.threerings.miso.*"
-      output="hierviz.ps">
-      <classpath refid="classpath"/>
-    </viztool>
+  <target name="-vweave">
+    <weave inputjar="${inpre}-${which}.jar" outputjar="${outpre}-${which}.jar" failonerror="true">
+      <classpath>
+        <path refid="compile.classpath"/>
+        <pathelement location="/usr/local/jdk1.4/jre/lib/rt.jar"/>
+        <fileset dir="${deploy.dir}/retro" includes="*.jar"/>
+      </classpath>
+    </weave>
   </target>
 
-  <!-- generate a class hierarchy diagram -->
-  <target name="sumgen" depends="prepare,compile">
-    <taskdef name="viztool" classname="com.samskivert.viztool.DriverTask"/>
-    <viztool visualizer="com.samskivert.viztool.summary.SummaryVisualizer"
-      pkgroot="com.threerings.miso"
-      classes="com.threerings.miso.*Scene.*"
-      output="summary.ps">
-      <classpath refid="base.classpath"/>
-    </viztool>
-  </target>
-
-  <!-- creates a zipfile with our source distribution -->
-  <target name="snapshot">
-     <echo message="You may want to stop and run 'ant savedoc' first."/>
+  <target name="snapshot" description="Creates a zipfile with our source distribution">
      <delete file="${deploy.dir}/${lib.name}-snapshot.zip"/>
      <mkdir dir="${deploy.dir}/snapshot/${lib.name}"/>
      <copy todir="${deploy.dir}/snapshot/${lib.name}">
        <fileset dir=".">
          <include name="**"/>
-         <exclude name="dist/**"/>
-         <exclude name="tests/dist/**"/>
+         <exclude name="${deploy.dir}/**"/>
+         <exclude name="tests/${deploy.dir}/**"/>
          <exclude name="${lib.name}-*.zip"/>
        </fileset>
      </copy>
diff --git a/tests/etc/astest-config.xml.in b/etc/astest-config.xml.in
similarity index 100%
rename from tests/etc/astest-config.xml.in
rename to etc/astest-config.xml.in
diff --git a/etc/libs-incl.xml b/etc/libs-incl.xml
index 9dded813e..4c970fb49 100644
--- a/etc/libs-incl.xml
+++ b/etc/libs-incl.xml
@@ -2,24 +2,6 @@
 <!-- declares the libraries needed to build narya -->
 <project name="library-dependencies">
   <fileset dir="${libs.dir}" id="narya.libs">
-    <include name="aopalliance.jar"/>
-    <include name="ant.jar"/>
-    <include name="asc.jar"/>
-    <include name="depot.jar"/>
-    <include name="ehcache.jar"/>
-    <include name="flexTasks.jar"/>
-    <include name="guava.jar"/>
-    <include name="guice.jar"/>
-    <include name="gwt-user.jar"/>
-    <include name="gwt-utils.jar"/>
-    <include name="javassist.jar"/>
-    <include name="jarjar-1.0.jar"/>
-    <include name="jmustache-1.0.jar"/>
-    <include name="jsr250-api.jar"/>
-    <include name="junit4.jar"/>
-    <include name="retroweaver-all-1.2.2.jar"/>
-    <include name="samskivert.jar"/>
-    <include name="swfutils-ooo.jar"/>
     <include name="aspirin.swc"/>
     <include name="asunit.swc"/>
     <include name="corelib.swc"/>
diff --git a/tests/etc/thane-config.xml.in b/etc/thane-config.xml.in
similarity index 100%
rename from tests/etc/thane-config.xml.in
rename to etc/thane-config.xml.in
diff --git a/src/java/com/threerings/NaryaLog.java b/src/main/java/com/threerings/NaryaLog.java
similarity index 100%
rename from src/java/com/threerings/NaryaLog.java
rename to src/main/java/com/threerings/NaryaLog.java
diff --git a/src/java/com/threerings/admin/Log.java b/src/main/java/com/threerings/admin/Log.java
similarity index 100%
rename from src/java/com/threerings/admin/Log.java
rename to src/main/java/com/threerings/admin/Log.java
diff --git a/src/java/com/threerings/admin/client/AdminService.java b/src/main/java/com/threerings/admin/client/AdminService.java
similarity index 100%
rename from src/java/com/threerings/admin/client/AdminService.java
rename to src/main/java/com/threerings/admin/client/AdminService.java
diff --git a/src/java/com/threerings/admin/client/AsStringFieldEditor.java b/src/main/java/com/threerings/admin/client/AsStringFieldEditor.java
similarity index 100%
rename from src/java/com/threerings/admin/client/AsStringFieldEditor.java
rename to src/main/java/com/threerings/admin/client/AsStringFieldEditor.java
diff --git a/src/java/com/threerings/admin/client/BooleanFieldEditor.java b/src/main/java/com/threerings/admin/client/BooleanFieldEditor.java
similarity index 100%
rename from src/java/com/threerings/admin/client/BooleanFieldEditor.java
rename to src/main/java/com/threerings/admin/client/BooleanFieldEditor.java
diff --git a/src/java/com/threerings/admin/client/ConfigEditorPanel.java b/src/main/java/com/threerings/admin/client/ConfigEditorPanel.java
similarity index 100%
rename from src/java/com/threerings/admin/client/ConfigEditorPanel.java
rename to src/main/java/com/threerings/admin/client/ConfigEditorPanel.java
diff --git a/src/java/com/threerings/admin/client/ConfigObjectManager.java b/src/main/java/com/threerings/admin/client/ConfigObjectManager.java
similarity index 100%
rename from src/java/com/threerings/admin/client/ConfigObjectManager.java
rename to src/main/java/com/threerings/admin/client/ConfigObjectManager.java
diff --git a/src/java/com/threerings/admin/client/DSetEditor.java b/src/main/java/com/threerings/admin/client/DSetEditor.java
similarity index 100%
rename from src/java/com/threerings/admin/client/DSetEditor.java
rename to src/main/java/com/threerings/admin/client/DSetEditor.java
diff --git a/src/java/com/threerings/admin/client/FieldEditor.java b/src/main/java/com/threerings/admin/client/FieldEditor.java
similarity index 100%
rename from src/java/com/threerings/admin/client/FieldEditor.java
rename to src/main/java/com/threerings/admin/client/FieldEditor.java
diff --git a/src/java/com/threerings/admin/client/ObjectEditorPanel.java b/src/main/java/com/threerings/admin/client/ObjectEditorPanel.java
similarity index 100%
rename from src/java/com/threerings/admin/client/ObjectEditorPanel.java
rename to src/main/java/com/threerings/admin/client/ObjectEditorPanel.java
diff --git a/src/java/com/threerings/admin/client/PulldownFieldEditor.java b/src/main/java/com/threerings/admin/client/PulldownFieldEditor.java
similarity index 100%
rename from src/java/com/threerings/admin/client/PulldownFieldEditor.java
rename to src/main/java/com/threerings/admin/client/PulldownFieldEditor.java
diff --git a/src/java/com/threerings/admin/client/TabbedDSetEditor.java b/src/main/java/com/threerings/admin/client/TabbedDSetEditor.java
similarity index 100%
rename from src/java/com/threerings/admin/client/TabbedDSetEditor.java
rename to src/main/java/com/threerings/admin/client/TabbedDSetEditor.java
diff --git a/src/java/com/threerings/admin/data/AdminCodes.java b/src/main/java/com/threerings/admin/data/AdminCodes.java
similarity index 100%
rename from src/java/com/threerings/admin/data/AdminCodes.java
rename to src/main/java/com/threerings/admin/data/AdminCodes.java
diff --git a/src/java/com/threerings/admin/data/AdminMarshaller.java b/src/main/java/com/threerings/admin/data/AdminMarshaller.java
similarity index 100%
rename from src/java/com/threerings/admin/data/AdminMarshaller.java
rename to src/main/java/com/threerings/admin/data/AdminMarshaller.java
diff --git a/src/java/com/threerings/admin/data/ConfigObject.java b/src/main/java/com/threerings/admin/data/ConfigObject.java
similarity index 100%
rename from src/java/com/threerings/admin/data/ConfigObject.java
rename to src/main/java/com/threerings/admin/data/ConfigObject.java
diff --git a/src/java/com/threerings/admin/server/AdminDispatcher.java b/src/main/java/com/threerings/admin/server/AdminDispatcher.java
similarity index 100%
rename from src/java/com/threerings/admin/server/AdminDispatcher.java
rename to src/main/java/com/threerings/admin/server/AdminDispatcher.java
diff --git a/src/java/com/threerings/admin/server/AdminManager.java b/src/main/java/com/threerings/admin/server/AdminManager.java
similarity index 100%
rename from src/java/com/threerings/admin/server/AdminManager.java
rename to src/main/java/com/threerings/admin/server/AdminManager.java
diff --git a/src/java/com/threerings/admin/server/AdminProvider.java b/src/main/java/com/threerings/admin/server/AdminProvider.java
similarity index 100%
rename from src/java/com/threerings/admin/server/AdminProvider.java
rename to src/main/java/com/threerings/admin/server/AdminProvider.java
diff --git a/src/java/com/threerings/admin/server/ConfigRegistry.java b/src/main/java/com/threerings/admin/server/ConfigRegistry.java
similarity index 100%
rename from src/java/com/threerings/admin/server/ConfigRegistry.java
rename to src/main/java/com/threerings/admin/server/ConfigRegistry.java
diff --git a/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java b/src/main/java/com/threerings/admin/server/DatabaseConfigRegistry.java
similarity index 100%
rename from src/java/com/threerings/admin/server/DatabaseConfigRegistry.java
rename to src/main/java/com/threerings/admin/server/DatabaseConfigRegistry.java
diff --git a/src/java/com/threerings/admin/server/PeeredDatabaseConfigRegistry.java b/src/main/java/com/threerings/admin/server/PeeredDatabaseConfigRegistry.java
similarity index 100%
rename from src/java/com/threerings/admin/server/PeeredDatabaseConfigRegistry.java
rename to src/main/java/com/threerings/admin/server/PeeredDatabaseConfigRegistry.java
diff --git a/src/java/com/threerings/admin/server/PrefsConfigRegistry.java b/src/main/java/com/threerings/admin/server/PrefsConfigRegistry.java
similarity index 100%
rename from src/java/com/threerings/admin/server/PrefsConfigRegistry.java
rename to src/main/java/com/threerings/admin/server/PrefsConfigRegistry.java
diff --git a/src/java/com/threerings/admin/server/persist/ConfigDatum.java b/src/main/java/com/threerings/admin/server/persist/ConfigDatum.java
similarity index 100%
rename from src/java/com/threerings/admin/server/persist/ConfigDatum.java
rename to src/main/java/com/threerings/admin/server/persist/ConfigDatum.java
diff --git a/src/java/com/threerings/admin/server/persist/ConfigRecord.java b/src/main/java/com/threerings/admin/server/persist/ConfigRecord.java
similarity index 100%
rename from src/java/com/threerings/admin/server/persist/ConfigRecord.java
rename to src/main/java/com/threerings/admin/server/persist/ConfigRecord.java
diff --git a/src/java/com/threerings/admin/server/persist/ConfigRepository.java b/src/main/java/com/threerings/admin/server/persist/ConfigRepository.java
similarity index 100%
rename from src/java/com/threerings/admin/server/persist/ConfigRepository.java
rename to src/main/java/com/threerings/admin/server/persist/ConfigRepository.java
diff --git a/src/java/com/threerings/admin/web/Admin.gwt.xml b/src/main/java/com/threerings/admin/web/Admin.gwt.xml
similarity index 100%
rename from src/java/com/threerings/admin/web/Admin.gwt.xml
rename to src/main/java/com/threerings/admin/web/Admin.gwt.xml
diff --git a/src/java/com/threerings/admin/web/client/ConfigEditorPanel.java b/src/main/java/com/threerings/admin/web/client/ConfigEditorPanel.java
similarity index 100%
rename from src/java/com/threerings/admin/web/client/ConfigEditorPanel.java
rename to src/main/java/com/threerings/admin/web/client/ConfigEditorPanel.java
diff --git a/src/java/com/threerings/admin/web/client/ConfigEditorTab.java b/src/main/java/com/threerings/admin/web/client/ConfigEditorTab.java
similarity index 100%
rename from src/java/com/threerings/admin/web/client/ConfigEditorTab.java
rename to src/main/java/com/threerings/admin/web/client/ConfigEditorTab.java
diff --git a/src/java/com/threerings/admin/web/client/ConfigFieldEditor.java b/src/main/java/com/threerings/admin/web/client/ConfigFieldEditor.java
similarity index 100%
rename from src/java/com/threerings/admin/web/client/ConfigFieldEditor.java
rename to src/main/java/com/threerings/admin/web/client/ConfigFieldEditor.java
diff --git a/src/java/com/threerings/admin/web/gwt/ConfigField.java b/src/main/java/com/threerings/admin/web/gwt/ConfigField.java
similarity index 100%
rename from src/java/com/threerings/admin/web/gwt/ConfigField.java
rename to src/main/java/com/threerings/admin/web/gwt/ConfigField.java
diff --git a/src/java/com/threerings/admin/web/gwt/ConfigService.java b/src/main/java/com/threerings/admin/web/gwt/ConfigService.java
similarity index 100%
rename from src/java/com/threerings/admin/web/gwt/ConfigService.java
rename to src/main/java/com/threerings/admin/web/gwt/ConfigService.java
diff --git a/src/java/com/threerings/admin/web/gwt/ConfigServiceAsync.java b/src/main/java/com/threerings/admin/web/gwt/ConfigServiceAsync.java
similarity index 100%
rename from src/java/com/threerings/admin/web/gwt/ConfigServiceAsync.java
rename to src/main/java/com/threerings/admin/web/gwt/ConfigServiceAsync.java
diff --git a/src/java/com/threerings/admin/web/server/ConfigServlet.java b/src/main/java/com/threerings/admin/web/server/ConfigServlet.java
similarity index 100%
rename from src/java/com/threerings/admin/web/server/ConfigServlet.java
rename to src/main/java/com/threerings/admin/web/server/ConfigServlet.java
diff --git a/src/java/com/threerings/bureau/Log.java b/src/main/java/com/threerings/bureau/Log.java
similarity index 100%
rename from src/java/com/threerings/bureau/Log.java
rename to src/main/java/com/threerings/bureau/Log.java
diff --git a/src/java/com/threerings/bureau/client/Agent.java b/src/main/java/com/threerings/bureau/client/Agent.java
similarity index 100%
rename from src/java/com/threerings/bureau/client/Agent.java
rename to src/main/java/com/threerings/bureau/client/Agent.java
diff --git a/src/java/com/threerings/bureau/client/BureauClient.java b/src/main/java/com/threerings/bureau/client/BureauClient.java
similarity index 100%
rename from src/java/com/threerings/bureau/client/BureauClient.java
rename to src/main/java/com/threerings/bureau/client/BureauClient.java
diff --git a/src/java/com/threerings/bureau/client/BureauDecoder.java b/src/main/java/com/threerings/bureau/client/BureauDecoder.java
similarity index 100%
rename from src/java/com/threerings/bureau/client/BureauDecoder.java
rename to src/main/java/com/threerings/bureau/client/BureauDecoder.java
diff --git a/src/java/com/threerings/bureau/client/BureauDirector.java b/src/main/java/com/threerings/bureau/client/BureauDirector.java
similarity index 100%
rename from src/java/com/threerings/bureau/client/BureauDirector.java
rename to src/main/java/com/threerings/bureau/client/BureauDirector.java
diff --git a/src/java/com/threerings/bureau/client/BureauReceiver.java b/src/main/java/com/threerings/bureau/client/BureauReceiver.java
similarity index 100%
rename from src/java/com/threerings/bureau/client/BureauReceiver.java
rename to src/main/java/com/threerings/bureau/client/BureauReceiver.java
diff --git a/src/java/com/threerings/bureau/client/BureauService.java b/src/main/java/com/threerings/bureau/client/BureauService.java
similarity index 100%
rename from src/java/com/threerings/bureau/client/BureauService.java
rename to src/main/java/com/threerings/bureau/client/BureauService.java
diff --git a/src/java/com/threerings/bureau/data/AgentObject.java b/src/main/java/com/threerings/bureau/data/AgentObject.java
similarity index 100%
rename from src/java/com/threerings/bureau/data/AgentObject.java
rename to src/main/java/com/threerings/bureau/data/AgentObject.java
diff --git a/src/java/com/threerings/bureau/data/BureauAuthName.java b/src/main/java/com/threerings/bureau/data/BureauAuthName.java
similarity index 100%
rename from src/java/com/threerings/bureau/data/BureauAuthName.java
rename to src/main/java/com/threerings/bureau/data/BureauAuthName.java
diff --git a/src/java/com/threerings/bureau/data/BureauClientObject.java b/src/main/java/com/threerings/bureau/data/BureauClientObject.java
similarity index 100%
rename from src/java/com/threerings/bureau/data/BureauClientObject.java
rename to src/main/java/com/threerings/bureau/data/BureauClientObject.java
diff --git a/src/java/com/threerings/bureau/data/BureauCodes.java b/src/main/java/com/threerings/bureau/data/BureauCodes.java
similarity index 100%
rename from src/java/com/threerings/bureau/data/BureauCodes.java
rename to src/main/java/com/threerings/bureau/data/BureauCodes.java
diff --git a/src/java/com/threerings/bureau/data/BureauCredentials.java b/src/main/java/com/threerings/bureau/data/BureauCredentials.java
similarity index 100%
rename from src/java/com/threerings/bureau/data/BureauCredentials.java
rename to src/main/java/com/threerings/bureau/data/BureauCredentials.java
diff --git a/src/java/com/threerings/bureau/data/BureauMarshaller.java b/src/main/java/com/threerings/bureau/data/BureauMarshaller.java
similarity index 100%
rename from src/java/com/threerings/bureau/data/BureauMarshaller.java
rename to src/main/java/com/threerings/bureau/data/BureauMarshaller.java
diff --git a/src/java/com/threerings/bureau/server/BureauClientResolver.java b/src/main/java/com/threerings/bureau/server/BureauClientResolver.java
similarity index 100%
rename from src/java/com/threerings/bureau/server/BureauClientResolver.java
rename to src/main/java/com/threerings/bureau/server/BureauClientResolver.java
diff --git a/src/java/com/threerings/bureau/server/BureauDispatcher.java b/src/main/java/com/threerings/bureau/server/BureauDispatcher.java
similarity index 100%
rename from src/java/com/threerings/bureau/server/BureauDispatcher.java
rename to src/main/java/com/threerings/bureau/server/BureauDispatcher.java
diff --git a/src/java/com/threerings/bureau/server/BureauProvider.java b/src/main/java/com/threerings/bureau/server/BureauProvider.java
similarity index 100%
rename from src/java/com/threerings/bureau/server/BureauProvider.java
rename to src/main/java/com/threerings/bureau/server/BureauProvider.java
diff --git a/src/java/com/threerings/bureau/server/BureauRegistry.java b/src/main/java/com/threerings/bureau/server/BureauRegistry.java
similarity index 100%
rename from src/java/com/threerings/bureau/server/BureauRegistry.java
rename to src/main/java/com/threerings/bureau/server/BureauRegistry.java
diff --git a/src/java/com/threerings/bureau/server/BureauSender.java b/src/main/java/com/threerings/bureau/server/BureauSender.java
similarity index 100%
rename from src/java/com/threerings/bureau/server/BureauSender.java
rename to src/main/java/com/threerings/bureau/server/BureauSender.java
diff --git a/src/java/com/threerings/bureau/server/BureauSession.java b/src/main/java/com/threerings/bureau/server/BureauSession.java
similarity index 100%
rename from src/java/com/threerings/bureau/server/BureauSession.java
rename to src/main/java/com/threerings/bureau/server/BureauSession.java
diff --git a/src/java/com/threerings/bureau/util/BureauContext.java b/src/main/java/com/threerings/bureau/util/BureauContext.java
similarity index 100%
rename from src/java/com/threerings/bureau/util/BureauContext.java
rename to src/main/java/com/threerings/bureau/util/BureauContext.java
diff --git a/src/java/com/threerings/bureau/util/BureauLogRedirector.java b/src/main/java/com/threerings/bureau/util/BureauLogRedirector.java
similarity index 100%
rename from src/java/com/threerings/bureau/util/BureauLogRedirector.java
rename to src/main/java/com/threerings/bureau/util/BureauLogRedirector.java
diff --git a/src/java/com/threerings/crowd/Log.java b/src/main/java/com/threerings/crowd/Log.java
similarity index 100%
rename from src/java/com/threerings/crowd/Log.java
rename to src/main/java/com/threerings/crowd/Log.java
diff --git a/src/java/com/threerings/crowd/chat/client/ChannelSpeakService.java b/src/main/java/com/threerings/crowd/chat/client/ChannelSpeakService.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/client/ChannelSpeakService.java
rename to src/main/java/com/threerings/crowd/chat/client/ChannelSpeakService.java
diff --git a/src/java/com/threerings/crowd/chat/client/ChatDirector.java b/src/main/java/com/threerings/crowd/chat/client/ChatDirector.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/client/ChatDirector.java
rename to src/main/java/com/threerings/crowd/chat/client/ChatDirector.java
diff --git a/src/java/com/threerings/crowd/chat/client/ChatDisplay.java b/src/main/java/com/threerings/crowd/chat/client/ChatDisplay.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/client/ChatDisplay.java
rename to src/main/java/com/threerings/crowd/chat/client/ChatDisplay.java
diff --git a/src/java/com/threerings/crowd/chat/client/ChatFilter.java b/src/main/java/com/threerings/crowd/chat/client/ChatFilter.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/client/ChatFilter.java
rename to src/main/java/com/threerings/crowd/chat/client/ChatFilter.java
diff --git a/src/java/com/threerings/crowd/chat/client/ChatService.java b/src/main/java/com/threerings/crowd/chat/client/ChatService.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/client/ChatService.java
rename to src/main/java/com/threerings/crowd/chat/client/ChatService.java
diff --git a/src/java/com/threerings/crowd/chat/client/CurseFilter.java b/src/main/java/com/threerings/crowd/chat/client/CurseFilter.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/client/CurseFilter.java
rename to src/main/java/com/threerings/crowd/chat/client/CurseFilter.java
diff --git a/src/java/com/threerings/crowd/chat/client/HistoryList.java b/src/main/java/com/threerings/crowd/chat/client/HistoryList.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/client/HistoryList.java
rename to src/main/java/com/threerings/crowd/chat/client/HistoryList.java
diff --git a/src/java/com/threerings/crowd/chat/client/MuteDirector.java b/src/main/java/com/threerings/crowd/chat/client/MuteDirector.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/client/MuteDirector.java
rename to src/main/java/com/threerings/crowd/chat/client/MuteDirector.java
diff --git a/src/java/com/threerings/crowd/chat/client/SpeakService.java b/src/main/java/com/threerings/crowd/chat/client/SpeakService.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/client/SpeakService.java
rename to src/main/java/com/threerings/crowd/chat/client/SpeakService.java
diff --git a/src/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java b/src/main/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java
rename to src/main/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java
diff --git a/src/java/com/threerings/crowd/chat/data/ChatChannel.java b/src/main/java/com/threerings/crowd/chat/data/ChatChannel.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/data/ChatChannel.java
rename to src/main/java/com/threerings/crowd/chat/data/ChatChannel.java
diff --git a/src/java/com/threerings/crowd/chat/data/ChatCodes.java b/src/main/java/com/threerings/crowd/chat/data/ChatCodes.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/data/ChatCodes.java
rename to src/main/java/com/threerings/crowd/chat/data/ChatCodes.java
diff --git a/src/java/com/threerings/crowd/chat/data/ChatMarshaller.java b/src/main/java/com/threerings/crowd/chat/data/ChatMarshaller.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/data/ChatMarshaller.java
rename to src/main/java/com/threerings/crowd/chat/data/ChatMarshaller.java
diff --git a/src/java/com/threerings/crowd/chat/data/ChatMessage.java b/src/main/java/com/threerings/crowd/chat/data/ChatMessage.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/data/ChatMessage.java
rename to src/main/java/com/threerings/crowd/chat/data/ChatMessage.java
diff --git a/src/java/com/threerings/crowd/chat/data/KeepNoHistory.java b/src/main/java/com/threerings/crowd/chat/data/KeepNoHistory.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/data/KeepNoHistory.java
rename to src/main/java/com/threerings/crowd/chat/data/KeepNoHistory.java
diff --git a/src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java b/src/main/java/com/threerings/crowd/chat/data/SpeakMarshaller.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java
rename to src/main/java/com/threerings/crowd/chat/data/SpeakMarshaller.java
diff --git a/src/java/com/threerings/crowd/chat/data/SpeakObject.java b/src/main/java/com/threerings/crowd/chat/data/SpeakObject.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/data/SpeakObject.java
rename to src/main/java/com/threerings/crowd/chat/data/SpeakObject.java
diff --git a/src/java/com/threerings/crowd/chat/data/SystemMessage.java b/src/main/java/com/threerings/crowd/chat/data/SystemMessage.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/data/SystemMessage.java
rename to src/main/java/com/threerings/crowd/chat/data/SystemMessage.java
diff --git a/src/java/com/threerings/crowd/chat/data/TellFeedbackMessage.java b/src/main/java/com/threerings/crowd/chat/data/TellFeedbackMessage.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/data/TellFeedbackMessage.java
rename to src/main/java/com/threerings/crowd/chat/data/TellFeedbackMessage.java
diff --git a/src/java/com/threerings/crowd/chat/data/UserMessage.java b/src/main/java/com/threerings/crowd/chat/data/UserMessage.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/data/UserMessage.java
rename to src/main/java/com/threerings/crowd/chat/data/UserMessage.java
diff --git a/src/java/com/threerings/crowd/chat/data/UserSystemMessage.java b/src/main/java/com/threerings/crowd/chat/data/UserSystemMessage.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/data/UserSystemMessage.java
rename to src/main/java/com/threerings/crowd/chat/data/UserSystemMessage.java
diff --git a/src/java/com/threerings/crowd/chat/server/ChannelSpeakDispatcher.java b/src/main/java/com/threerings/crowd/chat/server/ChannelSpeakDispatcher.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/server/ChannelSpeakDispatcher.java
rename to src/main/java/com/threerings/crowd/chat/server/ChannelSpeakDispatcher.java
diff --git a/src/java/com/threerings/crowd/chat/server/ChannelSpeakProvider.java b/src/main/java/com/threerings/crowd/chat/server/ChannelSpeakProvider.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/server/ChannelSpeakProvider.java
rename to src/main/java/com/threerings/crowd/chat/server/ChannelSpeakProvider.java
diff --git a/src/java/com/threerings/crowd/chat/server/ChatChannelManager.java b/src/main/java/com/threerings/crowd/chat/server/ChatChannelManager.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/server/ChatChannelManager.java
rename to src/main/java/com/threerings/crowd/chat/server/ChatChannelManager.java
diff --git a/src/java/com/threerings/crowd/chat/server/ChatDispatcher.java b/src/main/java/com/threerings/crowd/chat/server/ChatDispatcher.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/server/ChatDispatcher.java
rename to src/main/java/com/threerings/crowd/chat/server/ChatDispatcher.java
diff --git a/src/java/com/threerings/crowd/chat/server/ChatProvider.java b/src/main/java/com/threerings/crowd/chat/server/ChatProvider.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/server/ChatProvider.java
rename to src/main/java/com/threerings/crowd/chat/server/ChatProvider.java
diff --git a/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java b/src/main/java/com/threerings/crowd/chat/server/SpeakDispatcher.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java
rename to src/main/java/com/threerings/crowd/chat/server/SpeakDispatcher.java
diff --git a/src/java/com/threerings/crowd/chat/server/SpeakHandler.java b/src/main/java/com/threerings/crowd/chat/server/SpeakHandler.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/server/SpeakHandler.java
rename to src/main/java/com/threerings/crowd/chat/server/SpeakHandler.java
diff --git a/src/java/com/threerings/crowd/chat/server/SpeakProvider.java b/src/main/java/com/threerings/crowd/chat/server/SpeakProvider.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/server/SpeakProvider.java
rename to src/main/java/com/threerings/crowd/chat/server/SpeakProvider.java
diff --git a/src/java/com/threerings/crowd/chat/server/SpeakUtil.java b/src/main/java/com/threerings/crowd/chat/server/SpeakUtil.java
similarity index 100%
rename from src/java/com/threerings/crowd/chat/server/SpeakUtil.java
rename to src/main/java/com/threerings/crowd/chat/server/SpeakUtil.java
diff --git a/src/java/com/threerings/crowd/client/BodyService.java b/src/main/java/com/threerings/crowd/client/BodyService.java
similarity index 100%
rename from src/java/com/threerings/crowd/client/BodyService.java
rename to src/main/java/com/threerings/crowd/client/BodyService.java
diff --git a/src/java/com/threerings/crowd/client/LocationAdapter.java b/src/main/java/com/threerings/crowd/client/LocationAdapter.java
similarity index 100%
rename from src/java/com/threerings/crowd/client/LocationAdapter.java
rename to src/main/java/com/threerings/crowd/client/LocationAdapter.java
diff --git a/src/java/com/threerings/crowd/client/LocationDecoder.java b/src/main/java/com/threerings/crowd/client/LocationDecoder.java
similarity index 100%
rename from src/java/com/threerings/crowd/client/LocationDecoder.java
rename to src/main/java/com/threerings/crowd/client/LocationDecoder.java
diff --git a/src/java/com/threerings/crowd/client/LocationDirector.java b/src/main/java/com/threerings/crowd/client/LocationDirector.java
similarity index 100%
rename from src/java/com/threerings/crowd/client/LocationDirector.java
rename to src/main/java/com/threerings/crowd/client/LocationDirector.java
diff --git a/src/java/com/threerings/crowd/client/LocationObserver.java b/src/main/java/com/threerings/crowd/client/LocationObserver.java
similarity index 100%
rename from src/java/com/threerings/crowd/client/LocationObserver.java
rename to src/main/java/com/threerings/crowd/client/LocationObserver.java
diff --git a/src/java/com/threerings/crowd/client/LocationReceiver.java b/src/main/java/com/threerings/crowd/client/LocationReceiver.java
similarity index 100%
rename from src/java/com/threerings/crowd/client/LocationReceiver.java
rename to src/main/java/com/threerings/crowd/client/LocationReceiver.java
diff --git a/src/java/com/threerings/crowd/client/LocationService.java b/src/main/java/com/threerings/crowd/client/LocationService.java
similarity index 100%
rename from src/java/com/threerings/crowd/client/LocationService.java
rename to src/main/java/com/threerings/crowd/client/LocationService.java
diff --git a/src/java/com/threerings/crowd/client/MoveFailedException.java b/src/main/java/com/threerings/crowd/client/MoveFailedException.java
similarity index 100%
rename from src/java/com/threerings/crowd/client/MoveFailedException.java
rename to src/main/java/com/threerings/crowd/client/MoveFailedException.java
diff --git a/src/java/com/threerings/crowd/client/MoveVetoedException.java b/src/main/java/com/threerings/crowd/client/MoveVetoedException.java
similarity index 100%
rename from src/java/com/threerings/crowd/client/MoveVetoedException.java
rename to src/main/java/com/threerings/crowd/client/MoveVetoedException.java
diff --git a/src/java/com/threerings/crowd/client/OccupantAdapter.java b/src/main/java/com/threerings/crowd/client/OccupantAdapter.java
similarity index 100%
rename from src/java/com/threerings/crowd/client/OccupantAdapter.java
rename to src/main/java/com/threerings/crowd/client/OccupantAdapter.java
diff --git a/src/java/com/threerings/crowd/client/OccupantDirector.java b/src/main/java/com/threerings/crowd/client/OccupantDirector.java
similarity index 100%
rename from src/java/com/threerings/crowd/client/OccupantDirector.java
rename to src/main/java/com/threerings/crowd/client/OccupantDirector.java
diff --git a/src/java/com/threerings/crowd/client/OccupantObserver.java b/src/main/java/com/threerings/crowd/client/OccupantObserver.java
similarity index 100%
rename from src/java/com/threerings/crowd/client/OccupantObserver.java
rename to src/main/java/com/threerings/crowd/client/OccupantObserver.java
diff --git a/src/java/com/threerings/crowd/client/PlaceController.java b/src/main/java/com/threerings/crowd/client/PlaceController.java
similarity index 100%
rename from src/java/com/threerings/crowd/client/PlaceController.java
rename to src/main/java/com/threerings/crowd/client/PlaceController.java
diff --git a/src/java/com/threerings/crowd/client/PlaceControllerDelegate.java b/src/main/java/com/threerings/crowd/client/PlaceControllerDelegate.java
similarity index 100%
rename from src/java/com/threerings/crowd/client/PlaceControllerDelegate.java
rename to src/main/java/com/threerings/crowd/client/PlaceControllerDelegate.java
diff --git a/src/java/com/threerings/crowd/client/PlacePanel.java b/src/main/java/com/threerings/crowd/client/PlacePanel.java
similarity index 100%
rename from src/java/com/threerings/crowd/client/PlacePanel.java
rename to src/main/java/com/threerings/crowd/client/PlacePanel.java
diff --git a/src/java/com/threerings/crowd/client/PlaceView.java b/src/main/java/com/threerings/crowd/client/PlaceView.java
similarity index 100%
rename from src/java/com/threerings/crowd/client/PlaceView.java
rename to src/main/java/com/threerings/crowd/client/PlaceView.java
diff --git a/src/java/com/threerings/crowd/client/PlaceViewUtil.java b/src/main/java/com/threerings/crowd/client/PlaceViewUtil.java
similarity index 100%
rename from src/java/com/threerings/crowd/client/PlaceViewUtil.java
rename to src/main/java/com/threerings/crowd/client/PlaceViewUtil.java
diff --git a/src/java/com/threerings/crowd/data/BodyMarshaller.java b/src/main/java/com/threerings/crowd/data/BodyMarshaller.java
similarity index 100%
rename from src/java/com/threerings/crowd/data/BodyMarshaller.java
rename to src/main/java/com/threerings/crowd/data/BodyMarshaller.java
diff --git a/src/java/com/threerings/crowd/data/BodyObject.java b/src/main/java/com/threerings/crowd/data/BodyObject.java
similarity index 100%
rename from src/java/com/threerings/crowd/data/BodyObject.java
rename to src/main/java/com/threerings/crowd/data/BodyObject.java
diff --git a/src/java/com/threerings/crowd/data/CrowdCodes.java b/src/main/java/com/threerings/crowd/data/CrowdCodes.java
similarity index 100%
rename from src/java/com/threerings/crowd/data/CrowdCodes.java
rename to src/main/java/com/threerings/crowd/data/CrowdCodes.java
diff --git a/src/java/com/threerings/crowd/data/CrowdPermissionPolicy.java b/src/main/java/com/threerings/crowd/data/CrowdPermissionPolicy.java
similarity index 100%
rename from src/java/com/threerings/crowd/data/CrowdPermissionPolicy.java
rename to src/main/java/com/threerings/crowd/data/CrowdPermissionPolicy.java
diff --git a/src/java/com/threerings/crowd/data/LocationCodes.java b/src/main/java/com/threerings/crowd/data/LocationCodes.java
similarity index 100%
rename from src/java/com/threerings/crowd/data/LocationCodes.java
rename to src/main/java/com/threerings/crowd/data/LocationCodes.java
diff --git a/src/java/com/threerings/crowd/data/LocationMarshaller.java b/src/main/java/com/threerings/crowd/data/LocationMarshaller.java
similarity index 100%
rename from src/java/com/threerings/crowd/data/LocationMarshaller.java
rename to src/main/java/com/threerings/crowd/data/LocationMarshaller.java
diff --git a/src/java/com/threerings/crowd/data/OccupantInfo.java b/src/main/java/com/threerings/crowd/data/OccupantInfo.java
similarity index 100%
rename from src/java/com/threerings/crowd/data/OccupantInfo.java
rename to src/main/java/com/threerings/crowd/data/OccupantInfo.java
diff --git a/src/java/com/threerings/crowd/data/Place.java b/src/main/java/com/threerings/crowd/data/Place.java
similarity index 100%
rename from src/java/com/threerings/crowd/data/Place.java
rename to src/main/java/com/threerings/crowd/data/Place.java
diff --git a/src/java/com/threerings/crowd/data/PlaceConfig.java b/src/main/java/com/threerings/crowd/data/PlaceConfig.java
similarity index 100%
rename from src/java/com/threerings/crowd/data/PlaceConfig.java
rename to src/main/java/com/threerings/crowd/data/PlaceConfig.java
diff --git a/src/java/com/threerings/crowd/data/PlaceObject.java b/src/main/java/com/threerings/crowd/data/PlaceObject.java
similarity index 100%
rename from src/java/com/threerings/crowd/data/PlaceObject.java
rename to src/main/java/com/threerings/crowd/data/PlaceObject.java
diff --git a/src/java/com/threerings/crowd/data/TokenRing.java b/src/main/java/com/threerings/crowd/data/TokenRing.java
similarity index 100%
rename from src/java/com/threerings/crowd/data/TokenRing.java
rename to src/main/java/com/threerings/crowd/data/TokenRing.java
diff --git a/src/java/com/threerings/crowd/package.html b/src/main/java/com/threerings/crowd/package.html
similarity index 100%
rename from src/java/com/threerings/crowd/package.html
rename to src/main/java/com/threerings/crowd/package.html
diff --git a/src/java/com/threerings/crowd/peer/client/CrowdPeerService.java b/src/main/java/com/threerings/crowd/peer/client/CrowdPeerService.java
similarity index 100%
rename from src/java/com/threerings/crowd/peer/client/CrowdPeerService.java
rename to src/main/java/com/threerings/crowd/peer/client/CrowdPeerService.java
diff --git a/src/java/com/threerings/crowd/peer/data/CrowdClientInfo.java b/src/main/java/com/threerings/crowd/peer/data/CrowdClientInfo.java
similarity index 100%
rename from src/java/com/threerings/crowd/peer/data/CrowdClientInfo.java
rename to src/main/java/com/threerings/crowd/peer/data/CrowdClientInfo.java
diff --git a/src/java/com/threerings/crowd/peer/data/CrowdNodeObject.java b/src/main/java/com/threerings/crowd/peer/data/CrowdNodeObject.java
similarity index 100%
rename from src/java/com/threerings/crowd/peer/data/CrowdNodeObject.java
rename to src/main/java/com/threerings/crowd/peer/data/CrowdNodeObject.java
diff --git a/src/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java b/src/main/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java
similarity index 100%
rename from src/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java
rename to src/main/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java
diff --git a/src/java/com/threerings/crowd/peer/server/CrowdPeerDispatcher.java b/src/main/java/com/threerings/crowd/peer/server/CrowdPeerDispatcher.java
similarity index 100%
rename from src/java/com/threerings/crowd/peer/server/CrowdPeerDispatcher.java
rename to src/main/java/com/threerings/crowd/peer/server/CrowdPeerDispatcher.java
diff --git a/src/java/com/threerings/crowd/peer/server/CrowdPeerManager.java b/src/main/java/com/threerings/crowd/peer/server/CrowdPeerManager.java
similarity index 100%
rename from src/java/com/threerings/crowd/peer/server/CrowdPeerManager.java
rename to src/main/java/com/threerings/crowd/peer/server/CrowdPeerManager.java
diff --git a/src/java/com/threerings/crowd/peer/server/CrowdPeerProvider.java b/src/main/java/com/threerings/crowd/peer/server/CrowdPeerProvider.java
similarity index 100%
rename from src/java/com/threerings/crowd/peer/server/CrowdPeerProvider.java
rename to src/main/java/com/threerings/crowd/peer/server/CrowdPeerProvider.java
diff --git a/src/java/com/threerings/crowd/server/BodyDispatcher.java b/src/main/java/com/threerings/crowd/server/BodyDispatcher.java
similarity index 100%
rename from src/java/com/threerings/crowd/server/BodyDispatcher.java
rename to src/main/java/com/threerings/crowd/server/BodyDispatcher.java
diff --git a/src/java/com/threerings/crowd/server/BodyLocal.java b/src/main/java/com/threerings/crowd/server/BodyLocal.java
similarity index 100%
rename from src/java/com/threerings/crowd/server/BodyLocal.java
rename to src/main/java/com/threerings/crowd/server/BodyLocal.java
diff --git a/src/java/com/threerings/crowd/server/BodyLocator.java b/src/main/java/com/threerings/crowd/server/BodyLocator.java
similarity index 100%
rename from src/java/com/threerings/crowd/server/BodyLocator.java
rename to src/main/java/com/threerings/crowd/server/BodyLocator.java
diff --git a/src/java/com/threerings/crowd/server/BodyManager.java b/src/main/java/com/threerings/crowd/server/BodyManager.java
similarity index 100%
rename from src/java/com/threerings/crowd/server/BodyManager.java
rename to src/main/java/com/threerings/crowd/server/BodyManager.java
diff --git a/src/java/com/threerings/crowd/server/BodyProvider.java b/src/main/java/com/threerings/crowd/server/BodyProvider.java
similarity index 100%
rename from src/java/com/threerings/crowd/server/BodyProvider.java
rename to src/main/java/com/threerings/crowd/server/BodyProvider.java
diff --git a/src/java/com/threerings/crowd/server/CrowdClientResolver.java b/src/main/java/com/threerings/crowd/server/CrowdClientResolver.java
similarity index 100%
rename from src/java/com/threerings/crowd/server/CrowdClientResolver.java
rename to src/main/java/com/threerings/crowd/server/CrowdClientResolver.java
diff --git a/src/java/com/threerings/crowd/server/CrowdObjectAccess.java b/src/main/java/com/threerings/crowd/server/CrowdObjectAccess.java
similarity index 100%
rename from src/java/com/threerings/crowd/server/CrowdObjectAccess.java
rename to src/main/java/com/threerings/crowd/server/CrowdObjectAccess.java
diff --git a/src/java/com/threerings/crowd/server/CrowdServer.java b/src/main/java/com/threerings/crowd/server/CrowdServer.java
similarity index 100%
rename from src/java/com/threerings/crowd/server/CrowdServer.java
rename to src/main/java/com/threerings/crowd/server/CrowdServer.java
diff --git a/src/java/com/threerings/crowd/server/CrowdSession.java b/src/main/java/com/threerings/crowd/server/CrowdSession.java
similarity index 100%
rename from src/java/com/threerings/crowd/server/CrowdSession.java
rename to src/main/java/com/threerings/crowd/server/CrowdSession.java
diff --git a/src/java/com/threerings/crowd/server/LocationDispatcher.java b/src/main/java/com/threerings/crowd/server/LocationDispatcher.java
similarity index 100%
rename from src/java/com/threerings/crowd/server/LocationDispatcher.java
rename to src/main/java/com/threerings/crowd/server/LocationDispatcher.java
diff --git a/src/java/com/threerings/crowd/server/LocationManager.java b/src/main/java/com/threerings/crowd/server/LocationManager.java
similarity index 100%
rename from src/java/com/threerings/crowd/server/LocationManager.java
rename to src/main/java/com/threerings/crowd/server/LocationManager.java
diff --git a/src/java/com/threerings/crowd/server/LocationProvider.java b/src/main/java/com/threerings/crowd/server/LocationProvider.java
similarity index 100%
rename from src/java/com/threerings/crowd/server/LocationProvider.java
rename to src/main/java/com/threerings/crowd/server/LocationProvider.java
diff --git a/src/java/com/threerings/crowd/server/LocationSender.java b/src/main/java/com/threerings/crowd/server/LocationSender.java
similarity index 100%
rename from src/java/com/threerings/crowd/server/LocationSender.java
rename to src/main/java/com/threerings/crowd/server/LocationSender.java
diff --git a/src/java/com/threerings/crowd/server/OccupantOp.java b/src/main/java/com/threerings/crowd/server/OccupantOp.java
similarity index 100%
rename from src/java/com/threerings/crowd/server/OccupantOp.java
rename to src/main/java/com/threerings/crowd/server/OccupantOp.java
diff --git a/src/java/com/threerings/crowd/server/PlaceManager.java b/src/main/java/com/threerings/crowd/server/PlaceManager.java
similarity index 100%
rename from src/java/com/threerings/crowd/server/PlaceManager.java
rename to src/main/java/com/threerings/crowd/server/PlaceManager.java
diff --git a/src/java/com/threerings/crowd/server/PlaceManagerDelegate.java b/src/main/java/com/threerings/crowd/server/PlaceManagerDelegate.java
similarity index 100%
rename from src/java/com/threerings/crowd/server/PlaceManagerDelegate.java
rename to src/main/java/com/threerings/crowd/server/PlaceManagerDelegate.java
diff --git a/src/java/com/threerings/crowd/server/PlaceRegistry.java b/src/main/java/com/threerings/crowd/server/PlaceRegistry.java
similarity index 100%
rename from src/java/com/threerings/crowd/server/PlaceRegistry.java
rename to src/main/java/com/threerings/crowd/server/PlaceRegistry.java
diff --git a/src/java/com/threerings/crowd/util/CrowdContext.java b/src/main/java/com/threerings/crowd/util/CrowdContext.java
similarity index 100%
rename from src/java/com/threerings/crowd/util/CrowdContext.java
rename to src/main/java/com/threerings/crowd/util/CrowdContext.java
diff --git a/src/java/com/threerings/io/ArrayMask.java b/src/main/java/com/threerings/io/ArrayMask.java
similarity index 100%
rename from src/java/com/threerings/io/ArrayMask.java
rename to src/main/java/com/threerings/io/ArrayMask.java
diff --git a/src/java/com/threerings/io/BasicStreamers.java b/src/main/java/com/threerings/io/BasicStreamers.java
similarity index 100%
rename from src/java/com/threerings/io/BasicStreamers.java
rename to src/main/java/com/threerings/io/BasicStreamers.java
diff --git a/src/java/com/threerings/io/ByteBufferInputStream.java b/src/main/java/com/threerings/io/ByteBufferInputStream.java
similarity index 100%
rename from src/java/com/threerings/io/ByteBufferInputStream.java
rename to src/main/java/com/threerings/io/ByteBufferInputStream.java
diff --git a/src/java/com/threerings/io/ByteBufferOutputStream.java b/src/main/java/com/threerings/io/ByteBufferOutputStream.java
similarity index 100%
rename from src/java/com/threerings/io/ByteBufferOutputStream.java
rename to src/main/java/com/threerings/io/ByteBufferOutputStream.java
diff --git a/src/java/com/threerings/io/ClassMapping.java b/src/main/java/com/threerings/io/ClassMapping.java
similarity index 100%
rename from src/java/com/threerings/io/ClassMapping.java
rename to src/main/java/com/threerings/io/ClassMapping.java
diff --git a/src/java/com/threerings/io/FieldMarshaller.java b/src/main/java/com/threerings/io/FieldMarshaller.java
similarity index 100%
rename from src/java/com/threerings/io/FieldMarshaller.java
rename to src/main/java/com/threerings/io/FieldMarshaller.java
diff --git a/src/java/com/threerings/io/FramedInputStream.java b/src/main/java/com/threerings/io/FramedInputStream.java
similarity index 100%
rename from src/java/com/threerings/io/FramedInputStream.java
rename to src/main/java/com/threerings/io/FramedInputStream.java
diff --git a/src/java/com/threerings/io/FramingOutputStream.java b/src/main/java/com/threerings/io/FramingOutputStream.java
similarity index 100%
rename from src/java/com/threerings/io/FramingOutputStream.java
rename to src/main/java/com/threerings/io/FramingOutputStream.java
diff --git a/src/java/com/threerings/io/Intern.java b/src/main/java/com/threerings/io/Intern.java
similarity index 100%
rename from src/java/com/threerings/io/Intern.java
rename to src/main/java/com/threerings/io/Intern.java
diff --git a/src/java/com/threerings/io/NotStreamable.java b/src/main/java/com/threerings/io/NotStreamable.java
similarity index 100%
rename from src/java/com/threerings/io/NotStreamable.java
rename to src/main/java/com/threerings/io/NotStreamable.java
diff --git a/src/java/com/threerings/io/ObjectInputStream.java b/src/main/java/com/threerings/io/ObjectInputStream.java
similarity index 100%
rename from src/java/com/threerings/io/ObjectInputStream.java
rename to src/main/java/com/threerings/io/ObjectInputStream.java
diff --git a/src/java/com/threerings/io/ObjectOutputStream.java b/src/main/java/com/threerings/io/ObjectOutputStream.java
similarity index 100%
rename from src/java/com/threerings/io/ObjectOutputStream.java
rename to src/main/java/com/threerings/io/ObjectOutputStream.java
diff --git a/src/java/com/threerings/io/SimpleStreamableObject.java b/src/main/java/com/threerings/io/SimpleStreamableObject.java
similarity index 100%
rename from src/java/com/threerings/io/SimpleStreamableObject.java
rename to src/main/java/com/threerings/io/SimpleStreamableObject.java
diff --git a/src/java/com/threerings/io/Streamable.java b/src/main/java/com/threerings/io/Streamable.java
similarity index 100%
rename from src/java/com/threerings/io/Streamable.java
rename to src/main/java/com/threerings/io/Streamable.java
diff --git a/src/java/com/threerings/io/Streamer.java b/src/main/java/com/threerings/io/Streamer.java
similarity index 100%
rename from src/java/com/threerings/io/Streamer.java
rename to src/main/java/com/threerings/io/Streamer.java
diff --git a/src/java/com/threerings/io/UnreliableObjectInputStream.java b/src/main/java/com/threerings/io/UnreliableObjectInputStream.java
similarity index 100%
rename from src/java/com/threerings/io/UnreliableObjectInputStream.java
rename to src/main/java/com/threerings/io/UnreliableObjectInputStream.java
diff --git a/src/java/com/threerings/io/UnreliableObjectOutputStream.java b/src/main/java/com/threerings/io/UnreliableObjectOutputStream.java
similarity index 100%
rename from src/java/com/threerings/io/UnreliableObjectOutputStream.java
rename to src/main/java/com/threerings/io/UnreliableObjectOutputStream.java
diff --git a/src/java/com/threerings/nio/SelectorIterable.java b/src/main/java/com/threerings/nio/SelectorIterable.java
similarity index 100%
rename from src/java/com/threerings/nio/SelectorIterable.java
rename to src/main/java/com/threerings/nio/SelectorIterable.java
diff --git a/src/java/com/threerings/presents/Log.java b/src/main/java/com/threerings/presents/Log.java
similarity index 100%
rename from src/java/com/threerings/presents/Log.java
rename to src/main/java/com/threerings/presents/Log.java
diff --git a/src/java/com/threerings/presents/annotation/AnyThread.java b/src/main/java/com/threerings/presents/annotation/AnyThread.java
similarity index 100%
rename from src/java/com/threerings/presents/annotation/AnyThread.java
rename to src/main/java/com/threerings/presents/annotation/AnyThread.java
diff --git a/src/java/com/threerings/presents/annotation/AuthInvoker.java b/src/main/java/com/threerings/presents/annotation/AuthInvoker.java
similarity index 100%
rename from src/java/com/threerings/presents/annotation/AuthInvoker.java
rename to src/main/java/com/threerings/presents/annotation/AuthInvoker.java
diff --git a/src/java/com/threerings/presents/annotation/BlockingThread.java b/src/main/java/com/threerings/presents/annotation/BlockingThread.java
similarity index 100%
rename from src/java/com/threerings/presents/annotation/BlockingThread.java
rename to src/main/java/com/threerings/presents/annotation/BlockingThread.java
diff --git a/src/java/com/threerings/presents/annotation/EventQueue.java b/src/main/java/com/threerings/presents/annotation/EventQueue.java
similarity index 100%
rename from src/java/com/threerings/presents/annotation/EventQueue.java
rename to src/main/java/com/threerings/presents/annotation/EventQueue.java
diff --git a/src/java/com/threerings/presents/annotation/EventThread.java b/src/main/java/com/threerings/presents/annotation/EventThread.java
similarity index 100%
rename from src/java/com/threerings/presents/annotation/EventThread.java
rename to src/main/java/com/threerings/presents/annotation/EventThread.java
diff --git a/src/java/com/threerings/presents/annotation/MainInvoker.java b/src/main/java/com/threerings/presents/annotation/MainInvoker.java
similarity index 100%
rename from src/java/com/threerings/presents/annotation/MainInvoker.java
rename to src/main/java/com/threerings/presents/annotation/MainInvoker.java
diff --git a/src/java/com/threerings/presents/annotation/TransportHint.java b/src/main/java/com/threerings/presents/annotation/TransportHint.java
similarity index 100%
rename from src/java/com/threerings/presents/annotation/TransportHint.java
rename to src/main/java/com/threerings/presents/annotation/TransportHint.java
diff --git a/src/java/com/threerings/presents/client/BasicDirector.java b/src/main/java/com/threerings/presents/client/BasicDirector.java
similarity index 100%
rename from src/java/com/threerings/presents/client/BasicDirector.java
rename to src/main/java/com/threerings/presents/client/BasicDirector.java
diff --git a/src/java/com/threerings/presents/client/BlockingCommunicator.java b/src/main/java/com/threerings/presents/client/BlockingCommunicator.java
similarity index 100%
rename from src/java/com/threerings/presents/client/BlockingCommunicator.java
rename to src/main/java/com/threerings/presents/client/BlockingCommunicator.java
diff --git a/src/java/com/threerings/presents/client/Client.java b/src/main/java/com/threerings/presents/client/Client.java
similarity index 100%
rename from src/java/com/threerings/presents/client/Client.java
rename to src/main/java/com/threerings/presents/client/Client.java
diff --git a/src/java/com/threerings/presents/client/ClientAdapter.java b/src/main/java/com/threerings/presents/client/ClientAdapter.java
similarity index 100%
rename from src/java/com/threerings/presents/client/ClientAdapter.java
rename to src/main/java/com/threerings/presents/client/ClientAdapter.java
diff --git a/src/java/com/threerings/presents/client/ClientCommunicator.java b/src/main/java/com/threerings/presents/client/ClientCommunicator.java
similarity index 100%
rename from src/java/com/threerings/presents/client/ClientCommunicator.java
rename to src/main/java/com/threerings/presents/client/ClientCommunicator.java
diff --git a/src/java/com/threerings/presents/client/ClientDObjectMgr.java b/src/main/java/com/threerings/presents/client/ClientDObjectMgr.java
similarity index 100%
rename from src/java/com/threerings/presents/client/ClientDObjectMgr.java
rename to src/main/java/com/threerings/presents/client/ClientDObjectMgr.java
diff --git a/src/java/com/threerings/presents/client/ClientObserver.java b/src/main/java/com/threerings/presents/client/ClientObserver.java
similarity index 100%
rename from src/java/com/threerings/presents/client/ClientObserver.java
rename to src/main/java/com/threerings/presents/client/ClientObserver.java
diff --git a/src/java/com/threerings/presents/client/Communicator.java b/src/main/java/com/threerings/presents/client/Communicator.java
similarity index 100%
rename from src/java/com/threerings/presents/client/Communicator.java
rename to src/main/java/com/threerings/presents/client/Communicator.java
diff --git a/src/java/com/threerings/presents/client/DeltaCalculator.java b/src/main/java/com/threerings/presents/client/DeltaCalculator.java
similarity index 100%
rename from src/java/com/threerings/presents/client/DeltaCalculator.java
rename to src/main/java/com/threerings/presents/client/DeltaCalculator.java
diff --git a/src/java/com/threerings/presents/client/InvocationDecoder.java b/src/main/java/com/threerings/presents/client/InvocationDecoder.java
similarity index 100%
rename from src/java/com/threerings/presents/client/InvocationDecoder.java
rename to src/main/java/com/threerings/presents/client/InvocationDecoder.java
diff --git a/src/java/com/threerings/presents/client/InvocationDirector.java b/src/main/java/com/threerings/presents/client/InvocationDirector.java
similarity index 100%
rename from src/java/com/threerings/presents/client/InvocationDirector.java
rename to src/main/java/com/threerings/presents/client/InvocationDirector.java
diff --git a/src/java/com/threerings/presents/client/InvocationReceiver.java b/src/main/java/com/threerings/presents/client/InvocationReceiver.java
similarity index 100%
rename from src/java/com/threerings/presents/client/InvocationReceiver.java
rename to src/main/java/com/threerings/presents/client/InvocationReceiver.java
diff --git a/src/java/com/threerings/presents/client/InvocationService.java b/src/main/java/com/threerings/presents/client/InvocationService.java
similarity index 100%
rename from src/java/com/threerings/presents/client/InvocationService.java
rename to src/main/java/com/threerings/presents/client/InvocationService.java
diff --git a/src/java/com/threerings/presents/client/LoggingListener.java b/src/main/java/com/threerings/presents/client/LoggingListener.java
similarity index 100%
rename from src/java/com/threerings/presents/client/LoggingListener.java
rename to src/main/java/com/threerings/presents/client/LoggingListener.java
diff --git a/src/java/com/threerings/presents/client/LogonException.java b/src/main/java/com/threerings/presents/client/LogonException.java
similarity index 100%
rename from src/java/com/threerings/presents/client/LogonException.java
rename to src/main/java/com/threerings/presents/client/LogonException.java
diff --git a/src/java/com/threerings/presents/client/MessageTracker.java b/src/main/java/com/threerings/presents/client/MessageTracker.java
similarity index 100%
rename from src/java/com/threerings/presents/client/MessageTracker.java
rename to src/main/java/com/threerings/presents/client/MessageTracker.java
diff --git a/src/java/com/threerings/presents/client/ObserverOps.java b/src/main/java/com/threerings/presents/client/ObserverOps.java
similarity index 100%
rename from src/java/com/threerings/presents/client/ObserverOps.java
rename to src/main/java/com/threerings/presents/client/ObserverOps.java
diff --git a/src/java/com/threerings/presents/client/PresentsPrefs.java b/src/main/java/com/threerings/presents/client/PresentsPrefs.java
similarity index 100%
rename from src/java/com/threerings/presents/client/PresentsPrefs.java
rename to src/main/java/com/threerings/presents/client/PresentsPrefs.java
diff --git a/src/java/com/threerings/presents/client/SessionObserver.java b/src/main/java/com/threerings/presents/client/SessionObserver.java
similarity index 100%
rename from src/java/com/threerings/presents/client/SessionObserver.java
rename to src/main/java/com/threerings/presents/client/SessionObserver.java
diff --git a/src/java/com/threerings/presents/client/TimeBaseService.java b/src/main/java/com/threerings/presents/client/TimeBaseService.java
similarity index 100%
rename from src/java/com/threerings/presents/client/TimeBaseService.java
rename to src/main/java/com/threerings/presents/client/TimeBaseService.java
diff --git a/src/java/com/threerings/presents/data/AuthCodes.java b/src/main/java/com/threerings/presents/data/AuthCodes.java
similarity index 100%
rename from src/java/com/threerings/presents/data/AuthCodes.java
rename to src/main/java/com/threerings/presents/data/AuthCodes.java
diff --git a/src/java/com/threerings/presents/data/ClientObject.java b/src/main/java/com/threerings/presents/data/ClientObject.java
similarity index 100%
rename from src/java/com/threerings/presents/data/ClientObject.java
rename to src/main/java/com/threerings/presents/data/ClientObject.java
diff --git a/src/java/com/threerings/presents/data/ConMgrStats.java b/src/main/java/com/threerings/presents/data/ConMgrStats.java
similarity index 100%
rename from src/java/com/threerings/presents/data/ConMgrStats.java
rename to src/main/java/com/threerings/presents/data/ConMgrStats.java
diff --git a/src/java/com/threerings/presents/data/InvocationCodes.java b/src/main/java/com/threerings/presents/data/InvocationCodes.java
similarity index 100%
rename from src/java/com/threerings/presents/data/InvocationCodes.java
rename to src/main/java/com/threerings/presents/data/InvocationCodes.java
diff --git a/src/java/com/threerings/presents/data/InvocationMarshaller.java b/src/main/java/com/threerings/presents/data/InvocationMarshaller.java
similarity index 100%
rename from src/java/com/threerings/presents/data/InvocationMarshaller.java
rename to src/main/java/com/threerings/presents/data/InvocationMarshaller.java
diff --git a/src/java/com/threerings/presents/data/InvocationObject.java b/src/main/java/com/threerings/presents/data/InvocationObject.java
similarity index 100%
rename from src/java/com/threerings/presents/data/InvocationObject.java
rename to src/main/java/com/threerings/presents/data/InvocationObject.java
diff --git a/src/java/com/threerings/presents/data/Permission.java b/src/main/java/com/threerings/presents/data/Permission.java
similarity index 100%
rename from src/java/com/threerings/presents/data/Permission.java
rename to src/main/java/com/threerings/presents/data/Permission.java
diff --git a/src/java/com/threerings/presents/data/PermissionPolicy.java b/src/main/java/com/threerings/presents/data/PermissionPolicy.java
similarity index 100%
rename from src/java/com/threerings/presents/data/PermissionPolicy.java
rename to src/main/java/com/threerings/presents/data/PermissionPolicy.java
diff --git a/src/java/com/threerings/presents/data/TimeBaseCodes.java b/src/main/java/com/threerings/presents/data/TimeBaseCodes.java
similarity index 100%
rename from src/java/com/threerings/presents/data/TimeBaseCodes.java
rename to src/main/java/com/threerings/presents/data/TimeBaseCodes.java
diff --git a/src/java/com/threerings/presents/data/TimeBaseMarshaller.java b/src/main/java/com/threerings/presents/data/TimeBaseMarshaller.java
similarity index 100%
rename from src/java/com/threerings/presents/data/TimeBaseMarshaller.java
rename to src/main/java/com/threerings/presents/data/TimeBaseMarshaller.java
diff --git a/src/java/com/threerings/presents/data/TimeBaseObject.java b/src/main/java/com/threerings/presents/data/TimeBaseObject.java
similarity index 100%
rename from src/java/com/threerings/presents/data/TimeBaseObject.java
rename to src/main/java/com/threerings/presents/data/TimeBaseObject.java
diff --git a/src/java/com/threerings/presents/dobj/AccessController.java b/src/main/java/com/threerings/presents/dobj/AccessController.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/AccessController.java
rename to src/main/java/com/threerings/presents/dobj/AccessController.java
diff --git a/src/java/com/threerings/presents/dobj/AttributeChangeListener.java b/src/main/java/com/threerings/presents/dobj/AttributeChangeListener.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/AttributeChangeListener.java
rename to src/main/java/com/threerings/presents/dobj/AttributeChangeListener.java
diff --git a/src/java/com/threerings/presents/dobj/AttributeChangedEvent.java b/src/main/java/com/threerings/presents/dobj/AttributeChangedEvent.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/AttributeChangedEvent.java
rename to src/main/java/com/threerings/presents/dobj/AttributeChangedEvent.java
diff --git a/src/java/com/threerings/presents/dobj/ChangeListener.java b/src/main/java/com/threerings/presents/dobj/ChangeListener.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/ChangeListener.java
rename to src/main/java/com/threerings/presents/dobj/ChangeListener.java
diff --git a/src/java/com/threerings/presents/dobj/CompoundEvent.java b/src/main/java/com/threerings/presents/dobj/CompoundEvent.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/CompoundEvent.java
rename to src/main/java/com/threerings/presents/dobj/CompoundEvent.java
diff --git a/src/java/com/threerings/presents/dobj/DEvent.java b/src/main/java/com/threerings/presents/dobj/DEvent.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/DEvent.java
rename to src/main/java/com/threerings/presents/dobj/DEvent.java
diff --git a/src/java/com/threerings/presents/dobj/DObject.java b/src/main/java/com/threerings/presents/dobj/DObject.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/DObject.java
rename to src/main/java/com/threerings/presents/dobj/DObject.java
diff --git a/src/java/com/threerings/presents/dobj/DObjectManager.java b/src/main/java/com/threerings/presents/dobj/DObjectManager.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/DObjectManager.java
rename to src/main/java/com/threerings/presents/dobj/DObjectManager.java
diff --git a/src/java/com/threerings/presents/dobj/DSet.java b/src/main/java/com/threerings/presents/dobj/DSet.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/DSet.java
rename to src/main/java/com/threerings/presents/dobj/DSet.java
diff --git a/src/java/com/threerings/presents/dobj/DynamicListener.java b/src/main/java/com/threerings/presents/dobj/DynamicListener.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/DynamicListener.java
rename to src/main/java/com/threerings/presents/dobj/DynamicListener.java
diff --git a/src/java/com/threerings/presents/dobj/ElementUpdateListener.java b/src/main/java/com/threerings/presents/dobj/ElementUpdateListener.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/ElementUpdateListener.java
rename to src/main/java/com/threerings/presents/dobj/ElementUpdateListener.java
diff --git a/src/java/com/threerings/presents/dobj/ElementUpdatedEvent.java b/src/main/java/com/threerings/presents/dobj/ElementUpdatedEvent.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/ElementUpdatedEvent.java
rename to src/main/java/com/threerings/presents/dobj/ElementUpdatedEvent.java
diff --git a/src/java/com/threerings/presents/dobj/EntryAddedEvent.java b/src/main/java/com/threerings/presents/dobj/EntryAddedEvent.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/EntryAddedEvent.java
rename to src/main/java/com/threerings/presents/dobj/EntryAddedEvent.java
diff --git a/src/java/com/threerings/presents/dobj/EntryRemovedEvent.java b/src/main/java/com/threerings/presents/dobj/EntryRemovedEvent.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/EntryRemovedEvent.java
rename to src/main/java/com/threerings/presents/dobj/EntryRemovedEvent.java
diff --git a/src/java/com/threerings/presents/dobj/EntryUpdatedEvent.java b/src/main/java/com/threerings/presents/dobj/EntryUpdatedEvent.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/EntryUpdatedEvent.java
rename to src/main/java/com/threerings/presents/dobj/EntryUpdatedEvent.java
diff --git a/src/java/com/threerings/presents/dobj/EventListener.java b/src/main/java/com/threerings/presents/dobj/EventListener.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/EventListener.java
rename to src/main/java/com/threerings/presents/dobj/EventListener.java
diff --git a/src/java/com/threerings/presents/dobj/InvocationNotificationEvent.java b/src/main/java/com/threerings/presents/dobj/InvocationNotificationEvent.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/InvocationNotificationEvent.java
rename to src/main/java/com/threerings/presents/dobj/InvocationNotificationEvent.java
diff --git a/src/java/com/threerings/presents/dobj/InvocationRequestEvent.java b/src/main/java/com/threerings/presents/dobj/InvocationRequestEvent.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/InvocationRequestEvent.java
rename to src/main/java/com/threerings/presents/dobj/InvocationRequestEvent.java
diff --git a/src/java/com/threerings/presents/dobj/InvocationResponseEvent.java b/src/main/java/com/threerings/presents/dobj/InvocationResponseEvent.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/InvocationResponseEvent.java
rename to src/main/java/com/threerings/presents/dobj/InvocationResponseEvent.java
diff --git a/src/java/com/threerings/presents/dobj/MessageEvent.java b/src/main/java/com/threerings/presents/dobj/MessageEvent.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/MessageEvent.java
rename to src/main/java/com/threerings/presents/dobj/MessageEvent.java
diff --git a/src/java/com/threerings/presents/dobj/MessageListener.java b/src/main/java/com/threerings/presents/dobj/MessageListener.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/MessageListener.java
rename to src/main/java/com/threerings/presents/dobj/MessageListener.java
diff --git a/src/java/com/threerings/presents/dobj/NamedAttributeListener.java b/src/main/java/com/threerings/presents/dobj/NamedAttributeListener.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/NamedAttributeListener.java
rename to src/main/java/com/threerings/presents/dobj/NamedAttributeListener.java
diff --git a/src/java/com/threerings/presents/dobj/NamedElementUpdateListener.java b/src/main/java/com/threerings/presents/dobj/NamedElementUpdateListener.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/NamedElementUpdateListener.java
rename to src/main/java/com/threerings/presents/dobj/NamedElementUpdateListener.java
diff --git a/src/java/com/threerings/presents/dobj/NamedEvent.java b/src/main/java/com/threerings/presents/dobj/NamedEvent.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/NamedEvent.java
rename to src/main/java/com/threerings/presents/dobj/NamedEvent.java
diff --git a/src/java/com/threerings/presents/dobj/NamedSetAdapter.java b/src/main/java/com/threerings/presents/dobj/NamedSetAdapter.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/NamedSetAdapter.java
rename to src/main/java/com/threerings/presents/dobj/NamedSetAdapter.java
diff --git a/src/java/com/threerings/presents/dobj/NoSuchObjectException.java b/src/main/java/com/threerings/presents/dobj/NoSuchObjectException.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/NoSuchObjectException.java
rename to src/main/java/com/threerings/presents/dobj/NoSuchObjectException.java
diff --git a/src/java/com/threerings/presents/dobj/ObjectAccessException.java b/src/main/java/com/threerings/presents/dobj/ObjectAccessException.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/ObjectAccessException.java
rename to src/main/java/com/threerings/presents/dobj/ObjectAccessException.java
diff --git a/src/java/com/threerings/presents/dobj/ObjectAddedEvent.java b/src/main/java/com/threerings/presents/dobj/ObjectAddedEvent.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/ObjectAddedEvent.java
rename to src/main/java/com/threerings/presents/dobj/ObjectAddedEvent.java
diff --git a/src/java/com/threerings/presents/dobj/ObjectDeathListener.java b/src/main/java/com/threerings/presents/dobj/ObjectDeathListener.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/ObjectDeathListener.java
rename to src/main/java/com/threerings/presents/dobj/ObjectDeathListener.java
diff --git a/src/java/com/threerings/presents/dobj/ObjectDestroyedEvent.java b/src/main/java/com/threerings/presents/dobj/ObjectDestroyedEvent.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/ObjectDestroyedEvent.java
rename to src/main/java/com/threerings/presents/dobj/ObjectDestroyedEvent.java
diff --git a/src/java/com/threerings/presents/dobj/ObjectRemovedEvent.java b/src/main/java/com/threerings/presents/dobj/ObjectRemovedEvent.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/ObjectRemovedEvent.java
rename to src/main/java/com/threerings/presents/dobj/ObjectRemovedEvent.java
diff --git a/src/java/com/threerings/presents/dobj/OidList.java b/src/main/java/com/threerings/presents/dobj/OidList.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/OidList.java
rename to src/main/java/com/threerings/presents/dobj/OidList.java
diff --git a/src/java/com/threerings/presents/dobj/OidListListener.java b/src/main/java/com/threerings/presents/dobj/OidListListener.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/OidListListener.java
rename to src/main/java/com/threerings/presents/dobj/OidListListener.java
diff --git a/src/java/com/threerings/presents/dobj/ProxySubscriber.java b/src/main/java/com/threerings/presents/dobj/ProxySubscriber.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/ProxySubscriber.java
rename to src/main/java/com/threerings/presents/dobj/ProxySubscriber.java
diff --git a/src/java/com/threerings/presents/dobj/ReleaseLockEvent.java b/src/main/java/com/threerings/presents/dobj/ReleaseLockEvent.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/ReleaseLockEvent.java
rename to src/main/java/com/threerings/presents/dobj/ReleaseLockEvent.java
diff --git a/src/java/com/threerings/presents/dobj/RootDObjectManager.java b/src/main/java/com/threerings/presents/dobj/RootDObjectManager.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/RootDObjectManager.java
rename to src/main/java/com/threerings/presents/dobj/RootDObjectManager.java
diff --git a/src/java/com/threerings/presents/dobj/ServerMessageEvent.java b/src/main/java/com/threerings/presents/dobj/ServerMessageEvent.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/ServerMessageEvent.java
rename to src/main/java/com/threerings/presents/dobj/ServerMessageEvent.java
diff --git a/src/java/com/threerings/presents/dobj/SetAdapter.java b/src/main/java/com/threerings/presents/dobj/SetAdapter.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/SetAdapter.java
rename to src/main/java/com/threerings/presents/dobj/SetAdapter.java
diff --git a/src/java/com/threerings/presents/dobj/SetListener.java b/src/main/java/com/threerings/presents/dobj/SetListener.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/SetListener.java
rename to src/main/java/com/threerings/presents/dobj/SetListener.java
diff --git a/src/java/com/threerings/presents/dobj/SimpleEntry.java b/src/main/java/com/threerings/presents/dobj/SimpleEntry.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/SimpleEntry.java
rename to src/main/java/com/threerings/presents/dobj/SimpleEntry.java
diff --git a/src/java/com/threerings/presents/dobj/Subscriber.java b/src/main/java/com/threerings/presents/dobj/Subscriber.java
similarity index 100%
rename from src/java/com/threerings/presents/dobj/Subscriber.java
rename to src/main/java/com/threerings/presents/dobj/Subscriber.java
diff --git a/src/java/com/threerings/presents/net/AuthRequest.java b/src/main/java/com/threerings/presents/net/AuthRequest.java
similarity index 100%
rename from src/java/com/threerings/presents/net/AuthRequest.java
rename to src/main/java/com/threerings/presents/net/AuthRequest.java
diff --git a/src/java/com/threerings/presents/net/AuthResponse.java b/src/main/java/com/threerings/presents/net/AuthResponse.java
similarity index 100%
rename from src/java/com/threerings/presents/net/AuthResponse.java
rename to src/main/java/com/threerings/presents/net/AuthResponse.java
diff --git a/src/java/com/threerings/presents/net/AuthResponseData.java b/src/main/java/com/threerings/presents/net/AuthResponseData.java
similarity index 100%
rename from src/java/com/threerings/presents/net/AuthResponseData.java
rename to src/main/java/com/threerings/presents/net/AuthResponseData.java
diff --git a/src/java/com/threerings/presents/net/BootstrapData.java b/src/main/java/com/threerings/presents/net/BootstrapData.java
similarity index 100%
rename from src/java/com/threerings/presents/net/BootstrapData.java
rename to src/main/java/com/threerings/presents/net/BootstrapData.java
diff --git a/src/java/com/threerings/presents/net/BootstrapNotification.java b/src/main/java/com/threerings/presents/net/BootstrapNotification.java
similarity index 100%
rename from src/java/com/threerings/presents/net/BootstrapNotification.java
rename to src/main/java/com/threerings/presents/net/BootstrapNotification.java
diff --git a/src/java/com/threerings/presents/net/Credentials.java b/src/main/java/com/threerings/presents/net/Credentials.java
similarity index 100%
rename from src/java/com/threerings/presents/net/Credentials.java
rename to src/main/java/com/threerings/presents/net/Credentials.java
diff --git a/src/java/com/threerings/presents/net/DownstreamMessage.java b/src/main/java/com/threerings/presents/net/DownstreamMessage.java
similarity index 100%
rename from src/java/com/threerings/presents/net/DownstreamMessage.java
rename to src/main/java/com/threerings/presents/net/DownstreamMessage.java
diff --git a/src/java/com/threerings/presents/net/EventNotification.java b/src/main/java/com/threerings/presents/net/EventNotification.java
similarity index 100%
rename from src/java/com/threerings/presents/net/EventNotification.java
rename to src/main/java/com/threerings/presents/net/EventNotification.java
diff --git a/src/java/com/threerings/presents/net/FailureResponse.java b/src/main/java/com/threerings/presents/net/FailureResponse.java
similarity index 100%
rename from src/java/com/threerings/presents/net/FailureResponse.java
rename to src/main/java/com/threerings/presents/net/FailureResponse.java
diff --git a/src/java/com/threerings/presents/net/ForwardEventRequest.java b/src/main/java/com/threerings/presents/net/ForwardEventRequest.java
similarity index 100%
rename from src/java/com/threerings/presents/net/ForwardEventRequest.java
rename to src/main/java/com/threerings/presents/net/ForwardEventRequest.java
diff --git a/src/java/com/threerings/presents/net/LogoffRequest.java b/src/main/java/com/threerings/presents/net/LogoffRequest.java
similarity index 100%
rename from src/java/com/threerings/presents/net/LogoffRequest.java
rename to src/main/java/com/threerings/presents/net/LogoffRequest.java
diff --git a/src/java/com/threerings/presents/net/Message.java b/src/main/java/com/threerings/presents/net/Message.java
similarity index 100%
rename from src/java/com/threerings/presents/net/Message.java
rename to src/main/java/com/threerings/presents/net/Message.java
diff --git a/src/java/com/threerings/presents/net/ObjectResponse.java b/src/main/java/com/threerings/presents/net/ObjectResponse.java
similarity index 100%
rename from src/java/com/threerings/presents/net/ObjectResponse.java
rename to src/main/java/com/threerings/presents/net/ObjectResponse.java
diff --git a/src/java/com/threerings/presents/net/PingRequest.java b/src/main/java/com/threerings/presents/net/PingRequest.java
similarity index 100%
rename from src/java/com/threerings/presents/net/PingRequest.java
rename to src/main/java/com/threerings/presents/net/PingRequest.java
diff --git a/src/java/com/threerings/presents/net/PongResponse.java b/src/main/java/com/threerings/presents/net/PongResponse.java
similarity index 100%
rename from src/java/com/threerings/presents/net/PongResponse.java
rename to src/main/java/com/threerings/presents/net/PongResponse.java
diff --git a/src/java/com/threerings/presents/net/ServiceCreds.java b/src/main/java/com/threerings/presents/net/ServiceCreds.java
similarity index 100%
rename from src/java/com/threerings/presents/net/ServiceCreds.java
rename to src/main/java/com/threerings/presents/net/ServiceCreds.java
diff --git a/src/java/com/threerings/presents/net/SubscribeRequest.java b/src/main/java/com/threerings/presents/net/SubscribeRequest.java
similarity index 100%
rename from src/java/com/threerings/presents/net/SubscribeRequest.java
rename to src/main/java/com/threerings/presents/net/SubscribeRequest.java
diff --git a/src/java/com/threerings/presents/net/ThrottleUpdatedMessage.java b/src/main/java/com/threerings/presents/net/ThrottleUpdatedMessage.java
similarity index 100%
rename from src/java/com/threerings/presents/net/ThrottleUpdatedMessage.java
rename to src/main/java/com/threerings/presents/net/ThrottleUpdatedMessage.java
diff --git a/src/java/com/threerings/presents/net/TransmitDatagramsRequest.java b/src/main/java/com/threerings/presents/net/TransmitDatagramsRequest.java
similarity index 100%
rename from src/java/com/threerings/presents/net/TransmitDatagramsRequest.java
rename to src/main/java/com/threerings/presents/net/TransmitDatagramsRequest.java
diff --git a/src/java/com/threerings/presents/net/Transport.java b/src/main/java/com/threerings/presents/net/Transport.java
similarity index 100%
rename from src/java/com/threerings/presents/net/Transport.java
rename to src/main/java/com/threerings/presents/net/Transport.java
diff --git a/src/java/com/threerings/presents/net/UnsubscribeRequest.java b/src/main/java/com/threerings/presents/net/UnsubscribeRequest.java
similarity index 100%
rename from src/java/com/threerings/presents/net/UnsubscribeRequest.java
rename to src/main/java/com/threerings/presents/net/UnsubscribeRequest.java
diff --git a/src/java/com/threerings/presents/net/UnsubscribeResponse.java b/src/main/java/com/threerings/presents/net/UnsubscribeResponse.java
similarity index 100%
rename from src/java/com/threerings/presents/net/UnsubscribeResponse.java
rename to src/main/java/com/threerings/presents/net/UnsubscribeResponse.java
diff --git a/src/java/com/threerings/presents/net/UpdateThrottleMessage.java b/src/main/java/com/threerings/presents/net/UpdateThrottleMessage.java
similarity index 100%
rename from src/java/com/threerings/presents/net/UpdateThrottleMessage.java
rename to src/main/java/com/threerings/presents/net/UpdateThrottleMessage.java
diff --git a/src/java/com/threerings/presents/net/UpstreamMessage.java b/src/main/java/com/threerings/presents/net/UpstreamMessage.java
similarity index 100%
rename from src/java/com/threerings/presents/net/UpstreamMessage.java
rename to src/main/java/com/threerings/presents/net/UpstreamMessage.java
diff --git a/src/java/com/threerings/presents/net/UsernamePasswordCreds.java b/src/main/java/com/threerings/presents/net/UsernamePasswordCreds.java
similarity index 100%
rename from src/java/com/threerings/presents/net/UsernamePasswordCreds.java
rename to src/main/java/com/threerings/presents/net/UsernamePasswordCreds.java
diff --git a/src/java/com/threerings/presents/package.html b/src/main/java/com/threerings/presents/package.html
similarity index 100%
rename from src/java/com/threerings/presents/package.html
rename to src/main/java/com/threerings/presents/package.html
diff --git a/src/java/com/threerings/presents/peer/client/PeerService.java b/src/main/java/com/threerings/presents/peer/client/PeerService.java
similarity index 100%
rename from src/java/com/threerings/presents/peer/client/PeerService.java
rename to src/main/java/com/threerings/presents/peer/client/PeerService.java
diff --git a/src/java/com/threerings/presents/peer/data/ClientInfo.java b/src/main/java/com/threerings/presents/peer/data/ClientInfo.java
similarity index 100%
rename from src/java/com/threerings/presents/peer/data/ClientInfo.java
rename to src/main/java/com/threerings/presents/peer/data/ClientInfo.java
diff --git a/src/java/com/threerings/presents/peer/data/NodeObject.java b/src/main/java/com/threerings/presents/peer/data/NodeObject.java
similarity index 100%
rename from src/java/com/threerings/presents/peer/data/NodeObject.java
rename to src/main/java/com/threerings/presents/peer/data/NodeObject.java
diff --git a/src/java/com/threerings/presents/peer/data/PeerAuthName.java b/src/main/java/com/threerings/presents/peer/data/PeerAuthName.java
similarity index 100%
rename from src/java/com/threerings/presents/peer/data/PeerAuthName.java
rename to src/main/java/com/threerings/presents/peer/data/PeerAuthName.java
diff --git a/src/java/com/threerings/presents/peer/data/PeerMarshaller.java b/src/main/java/com/threerings/presents/peer/data/PeerMarshaller.java
similarity index 100%
rename from src/java/com/threerings/presents/peer/data/PeerMarshaller.java
rename to src/main/java/com/threerings/presents/peer/data/PeerMarshaller.java
diff --git a/src/java/com/threerings/presents/peer/net/PeerBootstrapData.java b/src/main/java/com/threerings/presents/peer/net/PeerBootstrapData.java
similarity index 100%
rename from src/java/com/threerings/presents/peer/net/PeerBootstrapData.java
rename to src/main/java/com/threerings/presents/peer/net/PeerBootstrapData.java
diff --git a/src/java/com/threerings/presents/peer/net/PeerCreds.java b/src/main/java/com/threerings/presents/peer/net/PeerCreds.java
similarity index 100%
rename from src/java/com/threerings/presents/peer/net/PeerCreds.java
rename to src/main/java/com/threerings/presents/peer/net/PeerCreds.java
diff --git a/src/java/com/threerings/presents/peer/server/EHCachePeerCoordinator.java b/src/main/java/com/threerings/presents/peer/server/EHCachePeerCoordinator.java
similarity index 100%
rename from src/java/com/threerings/presents/peer/server/EHCachePeerCoordinator.java
rename to src/main/java/com/threerings/presents/peer/server/EHCachePeerCoordinator.java
diff --git a/src/java/com/threerings/presents/peer/server/NodeRequestsListener.java b/src/main/java/com/threerings/presents/peer/server/NodeRequestsListener.java
similarity index 100%
rename from src/java/com/threerings/presents/peer/server/NodeRequestsListener.java
rename to src/main/java/com/threerings/presents/peer/server/NodeRequestsListener.java
diff --git a/src/java/com/threerings/presents/peer/server/PeerClientResolver.java b/src/main/java/com/threerings/presents/peer/server/PeerClientResolver.java
similarity index 100%
rename from src/java/com/threerings/presents/peer/server/PeerClientResolver.java
rename to src/main/java/com/threerings/presents/peer/server/PeerClientResolver.java
diff --git a/src/java/com/threerings/presents/peer/server/PeerDispatcher.java b/src/main/java/com/threerings/presents/peer/server/PeerDispatcher.java
similarity index 100%
rename from src/java/com/threerings/presents/peer/server/PeerDispatcher.java
rename to src/main/java/com/threerings/presents/peer/server/PeerDispatcher.java
diff --git a/src/java/com/threerings/presents/peer/server/PeerManager.java b/src/main/java/com/threerings/presents/peer/server/PeerManager.java
similarity index 100%
rename from src/java/com/threerings/presents/peer/server/PeerManager.java
rename to src/main/java/com/threerings/presents/peer/server/PeerManager.java
diff --git a/src/java/com/threerings/presents/peer/server/PeerNode.java b/src/main/java/com/threerings/presents/peer/server/PeerNode.java
similarity index 100%
rename from src/java/com/threerings/presents/peer/server/PeerNode.java
rename to src/main/java/com/threerings/presents/peer/server/PeerNode.java
diff --git a/src/java/com/threerings/presents/peer/server/PeerProvider.java b/src/main/java/com/threerings/presents/peer/server/PeerProvider.java
similarity index 100%
rename from src/java/com/threerings/presents/peer/server/PeerProvider.java
rename to src/main/java/com/threerings/presents/peer/server/PeerProvider.java
diff --git a/src/java/com/threerings/presents/peer/server/PeerSession.java b/src/main/java/com/threerings/presents/peer/server/PeerSession.java
similarity index 100%
rename from src/java/com/threerings/presents/peer/server/PeerSession.java
rename to src/main/java/com/threerings/presents/peer/server/PeerSession.java
diff --git a/src/java/com/threerings/presents/peer/server/persist/NodeRecord.java b/src/main/java/com/threerings/presents/peer/server/persist/NodeRecord.java
similarity index 100%
rename from src/java/com/threerings/presents/peer/server/persist/NodeRecord.java
rename to src/main/java/com/threerings/presents/peer/server/persist/NodeRecord.java
diff --git a/src/java/com/threerings/presents/peer/server/persist/NodeRepository.java b/src/main/java/com/threerings/presents/peer/server/persist/NodeRepository.java
similarity index 100%
rename from src/java/com/threerings/presents/peer/server/persist/NodeRepository.java
rename to src/main/java/com/threerings/presents/peer/server/persist/NodeRepository.java
diff --git a/src/java/com/threerings/presents/peer/util/PeerUtil.java b/src/main/java/com/threerings/presents/peer/util/PeerUtil.java
similarity index 100%
rename from src/java/com/threerings/presents/peer/util/PeerUtil.java
rename to src/main/java/com/threerings/presents/peer/util/PeerUtil.java
diff --git a/src/java/com/threerings/presents/server/AbstractSignalHandler.java b/src/main/java/com/threerings/presents/server/AbstractSignalHandler.java
similarity index 100%
rename from src/java/com/threerings/presents/server/AbstractSignalHandler.java
rename to src/main/java/com/threerings/presents/server/AbstractSignalHandler.java
diff --git a/src/java/com/threerings/presents/server/Authenticator.java b/src/main/java/com/threerings/presents/server/Authenticator.java
similarity index 100%
rename from src/java/com/threerings/presents/server/Authenticator.java
rename to src/main/java/com/threerings/presents/server/Authenticator.java
diff --git a/src/java/com/threerings/presents/server/ChainedAuthenticator.java b/src/main/java/com/threerings/presents/server/ChainedAuthenticator.java
similarity index 100%
rename from src/java/com/threerings/presents/server/ChainedAuthenticator.java
rename to src/main/java/com/threerings/presents/server/ChainedAuthenticator.java
diff --git a/src/java/com/threerings/presents/server/ClientLocal.java b/src/main/java/com/threerings/presents/server/ClientLocal.java
similarity index 100%
rename from src/java/com/threerings/presents/server/ClientLocal.java
rename to src/main/java/com/threerings/presents/server/ClientLocal.java
diff --git a/src/java/com/threerings/presents/server/ClientManager.java b/src/main/java/com/threerings/presents/server/ClientManager.java
similarity index 100%
rename from src/java/com/threerings/presents/server/ClientManager.java
rename to src/main/java/com/threerings/presents/server/ClientManager.java
diff --git a/src/java/com/threerings/presents/server/ClientResolutionListener.java b/src/main/java/com/threerings/presents/server/ClientResolutionListener.java
similarity index 100%
rename from src/java/com/threerings/presents/server/ClientResolutionListener.java
rename to src/main/java/com/threerings/presents/server/ClientResolutionListener.java
diff --git a/src/java/com/threerings/presents/server/ClientResolver.java b/src/main/java/com/threerings/presents/server/ClientResolver.java
similarity index 100%
rename from src/java/com/threerings/presents/server/ClientResolver.java
rename to src/main/java/com/threerings/presents/server/ClientResolver.java
diff --git a/src/java/com/threerings/presents/server/DummyAuthenticator.java b/src/main/java/com/threerings/presents/server/DummyAuthenticator.java
similarity index 100%
rename from src/java/com/threerings/presents/server/DummyAuthenticator.java
rename to src/main/java/com/threerings/presents/server/DummyAuthenticator.java
diff --git a/src/java/com/threerings/presents/server/InvocationDispatcher.java b/src/main/java/com/threerings/presents/server/InvocationDispatcher.java
similarity index 100%
rename from src/java/com/threerings/presents/server/InvocationDispatcher.java
rename to src/main/java/com/threerings/presents/server/InvocationDispatcher.java
diff --git a/src/java/com/threerings/presents/server/InvocationException.java b/src/main/java/com/threerings/presents/server/InvocationException.java
similarity index 100%
rename from src/java/com/threerings/presents/server/InvocationException.java
rename to src/main/java/com/threerings/presents/server/InvocationException.java
diff --git a/src/java/com/threerings/presents/server/InvocationManager.java b/src/main/java/com/threerings/presents/server/InvocationManager.java
similarity index 100%
rename from src/java/com/threerings/presents/server/InvocationManager.java
rename to src/main/java/com/threerings/presents/server/InvocationManager.java
diff --git a/src/java/com/threerings/presents/server/InvocationProvider.java b/src/main/java/com/threerings/presents/server/InvocationProvider.java
similarity index 100%
rename from src/java/com/threerings/presents/server/InvocationProvider.java
rename to src/main/java/com/threerings/presents/server/InvocationProvider.java
diff --git a/src/java/com/threerings/presents/server/InvocationSender.java b/src/main/java/com/threerings/presents/server/InvocationSender.java
similarity index 100%
rename from src/java/com/threerings/presents/server/InvocationSender.java
rename to src/main/java/com/threerings/presents/server/InvocationSender.java
diff --git a/src/java/com/threerings/presents/server/LocalDObjectMgr.java b/src/main/java/com/threerings/presents/server/LocalDObjectMgr.java
similarity index 100%
rename from src/java/com/threerings/presents/server/LocalDObjectMgr.java
rename to src/main/java/com/threerings/presents/server/LocalDObjectMgr.java
diff --git a/src/java/com/threerings/presents/server/NativeSignalHandler.java b/src/main/java/com/threerings/presents/server/NativeSignalHandler.java
similarity index 100%
rename from src/java/com/threerings/presents/server/NativeSignalHandler.java
rename to src/main/java/com/threerings/presents/server/NativeSignalHandler.java
diff --git a/src/java/com/threerings/presents/server/PresentsAuthInvoker.java b/src/main/java/com/threerings/presents/server/PresentsAuthInvoker.java
similarity index 100%
rename from src/java/com/threerings/presents/server/PresentsAuthInvoker.java
rename to src/main/java/com/threerings/presents/server/PresentsAuthInvoker.java
diff --git a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java b/src/main/java/com/threerings/presents/server/PresentsDObjectMgr.java
similarity index 100%
rename from src/java/com/threerings/presents/server/PresentsDObjectMgr.java
rename to src/main/java/com/threerings/presents/server/PresentsDObjectMgr.java
diff --git a/src/java/com/threerings/presents/server/PresentsInvoker.java b/src/main/java/com/threerings/presents/server/PresentsInvoker.java
similarity index 100%
rename from src/java/com/threerings/presents/server/PresentsInvoker.java
rename to src/main/java/com/threerings/presents/server/PresentsInvoker.java
diff --git a/src/java/com/threerings/presents/server/PresentsObjectAccess.java b/src/main/java/com/threerings/presents/server/PresentsObjectAccess.java
similarity index 100%
rename from src/java/com/threerings/presents/server/PresentsObjectAccess.java
rename to src/main/java/com/threerings/presents/server/PresentsObjectAccess.java
diff --git a/src/java/com/threerings/presents/server/PresentsServer.java b/src/main/java/com/threerings/presents/server/PresentsServer.java
similarity index 100%
rename from src/java/com/threerings/presents/server/PresentsServer.java
rename to src/main/java/com/threerings/presents/server/PresentsServer.java
diff --git a/src/java/com/threerings/presents/server/PresentsSession.java b/src/main/java/com/threerings/presents/server/PresentsSession.java
similarity index 100%
rename from src/java/com/threerings/presents/server/PresentsSession.java
rename to src/main/java/com/threerings/presents/server/PresentsSession.java
diff --git a/src/java/com/threerings/presents/server/RebootManager.java b/src/main/java/com/threerings/presents/server/RebootManager.java
similarity index 100%
rename from src/java/com/threerings/presents/server/RebootManager.java
rename to src/main/java/com/threerings/presents/server/RebootManager.java
diff --git a/src/java/com/threerings/presents/server/Rejector.java b/src/main/java/com/threerings/presents/server/Rejector.java
similarity index 100%
rename from src/java/com/threerings/presents/server/Rejector.java
rename to src/main/java/com/threerings/presents/server/Rejector.java
diff --git a/src/java/com/threerings/presents/server/ReportManager.java b/src/main/java/com/threerings/presents/server/ReportManager.java
similarity index 100%
rename from src/java/com/threerings/presents/server/ReportManager.java
rename to src/main/java/com/threerings/presents/server/ReportManager.java
diff --git a/src/java/com/threerings/presents/server/ReportingInvoker.java b/src/main/java/com/threerings/presents/server/ReportingInvoker.java
similarity index 100%
rename from src/java/com/threerings/presents/server/ReportingInvoker.java
rename to src/main/java/com/threerings/presents/server/ReportingInvoker.java
diff --git a/src/java/com/threerings/presents/server/ServiceAuthenticator.java b/src/main/java/com/threerings/presents/server/ServiceAuthenticator.java
similarity index 100%
rename from src/java/com/threerings/presents/server/ServiceAuthenticator.java
rename to src/main/java/com/threerings/presents/server/ServiceAuthenticator.java
diff --git a/src/java/com/threerings/presents/server/SessionFactory.java b/src/main/java/com/threerings/presents/server/SessionFactory.java
similarity index 100%
rename from src/java/com/threerings/presents/server/SessionFactory.java
rename to src/main/java/com/threerings/presents/server/SessionFactory.java
diff --git a/src/java/com/threerings/presents/server/ShutdownManager.java b/src/main/java/com/threerings/presents/server/ShutdownManager.java
similarity index 100%
rename from src/java/com/threerings/presents/server/ShutdownManager.java
rename to src/main/java/com/threerings/presents/server/ShutdownManager.java
diff --git a/src/java/com/threerings/presents/server/SignalReceiver.java b/src/main/java/com/threerings/presents/server/SignalReceiver.java
similarity index 100%
rename from src/java/com/threerings/presents/server/SignalReceiver.java
rename to src/main/java/com/threerings/presents/server/SignalReceiver.java
diff --git a/src/java/com/threerings/presents/server/SunSignalHandler.java b/src/main/java/com/threerings/presents/server/SunSignalHandler.java
similarity index 100%
rename from src/java/com/threerings/presents/server/SunSignalHandler.java
rename to src/main/java/com/threerings/presents/server/SunSignalHandler.java
diff --git a/src/java/com/threerings/presents/server/TimeBaseDispatcher.java b/src/main/java/com/threerings/presents/server/TimeBaseDispatcher.java
similarity index 100%
rename from src/java/com/threerings/presents/server/TimeBaseDispatcher.java
rename to src/main/java/com/threerings/presents/server/TimeBaseDispatcher.java
diff --git a/src/java/com/threerings/presents/server/TimeBaseProvider.java b/src/main/java/com/threerings/presents/server/TimeBaseProvider.java
similarity index 100%
rename from src/java/com/threerings/presents/server/TimeBaseProvider.java
rename to src/main/java/com/threerings/presents/server/TimeBaseProvider.java
diff --git a/src/java/com/threerings/presents/server/net/AuthingConnection.java b/src/main/java/com/threerings/presents/server/net/AuthingConnection.java
similarity index 100%
rename from src/java/com/threerings/presents/server/net/AuthingConnection.java
rename to src/main/java/com/threerings/presents/server/net/AuthingConnection.java
diff --git a/src/java/com/threerings/presents/server/net/BindingConnectionManager.java b/src/main/java/com/threerings/presents/server/net/BindingConnectionManager.java
similarity index 100%
rename from src/java/com/threerings/presents/server/net/BindingConnectionManager.java
rename to src/main/java/com/threerings/presents/server/net/BindingConnectionManager.java
diff --git a/src/java/com/threerings/presents/server/net/Connection.java b/src/main/java/com/threerings/presents/server/net/Connection.java
similarity index 100%
rename from src/java/com/threerings/presents/server/net/Connection.java
rename to src/main/java/com/threerings/presents/server/net/Connection.java
diff --git a/src/java/com/threerings/presents/server/net/ConnectionManager.java b/src/main/java/com/threerings/presents/server/net/ConnectionManager.java
similarity index 100%
rename from src/java/com/threerings/presents/server/net/ConnectionManager.java
rename to src/main/java/com/threerings/presents/server/net/ConnectionManager.java
diff --git a/src/java/com/threerings/presents/server/net/NetEventHandler.java b/src/main/java/com/threerings/presents/server/net/NetEventHandler.java
similarity index 100%
rename from src/java/com/threerings/presents/server/net/NetEventHandler.java
rename to src/main/java/com/threerings/presents/server/net/NetEventHandler.java
diff --git a/src/java/com/threerings/presents/server/net/ServerCommunicator.java b/src/main/java/com/threerings/presents/server/net/ServerCommunicator.java
similarity index 100%
rename from src/java/com/threerings/presents/server/net/ServerCommunicator.java
rename to src/main/java/com/threerings/presents/server/net/ServerCommunicator.java
diff --git a/src/java/com/threerings/presents/tools.properties b/src/main/java/com/threerings/presents/tools.properties
similarity index 100%
rename from src/java/com/threerings/presents/tools.properties
rename to src/main/java/com/threerings/presents/tools.properties
diff --git a/src/java/com/threerings/presents/tools/ActionScriptSource.java b/src/main/java/com/threerings/presents/tools/ActionScriptSource.java
similarity index 100%
rename from src/java/com/threerings/presents/tools/ActionScriptSource.java
rename to src/main/java/com/threerings/presents/tools/ActionScriptSource.java
diff --git a/src/java/com/threerings/presents/tools/GenActionScriptBundlesTask.java b/src/main/java/com/threerings/presents/tools/GenActionScriptBundlesTask.java
similarity index 100%
rename from src/java/com/threerings/presents/tools/GenActionScriptBundlesTask.java
rename to src/main/java/com/threerings/presents/tools/GenActionScriptBundlesTask.java
diff --git a/src/java/com/threerings/presents/tools/GenActionScriptStreamableTask.java b/src/main/java/com/threerings/presents/tools/GenActionScriptStreamableTask.java
similarity index 100%
rename from src/java/com/threerings/presents/tools/GenActionScriptStreamableTask.java
rename to src/main/java/com/threerings/presents/tools/GenActionScriptStreamableTask.java
diff --git a/src/java/com/threerings/presents/tools/GenActionScriptTask.java b/src/main/java/com/threerings/presents/tools/GenActionScriptTask.java
similarity index 100%
rename from src/java/com/threerings/presents/tools/GenActionScriptTask.java
rename to src/main/java/com/threerings/presents/tools/GenActionScriptTask.java
diff --git a/src/java/com/threerings/presents/tools/GenDObjectTask.java b/src/main/java/com/threerings/presents/tools/GenDObjectTask.java
similarity index 100%
rename from src/java/com/threerings/presents/tools/GenDObjectTask.java
rename to src/main/java/com/threerings/presents/tools/GenDObjectTask.java
diff --git a/src/java/com/threerings/presents/tools/GenReceiverTask.java b/src/main/java/com/threerings/presents/tools/GenReceiverTask.java
similarity index 100%
rename from src/java/com/threerings/presents/tools/GenReceiverTask.java
rename to src/main/java/com/threerings/presents/tools/GenReceiverTask.java
diff --git a/src/java/com/threerings/presents/tools/GenServiceTask.java b/src/main/java/com/threerings/presents/tools/GenServiceTask.java
similarity index 100%
rename from src/java/com/threerings/presents/tools/GenServiceTask.java
rename to src/main/java/com/threerings/presents/tools/GenServiceTask.java
diff --git a/src/java/com/threerings/presents/tools/GenStreamableTask.java b/src/main/java/com/threerings/presents/tools/GenStreamableTask.java
similarity index 100%
rename from src/java/com/threerings/presents/tools/GenStreamableTask.java
rename to src/main/java/com/threerings/presents/tools/GenStreamableTask.java
diff --git a/src/java/com/threerings/presents/tools/GenTask.java b/src/main/java/com/threerings/presents/tools/GenTask.java
similarity index 100%
rename from src/java/com/threerings/presents/tools/GenTask.java
rename to src/main/java/com/threerings/presents/tools/GenTask.java
diff --git a/src/java/com/threerings/presents/tools/GenUtil.java b/src/main/java/com/threerings/presents/tools/GenUtil.java
similarity index 100%
rename from src/java/com/threerings/presents/tools/GenUtil.java
rename to src/main/java/com/threerings/presents/tools/GenUtil.java
diff --git a/src/java/com/threerings/presents/tools/GeneratedSourceMerger.java b/src/main/java/com/threerings/presents/tools/GeneratedSourceMerger.java
similarity index 100%
rename from src/java/com/threerings/presents/tools/GeneratedSourceMerger.java
rename to src/main/java/com/threerings/presents/tools/GeneratedSourceMerger.java
diff --git a/src/java/com/threerings/presents/tools/ImportSet.java b/src/main/java/com/threerings/presents/tools/ImportSet.java
similarity index 100%
rename from src/java/com/threerings/presents/tools/ImportSet.java
rename to src/main/java/com/threerings/presents/tools/ImportSet.java
diff --git a/src/java/com/threerings/presents/tools/InstrumentStreamableTask.java b/src/main/java/com/threerings/presents/tools/InstrumentStreamableTask.java
similarity index 100%
rename from src/java/com/threerings/presents/tools/InstrumentStreamableTask.java
rename to src/main/java/com/threerings/presents/tools/InstrumentStreamableTask.java
diff --git a/src/java/com/threerings/presents/tools/InvocationTask.java b/src/main/java/com/threerings/presents/tools/InvocationTask.java
similarity index 100%
rename from src/java/com/threerings/presents/tools/InvocationTask.java
rename to src/main/java/com/threerings/presents/tools/InvocationTask.java
diff --git a/src/java/com/threerings/presents/tools/SourceFile.java b/src/main/java/com/threerings/presents/tools/SourceFile.java
similarity index 100%
rename from src/java/com/threerings/presents/tools/SourceFile.java
rename to src/main/java/com/threerings/presents/tools/SourceFile.java
diff --git a/src/java/com/threerings/presents/tools/StreamableClassRequirements.java b/src/main/java/com/threerings/presents/tools/StreamableClassRequirements.java
similarity index 100%
rename from src/java/com/threerings/presents/tools/StreamableClassRequirements.java
rename to src/main/java/com/threerings/presents/tools/StreamableClassRequirements.java
diff --git a/src/java/com/threerings/presents/tools/decoder.tmpl b/src/main/java/com/threerings/presents/tools/decoder.tmpl
similarity index 100%
rename from src/java/com/threerings/presents/tools/decoder.tmpl
rename to src/main/java/com/threerings/presents/tools/decoder.tmpl
diff --git a/src/java/com/threerings/presents/tools/dispatcher.tmpl b/src/main/java/com/threerings/presents/tools/dispatcher.tmpl
similarity index 100%
rename from src/java/com/threerings/presents/tools/dispatcher.tmpl
rename to src/main/java/com/threerings/presents/tools/dispatcher.tmpl
diff --git a/src/java/com/threerings/presents/tools/dobject_field.tmpl b/src/main/java/com/threerings/presents/tools/dobject_field.tmpl
similarity index 100%
rename from src/java/com/threerings/presents/tools/dobject_field.tmpl
rename to src/main/java/com/threerings/presents/tools/dobject_field.tmpl
diff --git a/src/java/com/threerings/presents/tools/dobject_name.tmpl b/src/main/java/com/threerings/presents/tools/dobject_name.tmpl
similarity index 100%
rename from src/java/com/threerings/presents/tools/dobject_name.tmpl
rename to src/main/java/com/threerings/presents/tools/dobject_name.tmpl
diff --git a/src/java/com/threerings/presents/tools/dobject_oidlist.tmpl b/src/main/java/com/threerings/presents/tools/dobject_oidlist.tmpl
similarity index 100%
rename from src/java/com/threerings/presents/tools/dobject_oidlist.tmpl
rename to src/main/java/com/threerings/presents/tools/dobject_oidlist.tmpl
diff --git a/src/java/com/threerings/presents/tools/dobject_set.tmpl b/src/main/java/com/threerings/presents/tools/dobject_set.tmpl
similarity index 100%
rename from src/java/com/threerings/presents/tools/dobject_set.tmpl
rename to src/main/java/com/threerings/presents/tools/dobject_set.tmpl
diff --git a/src/java/com/threerings/presents/tools/marshaller.tmpl b/src/main/java/com/threerings/presents/tools/marshaller.tmpl
similarity index 100%
rename from src/java/com/threerings/presents/tools/marshaller.tmpl
rename to src/main/java/com/threerings/presents/tools/marshaller.tmpl
diff --git a/src/java/com/threerings/presents/tools/marshaller_as.tmpl b/src/main/java/com/threerings/presents/tools/marshaller_as.tmpl
similarity index 100%
rename from src/java/com/threerings/presents/tools/marshaller_as.tmpl
rename to src/main/java/com/threerings/presents/tools/marshaller_as.tmpl
diff --git a/src/java/com/threerings/presents/tools/marshaller_listener_as.tmpl b/src/main/java/com/threerings/presents/tools/marshaller_listener_as.tmpl
similarity index 100%
rename from src/java/com/threerings/presents/tools/marshaller_listener_as.tmpl
rename to src/main/java/com/threerings/presents/tools/marshaller_listener_as.tmpl
diff --git a/src/java/com/threerings/presents/tools/provider.tmpl b/src/main/java/com/threerings/presents/tools/provider.tmpl
similarity index 100%
rename from src/java/com/threerings/presents/tools/provider.tmpl
rename to src/main/java/com/threerings/presents/tools/provider.tmpl
diff --git a/src/java/com/threerings/presents/tools/sender.tmpl b/src/main/java/com/threerings/presents/tools/sender.tmpl
similarity index 100%
rename from src/java/com/threerings/presents/tools/sender.tmpl
rename to src/main/java/com/threerings/presents/tools/sender.tmpl
diff --git a/src/java/com/threerings/presents/tools/service_as.tmpl b/src/main/java/com/threerings/presents/tools/service_as.tmpl
similarity index 100%
rename from src/java/com/threerings/presents/tools/service_as.tmpl
rename to src/main/java/com/threerings/presents/tools/service_as.tmpl
diff --git a/src/java/com/threerings/presents/tools/service_listener_adapter_as.tmpl b/src/main/java/com/threerings/presents/tools/service_listener_adapter_as.tmpl
similarity index 100%
rename from src/java/com/threerings/presents/tools/service_listener_adapter_as.tmpl
rename to src/main/java/com/threerings/presents/tools/service_listener_adapter_as.tmpl
diff --git a/src/java/com/threerings/presents/tools/service_listener_as.tmpl b/src/main/java/com/threerings/presents/tools/service_listener_as.tmpl
similarity index 100%
rename from src/java/com/threerings/presents/tools/service_listener_as.tmpl
rename to src/main/java/com/threerings/presents/tools/service_listener_as.tmpl
diff --git a/src/java/com/threerings/presents/tools/streamable_as.tmpl b/src/main/java/com/threerings/presents/tools/streamable_as.tmpl
similarity index 100%
rename from src/java/com/threerings/presents/tools/streamable_as.tmpl
rename to src/main/java/com/threerings/presents/tools/streamable_as.tmpl
diff --git a/src/java/com/threerings/presents/util/ClassUtil.java b/src/main/java/com/threerings/presents/util/ClassUtil.java
similarity index 100%
rename from src/java/com/threerings/presents/util/ClassUtil.java
rename to src/main/java/com/threerings/presents/util/ClassUtil.java
diff --git a/src/java/com/threerings/presents/util/ConfirmAdapter.java b/src/main/java/com/threerings/presents/util/ConfirmAdapter.java
similarity index 100%
rename from src/java/com/threerings/presents/util/ConfirmAdapter.java
rename to src/main/java/com/threerings/presents/util/ConfirmAdapter.java
diff --git a/src/java/com/threerings/presents/util/DatagramSequencer.java b/src/main/java/com/threerings/presents/util/DatagramSequencer.java
similarity index 100%
rename from src/java/com/threerings/presents/util/DatagramSequencer.java
rename to src/main/java/com/threerings/presents/util/DatagramSequencer.java
diff --git a/src/java/com/threerings/presents/util/FutureResult.java b/src/main/java/com/threerings/presents/util/FutureResult.java
similarity index 100%
rename from src/java/com/threerings/presents/util/FutureResult.java
rename to src/main/java/com/threerings/presents/util/FutureResult.java
diff --git a/src/java/com/threerings/presents/util/IgnoreConfirmAdapter.java b/src/main/java/com/threerings/presents/util/IgnoreConfirmAdapter.java
similarity index 100%
rename from src/java/com/threerings/presents/util/IgnoreConfirmAdapter.java
rename to src/main/java/com/threerings/presents/util/IgnoreConfirmAdapter.java
diff --git a/src/java/com/threerings/presents/util/InvocationAdapter.java b/src/main/java/com/threerings/presents/util/InvocationAdapter.java
similarity index 100%
rename from src/java/com/threerings/presents/util/InvocationAdapter.java
rename to src/main/java/com/threerings/presents/util/InvocationAdapter.java
diff --git a/src/java/com/threerings/presents/util/PersistingUnit.java b/src/main/java/com/threerings/presents/util/PersistingUnit.java
similarity index 100%
rename from src/java/com/threerings/presents/util/PersistingUnit.java
rename to src/main/java/com/threerings/presents/util/PersistingUnit.java
diff --git a/src/java/com/threerings/presents/util/PresentsContext.java b/src/main/java/com/threerings/presents/util/PresentsContext.java
similarity index 100%
rename from src/java/com/threerings/presents/util/PresentsContext.java
rename to src/main/java/com/threerings/presents/util/PresentsContext.java
diff --git a/src/java/com/threerings/presents/util/ResultAdapter.java b/src/main/java/com/threerings/presents/util/ResultAdapter.java
similarity index 100%
rename from src/java/com/threerings/presents/util/ResultAdapter.java
rename to src/main/java/com/threerings/presents/util/ResultAdapter.java
diff --git a/src/java/com/threerings/presents/util/ResultListenerList.java b/src/main/java/com/threerings/presents/util/ResultListenerList.java
similarity index 100%
rename from src/java/com/threerings/presents/util/ResultListenerList.java
rename to src/main/java/com/threerings/presents/util/ResultListenerList.java
diff --git a/src/java/com/threerings/presents/util/SafeSubscriber.java b/src/main/java/com/threerings/presents/util/SafeSubscriber.java
similarity index 100%
rename from src/java/com/threerings/presents/util/SafeSubscriber.java
rename to src/main/java/com/threerings/presents/util/SafeSubscriber.java
diff --git a/src/java/com/threerings/util/ActionScript.java b/src/main/java/com/threerings/util/ActionScript.java
similarity index 100%
rename from src/java/com/threerings/util/ActionScript.java
rename to src/main/java/com/threerings/util/ActionScript.java
diff --git a/src/java/com/threerings/util/DefaultMap.java b/src/main/java/com/threerings/util/DefaultMap.java
similarity index 100%
rename from src/java/com/threerings/util/DefaultMap.java
rename to src/main/java/com/threerings/util/DefaultMap.java
diff --git a/src/java/com/threerings/util/MessageBundle.java b/src/main/java/com/threerings/util/MessageBundle.java
similarity index 100%
rename from src/java/com/threerings/util/MessageBundle.java
rename to src/main/java/com/threerings/util/MessageBundle.java
diff --git a/src/java/com/threerings/util/MessageManager.java b/src/main/java/com/threerings/util/MessageManager.java
similarity index 100%
rename from src/java/com/threerings/util/MessageManager.java
rename to src/main/java/com/threerings/util/MessageManager.java
diff --git a/src/java/com/threerings/util/MethodProfiler.java b/src/main/java/com/threerings/util/MethodProfiler.java
similarity index 100%
rename from src/java/com/threerings/util/MethodProfiler.java
rename to src/main/java/com/threerings/util/MethodProfiler.java
diff --git a/src/java/com/threerings/util/Name.java b/src/main/java/com/threerings/util/Name.java
similarity index 100%
rename from src/java/com/threerings/util/Name.java
rename to src/main/java/com/threerings/util/Name.java
diff --git a/src/java/com/threerings/util/RandomUtil.java b/src/main/java/com/threerings/util/RandomUtil.java
similarity index 100%
rename from src/java/com/threerings/util/RandomUtil.java
rename to src/main/java/com/threerings/util/RandomUtil.java
diff --git a/src/java/com/threerings/util/RunningStats.java b/src/main/java/com/threerings/util/RunningStats.java
similarity index 100%
rename from src/java/com/threerings/util/RunningStats.java
rename to src/main/java/com/threerings/util/RunningStats.java
diff --git a/src/java/com/threerings/util/StreamableArrayIntSet.java b/src/main/java/com/threerings/util/StreamableArrayIntSet.java
similarity index 100%
rename from src/java/com/threerings/util/StreamableArrayIntSet.java
rename to src/main/java/com/threerings/util/StreamableArrayIntSet.java
diff --git a/src/java/com/threerings/util/StreamableArrayList.java b/src/main/java/com/threerings/util/StreamableArrayList.java
similarity index 100%
rename from src/java/com/threerings/util/StreamableArrayList.java
rename to src/main/java/com/threerings/util/StreamableArrayList.java
diff --git a/src/java/com/threerings/util/StreamableEnumSet.java b/src/main/java/com/threerings/util/StreamableEnumSet.java
similarity index 100%
rename from src/java/com/threerings/util/StreamableEnumSet.java
rename to src/main/java/com/threerings/util/StreamableEnumSet.java
diff --git a/src/java/com/threerings/util/StreamableHashIntMap.java b/src/main/java/com/threerings/util/StreamableHashIntMap.java
similarity index 100%
rename from src/java/com/threerings/util/StreamableHashIntMap.java
rename to src/main/java/com/threerings/util/StreamableHashIntMap.java
diff --git a/src/java/com/threerings/util/StreamableHashMap.java b/src/main/java/com/threerings/util/StreamableHashMap.java
similarity index 100%
rename from src/java/com/threerings/util/StreamableHashMap.java
rename to src/main/java/com/threerings/util/StreamableHashMap.java
diff --git a/src/java/com/threerings/util/StreamableHashSet.java b/src/main/java/com/threerings/util/StreamableHashSet.java
similarity index 100%
rename from src/java/com/threerings/util/StreamableHashSet.java
rename to src/main/java/com/threerings/util/StreamableHashSet.java
diff --git a/src/java/com/threerings/util/StreamableIntIntMap.java b/src/main/java/com/threerings/util/StreamableIntIntMap.java
similarity index 100%
rename from src/java/com/threerings/util/StreamableIntIntMap.java
rename to src/main/java/com/threerings/util/StreamableIntIntMap.java
diff --git a/src/java/com/threerings/util/StreamablePoint.java b/src/main/java/com/threerings/util/StreamablePoint.java
similarity index 100%
rename from src/java/com/threerings/util/StreamablePoint.java
rename to src/main/java/com/threerings/util/StreamablePoint.java
diff --git a/src/java/com/threerings/util/StreamableRectangle.java b/src/main/java/com/threerings/util/StreamableRectangle.java
similarity index 100%
rename from src/java/com/threerings/util/StreamableRectangle.java
rename to src/main/java/com/threerings/util/StreamableRectangle.java
diff --git a/src/java/com/threerings/util/StreamableTuple.java b/src/main/java/com/threerings/util/StreamableTuple.java
similarity index 100%
rename from src/java/com/threerings/util/StreamableTuple.java
rename to src/main/java/com/threerings/util/StreamableTuple.java
diff --git a/src/java/com/threerings/util/TimeUtil.java b/src/main/java/com/threerings/util/TimeUtil.java
similarity index 100%
rename from src/java/com/threerings/util/TimeUtil.java
rename to src/main/java/com/threerings/util/TimeUtil.java
diff --git a/src/java/com/threerings/util/signal/FreeBSD/Makefile b/src/main/java/com/threerings/util/signal/FreeBSD/Makefile
similarity index 100%
rename from src/java/com/threerings/util/signal/FreeBSD/Makefile
rename to src/main/java/com/threerings/util/signal/FreeBSD/Makefile
diff --git a/src/java/com/threerings/util/signal/FreeBSD/com_threerings_util_signal_SignalManager.c b/src/main/java/com/threerings/util/signal/FreeBSD/com_threerings_util_signal_SignalManager.c
similarity index 100%
rename from src/java/com/threerings/util/signal/FreeBSD/com_threerings_util_signal_SignalManager.c
rename to src/main/java/com/threerings/util/signal/FreeBSD/com_threerings_util_signal_SignalManager.c
diff --git a/src/java/com/threerings/util/signal/FreeBSD/libsignal.so b/src/main/java/com/threerings/util/signal/FreeBSD/libsignal.so
similarity index 100%
rename from src/java/com/threerings/util/signal/FreeBSD/libsignal.so
rename to src/main/java/com/threerings/util/signal/FreeBSD/libsignal.so
diff --git a/src/java/com/threerings/util/signal/Linux/Makefile b/src/main/java/com/threerings/util/signal/Linux/Makefile
similarity index 100%
rename from src/java/com/threerings/util/signal/Linux/Makefile
rename to src/main/java/com/threerings/util/signal/Linux/Makefile
diff --git a/src/java/com/threerings/util/signal/Linux/com_threerings_util_signal_SignalManager.c b/src/main/java/com/threerings/util/signal/Linux/com_threerings_util_signal_SignalManager.c
similarity index 100%
rename from src/java/com/threerings/util/signal/Linux/com_threerings_util_signal_SignalManager.c
rename to src/main/java/com/threerings/util/signal/Linux/com_threerings_util_signal_SignalManager.c
diff --git a/src/java/com/threerings/util/signal/Linux/libsignal.so b/src/main/java/com/threerings/util/signal/Linux/libsignal.so
similarity index 100%
rename from src/java/com/threerings/util/signal/Linux/libsignal.so
rename to src/main/java/com/threerings/util/signal/Linux/libsignal.so
diff --git a/src/java/com/threerings/util/signal/Mac OS X/Makefile b/src/main/java/com/threerings/util/signal/Mac OS X/Makefile
similarity index 100%
rename from src/java/com/threerings/util/signal/Mac OS X/Makefile
rename to src/main/java/com/threerings/util/signal/Mac OS X/Makefile
diff --git a/src/java/com/threerings/util/signal/Mac OS X/com_threerings_util_signal_SignalManager.c b/src/main/java/com/threerings/util/signal/Mac OS X/com_threerings_util_signal_SignalManager.c
similarity index 100%
rename from src/java/com/threerings/util/signal/Mac OS X/com_threerings_util_signal_SignalManager.c
rename to src/main/java/com/threerings/util/signal/Mac OS X/com_threerings_util_signal_SignalManager.c
diff --git a/src/java/com/threerings/util/signal/Mac OS X/libsignal.jnilib b/src/main/java/com/threerings/util/signal/Mac OS X/libsignal.jnilib
similarity index 100%
rename from src/java/com/threerings/util/signal/Mac OS X/libsignal.jnilib
rename to src/main/java/com/threerings/util/signal/Mac OS X/libsignal.jnilib
diff --git a/src/java/com/threerings/util/signal/SignalManager.java b/src/main/java/com/threerings/util/signal/SignalManager.java
similarity index 100%
rename from src/java/com/threerings/util/signal/SignalManager.java
rename to src/main/java/com/threerings/util/signal/SignalManager.java
diff --git a/src/java/com/threerings/util/signal/com_threerings_util_signal_SignalManager.h b/src/main/java/com/threerings/util/signal/com_threerings_util_signal_SignalManager.h
similarity index 100%
rename from src/java/com/threerings/util/signal/com_threerings_util_signal_SignalManager.h
rename to src/main/java/com/threerings/util/signal/com_threerings_util_signal_SignalManager.h
diff --git a/src/java/com/threerings/web/Base.gwt.xml b/src/main/java/com/threerings/web/Base.gwt.xml
similarity index 100%
rename from src/java/com/threerings/web/Base.gwt.xml
rename to src/main/java/com/threerings/web/Base.gwt.xml
diff --git a/src/java/com/threerings/web/gwt/ServiceException.java b/src/main/java/com/threerings/web/gwt/ServiceException.java
similarity index 100%
rename from src/java/com/threerings/web/gwt/ServiceException.java
rename to src/main/java/com/threerings/web/gwt/ServiceException.java
diff --git a/src/java/com/threerings/web/server/ServletWaiter.java b/src/main/java/com/threerings/web/server/ServletWaiter.java
similarity index 100%
rename from src/java/com/threerings/web/server/ServletWaiter.java
rename to src/main/java/com/threerings/web/server/ServletWaiter.java
diff --git a/tests/src/java/com/threerings/bureau/client/TestClient.java b/src/test/java/com/threerings/bureau/client/TestClient.java
similarity index 100%
rename from tests/src/java/com/threerings/bureau/client/TestClient.java
rename to src/test/java/com/threerings/bureau/client/TestClient.java
diff --git a/tests/src/java/com/threerings/bureau/server/RegistryTester.java b/src/test/java/com/threerings/bureau/server/RegistryTester.java
similarity index 100%
rename from tests/src/java/com/threerings/bureau/server/RegistryTester.java
rename to src/test/java/com/threerings/bureau/server/RegistryTester.java
diff --git a/tests/src/java/com/threerings/bureau/server/TestServer.java b/src/test/java/com/threerings/bureau/server/TestServer.java
similarity index 100%
rename from tests/src/java/com/threerings/bureau/server/TestServer.java
rename to src/test/java/com/threerings/bureau/server/TestServer.java
diff --git a/tests/src/java/com/threerings/crowd/client/JabberApp.java b/src/test/java/com/threerings/crowd/client/JabberApp.java
similarity index 100%
rename from tests/src/java/com/threerings/crowd/client/JabberApp.java
rename to src/test/java/com/threerings/crowd/client/JabberApp.java
diff --git a/tests/src/java/com/threerings/crowd/client/JabberClient.java b/src/test/java/com/threerings/crowd/client/JabberClient.java
similarity index 100%
rename from tests/src/java/com/threerings/crowd/client/JabberClient.java
rename to src/test/java/com/threerings/crowd/client/JabberClient.java
diff --git a/tests/src/java/com/threerings/crowd/client/JabberController.java b/src/test/java/com/threerings/crowd/client/JabberController.java
similarity index 100%
rename from tests/src/java/com/threerings/crowd/client/JabberController.java
rename to src/test/java/com/threerings/crowd/client/JabberController.java
diff --git a/tests/src/java/com/threerings/crowd/client/JabberPanel.java b/src/test/java/com/threerings/crowd/client/JabberPanel.java
similarity index 100%
rename from tests/src/java/com/threerings/crowd/client/JabberPanel.java
rename to src/test/java/com/threerings/crowd/client/JabberPanel.java
diff --git a/tests/src/java/com/threerings/crowd/client/TestClient.java b/src/test/java/com/threerings/crowd/client/TestClient.java
similarity index 100%
rename from tests/src/java/com/threerings/crowd/client/TestClient.java
rename to src/test/java/com/threerings/crowd/client/TestClient.java
diff --git a/tests/src/java/com/threerings/crowd/data/JabberConfig.java b/src/test/java/com/threerings/crowd/data/JabberConfig.java
similarity index 100%
rename from tests/src/java/com/threerings/crowd/data/JabberConfig.java
rename to src/test/java/com/threerings/crowd/data/JabberConfig.java
diff --git a/tests/src/java/com/threerings/crowd/server/JabberServer.java b/src/test/java/com/threerings/crowd/server/JabberServer.java
similarity index 100%
rename from tests/src/java/com/threerings/crowd/server/JabberServer.java
rename to src/test/java/com/threerings/crowd/server/JabberServer.java
diff --git a/tests/src/java/com/threerings/io/ASStreamableSubset.java b/src/test/java/com/threerings/io/ASStreamableSubset.java
similarity index 100%
rename from tests/src/java/com/threerings/io/ASStreamableSubset.java
rename to src/test/java/com/threerings/io/ASStreamableSubset.java
diff --git a/tests/src/java/com/threerings/io/FrameTest.java b/src/test/java/com/threerings/io/FrameTest.java
similarity index 100%
rename from tests/src/java/com/threerings/io/FrameTest.java
rename to src/test/java/com/threerings/io/FrameTest.java
diff --git a/tests/src/java/com/threerings/io/StreamableTest.java b/src/test/java/com/threerings/io/StreamableTest.java
similarity index 100%
rename from tests/src/java/com/threerings/io/StreamableTest.java
rename to src/test/java/com/threerings/io/StreamableTest.java
diff --git a/tests/src/java/com/threerings/presents/client/TestClient.java b/src/test/java/com/threerings/presents/client/TestClient.java
similarity index 100%
rename from tests/src/java/com/threerings/presents/client/TestClient.java
rename to src/test/java/com/threerings/presents/client/TestClient.java
diff --git a/tests/src/java/com/threerings/presents/client/TestDecoder.java b/src/test/java/com/threerings/presents/client/TestDecoder.java
similarity index 100%
rename from tests/src/java/com/threerings/presents/client/TestDecoder.java
rename to src/test/java/com/threerings/presents/client/TestDecoder.java
diff --git a/tests/src/java/com/threerings/presents/client/TestReceiver.java b/src/test/java/com/threerings/presents/client/TestReceiver.java
similarity index 100%
rename from tests/src/java/com/threerings/presents/client/TestReceiver.java
rename to src/test/java/com/threerings/presents/client/TestReceiver.java
diff --git a/tests/src/java/com/threerings/presents/client/TestService.java b/src/test/java/com/threerings/presents/client/TestService.java
similarity index 100%
rename from tests/src/java/com/threerings/presents/client/TestService.java
rename to src/test/java/com/threerings/presents/client/TestService.java
diff --git a/tests/src/java/com/threerings/presents/data/TestMarshaller.java b/src/test/java/com/threerings/presents/data/TestMarshaller.java
similarity index 100%
rename from tests/src/java/com/threerings/presents/data/TestMarshaller.java
rename to src/test/java/com/threerings/presents/data/TestMarshaller.java
diff --git a/tests/src/java/com/threerings/presents/data/TestObject.java b/src/test/java/com/threerings/presents/data/TestObject.java
similarity index 100%
rename from tests/src/java/com/threerings/presents/data/TestObject.java
rename to src/test/java/com/threerings/presents/data/TestObject.java
diff --git a/tests/src/java/com/threerings/presents/dobj/DSetTest.java b/src/test/java/com/threerings/presents/dobj/DSetTest.java
similarity index 100%
rename from tests/src/java/com/threerings/presents/dobj/DSetTest.java
rename to src/test/java/com/threerings/presents/dobj/DSetTest.java
diff --git a/tests/src/java/com/threerings/presents/dobj/LocalAttrTest.java b/src/test/java/com/threerings/presents/dobj/LocalAttrTest.java
similarity index 100%
rename from tests/src/java/com/threerings/presents/dobj/LocalAttrTest.java
rename to src/test/java/com/threerings/presents/dobj/LocalAttrTest.java
diff --git a/tests/src/java/com/threerings/presents/server/DOMTest.java b/src/test/java/com/threerings/presents/server/DOMTest.java
similarity index 100%
rename from tests/src/java/com/threerings/presents/server/DOMTest.java
rename to src/test/java/com/threerings/presents/server/DOMTest.java
diff --git a/tests/src/java/com/threerings/presents/server/DestroyedRefTest.java b/src/test/java/com/threerings/presents/server/DestroyedRefTest.java
similarity index 100%
rename from tests/src/java/com/threerings/presents/server/DestroyedRefTest.java
rename to src/test/java/com/threerings/presents/server/DestroyedRefTest.java
diff --git a/tests/src/java/com/threerings/presents/server/OMgrIntervalTest.java b/src/test/java/com/threerings/presents/server/OMgrIntervalTest.java
similarity index 100%
rename from tests/src/java/com/threerings/presents/server/OMgrIntervalTest.java
rename to src/test/java/com/threerings/presents/server/OMgrIntervalTest.java
diff --git a/tests/src/java/com/threerings/presents/server/PresentsTestBase.java b/src/test/java/com/threerings/presents/server/PresentsTestBase.java
similarity index 100%
rename from tests/src/java/com/threerings/presents/server/PresentsTestBase.java
rename to src/test/java/com/threerings/presents/server/PresentsTestBase.java
diff --git a/tests/src/java/com/threerings/presents/server/RefTest.java b/src/test/java/com/threerings/presents/server/RefTest.java
similarity index 100%
rename from tests/src/java/com/threerings/presents/server/RefTest.java
rename to src/test/java/com/threerings/presents/server/RefTest.java
diff --git a/tests/src/java/com/threerings/presents/server/TestDispatcher.java b/src/test/java/com/threerings/presents/server/TestDispatcher.java
similarity index 100%
rename from tests/src/java/com/threerings/presents/server/TestDispatcher.java
rename to src/test/java/com/threerings/presents/server/TestDispatcher.java
diff --git a/tests/src/java/com/threerings/presents/server/TestManager.java b/src/test/java/com/threerings/presents/server/TestManager.java
similarity index 100%
rename from tests/src/java/com/threerings/presents/server/TestManager.java
rename to src/test/java/com/threerings/presents/server/TestManager.java
diff --git a/tests/src/java/com/threerings/presents/server/TestProvider.java b/src/test/java/com/threerings/presents/server/TestProvider.java
similarity index 100%
rename from tests/src/java/com/threerings/presents/server/TestProvider.java
rename to src/test/java/com/threerings/presents/server/TestProvider.java
diff --git a/tests/src/java/com/threerings/presents/server/TestSender.java b/src/test/java/com/threerings/presents/server/TestSender.java
similarity index 100%
rename from tests/src/java/com/threerings/presents/server/TestSender.java
rename to src/test/java/com/threerings/presents/server/TestSender.java
diff --git a/tests/src/java/com/threerings/presents/server/TestServer.java b/src/test/java/com/threerings/presents/server/TestServer.java
similarity index 100%
rename from tests/src/java/com/threerings/presents/server/TestServer.java
rename to src/test/java/com/threerings/presents/server/TestServer.java
diff --git a/tests/src/java/com/threerings/util/MessageBundleTest.java b/src/test/java/com/threerings/util/MessageBundleTest.java
similarity index 98%
rename from tests/src/java/com/threerings/util/MessageBundleTest.java
rename to src/test/java/com/threerings/util/MessageBundleTest.java
index 543fc3dfd..8cb5e586c 100644
--- a/tests/src/java/com/threerings/util/MessageBundleTest.java
+++ b/src/test/java/com/threerings/util/MessageBundleTest.java
@@ -40,7 +40,7 @@ public class MessageBundleTest extends TestCase
     public void runTest ()
     {
         try {
-            String path = "rsrc.i18n.messages";
+            String path = "i18n.messages";
             ResourceBundle rbundle = ResourceBundle.getBundle(path);
             MessageBundle bundle = new MessageBundle();
             bundle.init(null, "test", rbundle, null);
diff --git a/tests/rsrc/config/presents/server.properties b/src/test/resources/config/presents/server.properties
similarity index 100%
rename from tests/rsrc/config/presents/server.properties
rename to src/test/resources/config/presents/server.properties
diff --git a/tests/rsrc/i18n/messages.properties b/src/test/resources/i18n/messages.properties
similarity index 100%
rename from tests/rsrc/i18n/messages.properties
rename to src/test/resources/i18n/messages.properties