diff --git a/.classpath b/.classpath
index 026b971f..ba6238f6 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?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="dist/classes" path="src/main/java"/>
 	<classpathentry excluding="**/.svn/**" kind="src" output="tests/dist/classes" path="tests/src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry exported="true" kind="var" path="EXT_LIBS_DIR/xml-writer.jar"/>
diff --git a/build.xml b/build.xml
index 0b8156f4..9bf3409f 100644
--- a/build.xml
+++ b/build.xml
@@ -1,18 +1,12 @@
 <?xml version="1.0" standalone="yes"?>
 <!-- build configuration -->
 <project name="nenya" default="compile" basedir=".">
-
-  <!-- import overriding properties -->
-  <property file="build.properties"/>
-
-  <!-- configuration parameters -->
-  <property name="lib.name"    value="nenya"/>
-  <property name="deploy.dir"  value="dist"/>
-  <property name="savedoc.dir" value="docs"/>
-
-  <!-- derived properties -->  
-  <property name="javadoc.home" value="${deploy.dir}/docs"/>
+  <property name="lib.name"     value="nenya"/>
+  <property name="src.dir"      value="src/main/java"/>
+  <property name="tsrc.dir"     value="src/test/java"/>
+  <property name="deploy.dir"   value="dist"/>
   <property name="classes.dir"  value="${deploy.dir}/classes"/>
+  <property name="tclasses.dir" value="${deploy.dir}/test-classes"/>
 
   <!-- import some targets to enumerate library dependencies -->
   <property name="libs.dir" value="lib"/>
@@ -31,10 +25,9 @@
     <mkdir dir="${deploy.dir}/lib"/>
     <mkdir dir="${classes.dir}"/>
     <mkdir dir="${classes.dir}/rsrc"/>
-    <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>
     <copy todir="${classes.dir}/rsrc">
       <fileset dir="rsrc" includes="**/*"/>
@@ -46,13 +39,12 @@
 
   <!-- makes sure our tools are compiled and defines the ant tasks -->
   <target name="preptools" depends="prepare">
-    <taskdef resource="com/threerings/presents/tools.properties"
-             classpath="${libs.dir}/narya-tools-full.jar"/>
+    <taskdef resource="com/threerings/presents/tools.properties" classpathref="classpath"/>
   </target>
 
   <!-- cleans out the intermediate build files -->
   <target name="clean" depends="common-clean">
-    <delete dir="${deploy.dir}/classes"/>
+    <delete dir="${classes.dir}"/>
     <delete dir="${deploy.dir}/docs"/>
     <delete failonerror="false"><fileset dir="${deploy.dir}" includes="*.jar"/></delete>
     <delete failonerror="false"><fileset dir="${deploy.dir}" includes="*.swc"/></delete>
@@ -70,7 +62,7 @@
 
   <!-- build the java class files -->
   <target name="compile" depends="check-available,prepare">
-    <javac srcdir="src/java" destdir="${classes.dir}" includeAntRuntime="false"
+    <javac srcdir="${src.dir}" destdir="${classes.dir}" includeAntRuntime="false"
            debug="on" optimize="${build.optimize}" deprecation="on" source="1.5" target="1.5">
       <classpath refid="classpath"/>
       <exclude name="com/threerings/openal/**" unless="build.openal"/>
@@ -127,19 +119,20 @@
   <!-- installs the pre-built native libraries -->
   <condition property="isunix"><os family="unix"/></condition>
   <target name="ninstall" depends="prepare" if="isunix">
-    <exec os="Linux" dir="src/java/com/threerings/util/keybd/Linux" executable="make">
+    <exec os="Linux" dir="${src.dir}/com/threerings/util/keybd/Linux" executable="make">
       <arg line="install"/>
     </exec>
     <echo level="info" message="Installing native libraries for ${os.name}..."/>
-    <exec dir="src/java/com/threerings/util/unsafe/${os.name}" executable="make">
+    <exec dir="${src.dir}/com/threerings/util/unsafe/${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"
+    <mkdir dir="${deploy.dir}/docs"/>
+    <javadoc sourcepath="${src.dir}" packagenames="com.threerings.*"
+             destdir="${deploy.dir}/docs" stylesheetfile="docs/stylesheet.css"
              additionalparam="-breakiterator"
              link="http://www.threerings.net/code/nenya/docs/api">
       <classpath refid="classpath"/>
@@ -150,17 +143,8 @@
       <link href="http://www.threerings.net/code/narya/docs/api"/>
       <link href="http://www.jmonkeyengine.com/doc"/>
     </javadoc>
-    <copy todir="${javadoc.home}">
-      <fileset dir="src/java" includes="**/*.png"/>
-    </copy>
-  </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 todir="${deploy.dir}/docs">
+      <fileset dir="${src.dir}" includes="**/*.png"/>
     </copy>
   </target>
 
@@ -283,7 +267,7 @@
   <!-- generates ActionScript versions of our Streamable classes -->
   <target name="genascript" depends="preptools">
     <genascript header="lib/SOURCE_HEADER" asroot="src/as">
-      <fileset dir="src/java" includes="**/data/*.java"/>
+      <fileset dir="${src.dir}" includes="**/data/*.java"/>
     </genascript>
   </target>
 
diff --git a/src/java/com/threerings/NenyaLog.java b/src/main/java/com/threerings/NenyaLog.java
similarity index 100%
rename from src/java/com/threerings/NenyaLog.java
rename to src/main/java/com/threerings/NenyaLog.java
diff --git a/src/java/com/threerings/cast/ActionCache.java b/src/main/java/com/threerings/cast/ActionCache.java
similarity index 100%
rename from src/java/com/threerings/cast/ActionCache.java
rename to src/main/java/com/threerings/cast/ActionCache.java
diff --git a/src/java/com/threerings/cast/ActionFrames.java b/src/main/java/com/threerings/cast/ActionFrames.java
similarity index 100%
rename from src/java/com/threerings/cast/ActionFrames.java
rename to src/main/java/com/threerings/cast/ActionFrames.java
diff --git a/src/java/com/threerings/cast/ActionSequence.java b/src/main/java/com/threerings/cast/ActionSequence.java
similarity index 100%
rename from src/java/com/threerings/cast/ActionSequence.java
rename to src/main/java/com/threerings/cast/ActionSequence.java
diff --git a/src/java/com/threerings/cast/CastPrefs.java b/src/main/java/com/threerings/cast/CastPrefs.java
similarity index 100%
rename from src/java/com/threerings/cast/CastPrefs.java
rename to src/main/java/com/threerings/cast/CastPrefs.java
diff --git a/src/java/com/threerings/cast/CharacterComponent.java b/src/main/java/com/threerings/cast/CharacterComponent.java
similarity index 100%
rename from src/java/com/threerings/cast/CharacterComponent.java
rename to src/main/java/com/threerings/cast/CharacterComponent.java
diff --git a/src/java/com/threerings/cast/CharacterDescriptor.java b/src/main/java/com/threerings/cast/CharacterDescriptor.java
similarity index 100%
rename from src/java/com/threerings/cast/CharacterDescriptor.java
rename to src/main/java/com/threerings/cast/CharacterDescriptor.java
diff --git a/src/java/com/threerings/cast/CharacterManager.java b/src/main/java/com/threerings/cast/CharacterManager.java
similarity index 100%
rename from src/java/com/threerings/cast/CharacterManager.java
rename to src/main/java/com/threerings/cast/CharacterManager.java
diff --git a/src/java/com/threerings/cast/CharacterSprite.java b/src/main/java/com/threerings/cast/CharacterSprite.java
similarity index 100%
rename from src/java/com/threerings/cast/CharacterSprite.java
rename to src/main/java/com/threerings/cast/CharacterSprite.java
diff --git a/src/java/com/threerings/cast/ComponentClass.java b/src/main/java/com/threerings/cast/ComponentClass.java
similarity index 100%
rename from src/java/com/threerings/cast/ComponentClass.java
rename to src/main/java/com/threerings/cast/ComponentClass.java
diff --git a/src/java/com/threerings/cast/ComponentIDBroker.java b/src/main/java/com/threerings/cast/ComponentIDBroker.java
similarity index 100%
rename from src/java/com/threerings/cast/ComponentIDBroker.java
rename to src/main/java/com/threerings/cast/ComponentIDBroker.java
diff --git a/src/java/com/threerings/cast/ComponentRepository.java b/src/main/java/com/threerings/cast/ComponentRepository.java
similarity index 100%
rename from src/java/com/threerings/cast/ComponentRepository.java
rename to src/main/java/com/threerings/cast/ComponentRepository.java
diff --git a/src/java/com/threerings/cast/CompositedActionFrames.java b/src/main/java/com/threerings/cast/CompositedActionFrames.java
similarity index 100%
rename from src/java/com/threerings/cast/CompositedActionFrames.java
rename to src/main/java/com/threerings/cast/CompositedActionFrames.java
diff --git a/src/java/com/threerings/cast/CompositedMaskedImage.java b/src/main/java/com/threerings/cast/CompositedMaskedImage.java
similarity index 100%
rename from src/java/com/threerings/cast/CompositedMaskedImage.java
rename to src/main/java/com/threerings/cast/CompositedMaskedImage.java
diff --git a/src/java/com/threerings/cast/CompositedMirage.java b/src/main/java/com/threerings/cast/CompositedMirage.java
similarity index 100%
rename from src/java/com/threerings/cast/CompositedMirage.java
rename to src/main/java/com/threerings/cast/CompositedMirage.java
diff --git a/src/java/com/threerings/cast/CompositedMultiFrameImage.java b/src/main/java/com/threerings/cast/CompositedMultiFrameImage.java
similarity index 100%
rename from src/java/com/threerings/cast/CompositedMultiFrameImage.java
rename to src/main/java/com/threerings/cast/CompositedMultiFrameImage.java
diff --git a/src/java/com/threerings/cast/CompositedShadowImage.java b/src/main/java/com/threerings/cast/CompositedShadowImage.java
similarity index 100%
rename from src/java/com/threerings/cast/CompositedShadowImage.java
rename to src/main/java/com/threerings/cast/CompositedShadowImage.java
diff --git a/src/java/com/threerings/cast/FrameProvider.java b/src/main/java/com/threerings/cast/FrameProvider.java
similarity index 100%
rename from src/java/com/threerings/cast/FrameProvider.java
rename to src/main/java/com/threerings/cast/FrameProvider.java
diff --git a/src/java/com/threerings/cast/Log.java b/src/main/java/com/threerings/cast/Log.java
similarity index 100%
rename from src/java/com/threerings/cast/Log.java
rename to src/main/java/com/threerings/cast/Log.java
diff --git a/src/java/com/threerings/cast/NoSuchComponentException.java b/src/main/java/com/threerings/cast/NoSuchComponentException.java
similarity index 100%
rename from src/java/com/threerings/cast/NoSuchComponentException.java
rename to src/main/java/com/threerings/cast/NoSuchComponentException.java
diff --git a/src/java/com/threerings/cast/StandardActions.java b/src/main/java/com/threerings/cast/StandardActions.java
similarity index 100%
rename from src/java/com/threerings/cast/StandardActions.java
rename to src/main/java/com/threerings/cast/StandardActions.java
diff --git a/src/java/com/threerings/cast/TrimmedMultiFrameImage.java b/src/main/java/com/threerings/cast/TrimmedMultiFrameImage.java
similarity index 100%
rename from src/java/com/threerings/cast/TrimmedMultiFrameImage.java
rename to src/main/java/com/threerings/cast/TrimmedMultiFrameImage.java
diff --git a/src/java/com/threerings/cast/builder/BuilderModel.java b/src/main/java/com/threerings/cast/builder/BuilderModel.java
similarity index 100%
rename from src/java/com/threerings/cast/builder/BuilderModel.java
rename to src/main/java/com/threerings/cast/builder/BuilderModel.java
diff --git a/src/java/com/threerings/cast/builder/BuilderModelListener.java b/src/main/java/com/threerings/cast/builder/BuilderModelListener.java
similarity index 100%
rename from src/java/com/threerings/cast/builder/BuilderModelListener.java
rename to src/main/java/com/threerings/cast/builder/BuilderModelListener.java
diff --git a/src/java/com/threerings/cast/builder/BuilderPanel.java b/src/main/java/com/threerings/cast/builder/BuilderPanel.java
similarity index 100%
rename from src/java/com/threerings/cast/builder/BuilderPanel.java
rename to src/main/java/com/threerings/cast/builder/BuilderPanel.java
diff --git a/src/java/com/threerings/cast/builder/ClassEditor.java b/src/main/java/com/threerings/cast/builder/ClassEditor.java
similarity index 100%
rename from src/java/com/threerings/cast/builder/ClassEditor.java
rename to src/main/java/com/threerings/cast/builder/ClassEditor.java
diff --git a/src/java/com/threerings/cast/builder/ComponentPanel.java b/src/main/java/com/threerings/cast/builder/ComponentPanel.java
similarity index 100%
rename from src/java/com/threerings/cast/builder/ComponentPanel.java
rename to src/main/java/com/threerings/cast/builder/ComponentPanel.java
diff --git a/src/java/com/threerings/cast/builder/SpritePanel.java b/src/main/java/com/threerings/cast/builder/SpritePanel.java
similarity index 100%
rename from src/java/com/threerings/cast/builder/SpritePanel.java
rename to src/main/java/com/threerings/cast/builder/SpritePanel.java
diff --git a/src/java/com/threerings/cast/bundle/BundleUtil.java b/src/main/java/com/threerings/cast/bundle/BundleUtil.java
similarity index 100%
rename from src/java/com/threerings/cast/bundle/BundleUtil.java
rename to src/main/java/com/threerings/cast/bundle/BundleUtil.java
diff --git a/src/java/com/threerings/cast/bundle/BundledComponentRepository.java b/src/main/java/com/threerings/cast/bundle/BundledComponentRepository.java
similarity index 100%
rename from src/java/com/threerings/cast/bundle/BundledComponentRepository.java
rename to src/main/java/com/threerings/cast/bundle/BundledComponentRepository.java
diff --git a/src/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java b/src/main/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java
similarity index 100%
rename from src/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java
rename to src/main/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java
diff --git a/src/java/com/threerings/cast/bundle/tools/DirectoryComponentBundlerTask.java b/src/main/java/com/threerings/cast/bundle/tools/DirectoryComponentBundlerTask.java
similarity index 100%
rename from src/java/com/threerings/cast/bundle/tools/DirectoryComponentBundlerTask.java
rename to src/main/java/com/threerings/cast/bundle/tools/DirectoryComponentBundlerTask.java
diff --git a/src/java/com/threerings/cast/bundle/tools/DirectoryMetadataBundlerTask.java b/src/main/java/com/threerings/cast/bundle/tools/DirectoryMetadataBundlerTask.java
similarity index 100%
rename from src/java/com/threerings/cast/bundle/tools/DirectoryMetadataBundlerTask.java
rename to src/main/java/com/threerings/cast/bundle/tools/DirectoryMetadataBundlerTask.java
diff --git a/src/java/com/threerings/cast/bundle/tools/DumpBundle.java b/src/main/java/com/threerings/cast/bundle/tools/DumpBundle.java
similarity index 100%
rename from src/java/com/threerings/cast/bundle/tools/DumpBundle.java
rename to src/main/java/com/threerings/cast/bundle/tools/DumpBundle.java
diff --git a/src/java/com/threerings/cast/bundle/tools/MetadataBundlerTask.java b/src/main/java/com/threerings/cast/bundle/tools/MetadataBundlerTask.java
similarity index 100%
rename from src/java/com/threerings/cast/bundle/tools/MetadataBundlerTask.java
rename to src/main/java/com/threerings/cast/bundle/tools/MetadataBundlerTask.java
diff --git a/src/java/com/threerings/cast/tools/xml/ActionRuleSet.java b/src/main/java/com/threerings/cast/tools/xml/ActionRuleSet.java
similarity index 100%
rename from src/java/com/threerings/cast/tools/xml/ActionRuleSet.java
rename to src/main/java/com/threerings/cast/tools/xml/ActionRuleSet.java
diff --git a/src/java/com/threerings/cast/tools/xml/ClassRuleSet.java b/src/main/java/com/threerings/cast/tools/xml/ClassRuleSet.java
similarity index 100%
rename from src/java/com/threerings/cast/tools/xml/ClassRuleSet.java
rename to src/main/java/com/threerings/cast/tools/xml/ClassRuleSet.java
diff --git a/src/java/com/threerings/cast/util/CastUtil.java b/src/main/java/com/threerings/cast/util/CastUtil.java
similarity index 100%
rename from src/java/com/threerings/cast/util/CastUtil.java
rename to src/main/java/com/threerings/cast/util/CastUtil.java
diff --git a/src/java/com/threerings/chat/ChatGlyph.java b/src/main/java/com/threerings/chat/ChatGlyph.java
similarity index 100%
rename from src/java/com/threerings/chat/ChatGlyph.java
rename to src/main/java/com/threerings/chat/ChatGlyph.java
diff --git a/src/java/com/threerings/chat/ChatLogic.java b/src/main/java/com/threerings/chat/ChatLogic.java
similarity index 100%
rename from src/java/com/threerings/chat/ChatLogic.java
rename to src/main/java/com/threerings/chat/ChatLogic.java
diff --git a/src/java/com/threerings/chat/ChatOverlay.java b/src/main/java/com/threerings/chat/ChatOverlay.java
similarity index 100%
rename from src/java/com/threerings/chat/ChatOverlay.java
rename to src/main/java/com/threerings/chat/ChatOverlay.java
diff --git a/src/java/com/threerings/chat/ComicChatOverlay.java b/src/main/java/com/threerings/chat/ComicChatOverlay.java
similarity index 100%
rename from src/java/com/threerings/chat/ComicChatOverlay.java
rename to src/main/java/com/threerings/chat/ComicChatOverlay.java
diff --git a/src/java/com/threerings/chat/SubtitleChatOverlay.java b/src/main/java/com/threerings/chat/SubtitleChatOverlay.java
similarity index 100%
rename from src/java/com/threerings/chat/SubtitleChatOverlay.java
rename to src/main/java/com/threerings/chat/SubtitleChatOverlay.java
diff --git a/src/java/com/threerings/geom/GeomUtil.java b/src/main/java/com/threerings/geom/GeomUtil.java
similarity index 100%
rename from src/java/com/threerings/geom/GeomUtil.java
rename to src/main/java/com/threerings/geom/GeomUtil.java
diff --git a/src/java/com/threerings/geom/Log.java b/src/main/java/com/threerings/geom/Log.java
similarity index 100%
rename from src/java/com/threerings/geom/Log.java
rename to src/main/java/com/threerings/geom/Log.java
diff --git a/src/java/com/threerings/media/AbstractMedia.java b/src/main/java/com/threerings/media/AbstractMedia.java
similarity index 100%
rename from src/java/com/threerings/media/AbstractMedia.java
rename to src/main/java/com/threerings/media/AbstractMedia.java
diff --git a/src/java/com/threerings/media/AbstractMediaManager.java b/src/main/java/com/threerings/media/AbstractMediaManager.java
similarity index 100%
rename from src/java/com/threerings/media/AbstractMediaManager.java
rename to src/main/java/com/threerings/media/AbstractMediaManager.java
diff --git a/src/java/com/threerings/media/ActiveRepaintManager.java b/src/main/java/com/threerings/media/ActiveRepaintManager.java
similarity index 100%
rename from src/java/com/threerings/media/ActiveRepaintManager.java
rename to src/main/java/com/threerings/media/ActiveRepaintManager.java
diff --git a/src/java/com/threerings/media/BackFrameManager.java b/src/main/java/com/threerings/media/BackFrameManager.java
similarity index 100%
rename from src/java/com/threerings/media/BackFrameManager.java
rename to src/main/java/com/threerings/media/BackFrameManager.java
diff --git a/src/java/com/threerings/media/FlipFrameManager.java b/src/main/java/com/threerings/media/FlipFrameManager.java
similarity index 100%
rename from src/java/com/threerings/media/FlipFrameManager.java
rename to src/main/java/com/threerings/media/FlipFrameManager.java
diff --git a/src/java/com/threerings/media/FrameInterval.java b/src/main/java/com/threerings/media/FrameInterval.java
similarity index 100%
rename from src/java/com/threerings/media/FrameInterval.java
rename to src/main/java/com/threerings/media/FrameInterval.java
diff --git a/src/java/com/threerings/media/FrameManager.java b/src/main/java/com/threerings/media/FrameManager.java
similarity index 100%
rename from src/java/com/threerings/media/FrameManager.java
rename to src/main/java/com/threerings/media/FrameManager.java
diff --git a/src/java/com/threerings/media/FrameParticipant.java b/src/main/java/com/threerings/media/FrameParticipant.java
similarity index 100%
rename from src/java/com/threerings/media/FrameParticipant.java
rename to src/main/java/com/threerings/media/FrameParticipant.java
diff --git a/src/java/com/threerings/media/HourglassView.java b/src/main/java/com/threerings/media/HourglassView.java
similarity index 100%
rename from src/java/com/threerings/media/HourglassView.java
rename to src/main/java/com/threerings/media/HourglassView.java
diff --git a/src/java/com/threerings/media/IconManager.java b/src/main/java/com/threerings/media/IconManager.java
similarity index 100%
rename from src/java/com/threerings/media/IconManager.java
rename to src/main/java/com/threerings/media/IconManager.java
diff --git a/src/java/com/threerings/media/Log.java b/src/main/java/com/threerings/media/Log.java
similarity index 100%
rename from src/java/com/threerings/media/Log.java
rename to src/main/java/com/threerings/media/Log.java
diff --git a/src/java/com/threerings/media/ManagedJApplet.java b/src/main/java/com/threerings/media/ManagedJApplet.java
similarity index 100%
rename from src/java/com/threerings/media/ManagedJApplet.java
rename to src/main/java/com/threerings/media/ManagedJApplet.java
diff --git a/src/java/com/threerings/media/ManagedJFrame.java b/src/main/java/com/threerings/media/ManagedJFrame.java
similarity index 100%
rename from src/java/com/threerings/media/ManagedJFrame.java
rename to src/main/java/com/threerings/media/ManagedJFrame.java
diff --git a/src/java/com/threerings/media/MediaConstants.java b/src/main/java/com/threerings/media/MediaConstants.java
similarity index 100%
rename from src/java/com/threerings/media/MediaConstants.java
rename to src/main/java/com/threerings/media/MediaConstants.java
diff --git a/src/java/com/threerings/media/MediaHost.java b/src/main/java/com/threerings/media/MediaHost.java
similarity index 100%
rename from src/java/com/threerings/media/MediaHost.java
rename to src/main/java/com/threerings/media/MediaHost.java
diff --git a/src/java/com/threerings/media/MediaOverlay.java b/src/main/java/com/threerings/media/MediaOverlay.java
similarity index 100%
rename from src/java/com/threerings/media/MediaOverlay.java
rename to src/main/java/com/threerings/media/MediaOverlay.java
diff --git a/src/java/com/threerings/media/MediaPanel.java b/src/main/java/com/threerings/media/MediaPanel.java
similarity index 100%
rename from src/java/com/threerings/media/MediaPanel.java
rename to src/main/java/com/threerings/media/MediaPanel.java
diff --git a/src/java/com/threerings/media/MediaPrefs.java b/src/main/java/com/threerings/media/MediaPrefs.java
similarity index 100%
rename from src/java/com/threerings/media/MediaPrefs.java
rename to src/main/java/com/threerings/media/MediaPrefs.java
diff --git a/src/java/com/threerings/media/MetaMediaManager.java b/src/main/java/com/threerings/media/MetaMediaManager.java
similarity index 100%
rename from src/java/com/threerings/media/MetaMediaManager.java
rename to src/main/java/com/threerings/media/MetaMediaManager.java
diff --git a/src/java/com/threerings/media/RegionManager.java b/src/main/java/com/threerings/media/RegionManager.java
similarity index 100%
rename from src/java/com/threerings/media/RegionManager.java
rename to src/main/java/com/threerings/media/RegionManager.java
diff --git a/src/java/com/threerings/media/SafeScrollPane.java b/src/main/java/com/threerings/media/SafeScrollPane.java
similarity index 100%
rename from src/java/com/threerings/media/SafeScrollPane.java
rename to src/main/java/com/threerings/media/SafeScrollPane.java
diff --git a/src/java/com/threerings/media/TimerView.java b/src/main/java/com/threerings/media/TimerView.java
similarity index 100%
rename from src/java/com/threerings/media/TimerView.java
rename to src/main/java/com/threerings/media/TimerView.java
diff --git a/src/java/com/threerings/media/ViewTracker.java b/src/main/java/com/threerings/media/ViewTracker.java
similarity index 100%
rename from src/java/com/threerings/media/ViewTracker.java
rename to src/main/java/com/threerings/media/ViewTracker.java
diff --git a/src/java/com/threerings/media/VirtualMediaPanel.java b/src/main/java/com/threerings/media/VirtualMediaPanel.java
similarity index 100%
rename from src/java/com/threerings/media/VirtualMediaPanel.java
rename to src/main/java/com/threerings/media/VirtualMediaPanel.java
diff --git a/src/java/com/threerings/media/VirtualRangeModel.java b/src/main/java/com/threerings/media/VirtualRangeModel.java
similarity index 100%
rename from src/java/com/threerings/media/VirtualRangeModel.java
rename to src/main/java/com/threerings/media/VirtualRangeModel.java
diff --git a/src/java/com/threerings/media/animation/Animation.java b/src/main/java/com/threerings/media/animation/Animation.java
similarity index 100%
rename from src/java/com/threerings/media/animation/Animation.java
rename to src/main/java/com/threerings/media/animation/Animation.java
diff --git a/src/java/com/threerings/media/animation/AnimationAdapter.java b/src/main/java/com/threerings/media/animation/AnimationAdapter.java
similarity index 100%
rename from src/java/com/threerings/media/animation/AnimationAdapter.java
rename to src/main/java/com/threerings/media/animation/AnimationAdapter.java
diff --git a/src/java/com/threerings/media/animation/AnimationArranger.java b/src/main/java/com/threerings/media/animation/AnimationArranger.java
similarity index 100%
rename from src/java/com/threerings/media/animation/AnimationArranger.java
rename to src/main/java/com/threerings/media/animation/AnimationArranger.java
diff --git a/src/java/com/threerings/media/animation/AnimationFrameSequencer.java b/src/main/java/com/threerings/media/animation/AnimationFrameSequencer.java
similarity index 100%
rename from src/java/com/threerings/media/animation/AnimationFrameSequencer.java
rename to src/main/java/com/threerings/media/animation/AnimationFrameSequencer.java
diff --git a/src/java/com/threerings/media/animation/AnimationManager.java b/src/main/java/com/threerings/media/animation/AnimationManager.java
similarity index 100%
rename from src/java/com/threerings/media/animation/AnimationManager.java
rename to src/main/java/com/threerings/media/animation/AnimationManager.java
diff --git a/src/java/com/threerings/media/animation/AnimationObserver.java b/src/main/java/com/threerings/media/animation/AnimationObserver.java
similarity index 100%
rename from src/java/com/threerings/media/animation/AnimationObserver.java
rename to src/main/java/com/threerings/media/animation/AnimationObserver.java
diff --git a/src/java/com/threerings/media/animation/AnimationSequencer.java b/src/main/java/com/threerings/media/animation/AnimationSequencer.java
similarity index 100%
rename from src/java/com/threerings/media/animation/AnimationSequencer.java
rename to src/main/java/com/threerings/media/animation/AnimationSequencer.java
diff --git a/src/java/com/threerings/media/animation/AnimationSprite.java b/src/main/java/com/threerings/media/animation/AnimationSprite.java
similarity index 100%
rename from src/java/com/threerings/media/animation/AnimationSprite.java
rename to src/main/java/com/threerings/media/animation/AnimationSprite.java
diff --git a/src/java/com/threerings/media/animation/AnimationWaiter.java b/src/main/java/com/threerings/media/animation/AnimationWaiter.java
similarity index 100%
rename from src/java/com/threerings/media/animation/AnimationWaiter.java
rename to src/main/java/com/threerings/media/animation/AnimationWaiter.java
diff --git a/src/java/com/threerings/media/animation/BlankAnimation.java b/src/main/java/com/threerings/media/animation/BlankAnimation.java
similarity index 100%
rename from src/java/com/threerings/media/animation/BlankAnimation.java
rename to src/main/java/com/threerings/media/animation/BlankAnimation.java
diff --git a/src/java/com/threerings/media/animation/BlendAnimation.java b/src/main/java/com/threerings/media/animation/BlendAnimation.java
similarity index 100%
rename from src/java/com/threerings/media/animation/BlendAnimation.java
rename to src/main/java/com/threerings/media/animation/BlendAnimation.java
diff --git a/src/java/com/threerings/media/animation/BobbleAnimation.java b/src/main/java/com/threerings/media/animation/BobbleAnimation.java
similarity index 100%
rename from src/java/com/threerings/media/animation/BobbleAnimation.java
rename to src/main/java/com/threerings/media/animation/BobbleAnimation.java
diff --git a/src/java/com/threerings/media/animation/ExplodeAnimation.java b/src/main/java/com/threerings/media/animation/ExplodeAnimation.java
similarity index 100%
rename from src/java/com/threerings/media/animation/ExplodeAnimation.java
rename to src/main/java/com/threerings/media/animation/ExplodeAnimation.java
diff --git a/src/java/com/threerings/media/animation/FadeAnimation.java b/src/main/java/com/threerings/media/animation/FadeAnimation.java
similarity index 100%
rename from src/java/com/threerings/media/animation/FadeAnimation.java
rename to src/main/java/com/threerings/media/animation/FadeAnimation.java
diff --git a/src/java/com/threerings/media/animation/FadeImageAnimation.java b/src/main/java/com/threerings/media/animation/FadeImageAnimation.java
similarity index 100%
rename from src/java/com/threerings/media/animation/FadeImageAnimation.java
rename to src/main/java/com/threerings/media/animation/FadeImageAnimation.java
diff --git a/src/java/com/threerings/media/animation/FadeLabelAnimation.java b/src/main/java/com/threerings/media/animation/FadeLabelAnimation.java
similarity index 100%
rename from src/java/com/threerings/media/animation/FadeLabelAnimation.java
rename to src/main/java/com/threerings/media/animation/FadeLabelAnimation.java
diff --git a/src/java/com/threerings/media/animation/FloatingTextAnimation.java b/src/main/java/com/threerings/media/animation/FloatingTextAnimation.java
similarity index 100%
rename from src/java/com/threerings/media/animation/FloatingTextAnimation.java
rename to src/main/java/com/threerings/media/animation/FloatingTextAnimation.java
diff --git a/src/java/com/threerings/media/animation/GleamAnimation.java b/src/main/java/com/threerings/media/animation/GleamAnimation.java
similarity index 100%
rename from src/java/com/threerings/media/animation/GleamAnimation.java
rename to src/main/java/com/threerings/media/animation/GleamAnimation.java
diff --git a/src/java/com/threerings/media/animation/MultiFrameAnimation.java b/src/main/java/com/threerings/media/animation/MultiFrameAnimation.java
similarity index 100%
rename from src/java/com/threerings/media/animation/MultiFrameAnimation.java
rename to src/main/java/com/threerings/media/animation/MultiFrameAnimation.java
diff --git a/src/java/com/threerings/media/animation/RainAnimation.java b/src/main/java/com/threerings/media/animation/RainAnimation.java
similarity index 100%
rename from src/java/com/threerings/media/animation/RainAnimation.java
rename to src/main/java/com/threerings/media/animation/RainAnimation.java
diff --git a/src/java/com/threerings/media/animation/ScaleAnimation.java b/src/main/java/com/threerings/media/animation/ScaleAnimation.java
similarity index 100%
rename from src/java/com/threerings/media/animation/ScaleAnimation.java
rename to src/main/java/com/threerings/media/animation/ScaleAnimation.java
diff --git a/src/java/com/threerings/media/animation/SequencedAnimationObserver.java b/src/main/java/com/threerings/media/animation/SequencedAnimationObserver.java
similarity index 100%
rename from src/java/com/threerings/media/animation/SequencedAnimationObserver.java
rename to src/main/java/com/threerings/media/animation/SequencedAnimationObserver.java
diff --git a/src/java/com/threerings/media/animation/SparkAnimation.java b/src/main/java/com/threerings/media/animation/SparkAnimation.java
similarity index 100%
rename from src/java/com/threerings/media/animation/SparkAnimation.java
rename to src/main/java/com/threerings/media/animation/SparkAnimation.java
diff --git a/src/java/com/threerings/media/animation/SpriteAnimation.java b/src/main/java/com/threerings/media/animation/SpriteAnimation.java
similarity index 100%
rename from src/java/com/threerings/media/animation/SpriteAnimation.java
rename to src/main/java/com/threerings/media/animation/SpriteAnimation.java
diff --git a/src/java/com/threerings/media/animation/SpritePathAnimation.java b/src/main/java/com/threerings/media/animation/SpritePathAnimation.java
similarity index 100%
rename from src/java/com/threerings/media/animation/SpritePathAnimation.java
rename to src/main/java/com/threerings/media/animation/SpritePathAnimation.java
diff --git a/src/java/com/threerings/media/effects/FadeEffect.java b/src/main/java/com/threerings/media/effects/FadeEffect.java
similarity index 100%
rename from src/java/com/threerings/media/effects/FadeEffect.java
rename to src/main/java/com/threerings/media/effects/FadeEffect.java
diff --git a/src/java/com/threerings/media/image/AWTImageCreator.java b/src/main/java/com/threerings/media/image/AWTImageCreator.java
similarity index 100%
rename from src/java/com/threerings/media/image/AWTImageCreator.java
rename to src/main/java/com/threerings/media/image/AWTImageCreator.java
diff --git a/src/java/com/threerings/media/image/BackedVolatileMirage.java b/src/main/java/com/threerings/media/image/BackedVolatileMirage.java
similarity index 100%
rename from src/java/com/threerings/media/image/BackedVolatileMirage.java
rename to src/main/java/com/threerings/media/image/BackedVolatileMirage.java
diff --git a/src/java/com/threerings/media/image/BlankMirage.java b/src/main/java/com/threerings/media/image/BlankMirage.java
similarity index 100%
rename from src/java/com/threerings/media/image/BlankMirage.java
rename to src/main/java/com/threerings/media/image/BlankMirage.java
diff --git a/src/java/com/threerings/media/image/BufferedMirage.java b/src/main/java/com/threerings/media/image/BufferedMirage.java
similarity index 100%
rename from src/java/com/threerings/media/image/BufferedMirage.java
rename to src/main/java/com/threerings/media/image/BufferedMirage.java
diff --git a/src/java/com/threerings/media/image/CachedVolatileMirage.java b/src/main/java/com/threerings/media/image/CachedVolatileMirage.java
similarity index 100%
rename from src/java/com/threerings/media/image/CachedVolatileMirage.java
rename to src/main/java/com/threerings/media/image/CachedVolatileMirage.java
diff --git a/src/java/com/threerings/media/image/ClientImageManager.java b/src/main/java/com/threerings/media/image/ClientImageManager.java
similarity index 100%
rename from src/java/com/threerings/media/image/ClientImageManager.java
rename to src/main/java/com/threerings/media/image/ClientImageManager.java
diff --git a/src/java/com/threerings/media/image/ColorPository.java b/src/main/java/com/threerings/media/image/ColorPository.java
similarity index 100%
rename from src/java/com/threerings/media/image/ColorPository.java
rename to src/main/java/com/threerings/media/image/ColorPository.java
diff --git a/src/java/com/threerings/media/image/ColorUtil.java b/src/main/java/com/threerings/media/image/ColorUtil.java
similarity index 100%
rename from src/java/com/threerings/media/image/ColorUtil.java
rename to src/main/java/com/threerings/media/image/ColorUtil.java
diff --git a/src/java/com/threerings/media/image/Colorization.java b/src/main/java/com/threerings/media/image/Colorization.java
similarity index 100%
rename from src/java/com/threerings/media/image/Colorization.java
rename to src/main/java/com/threerings/media/image/Colorization.java
diff --git a/src/java/com/threerings/media/image/CompositeMirage.java b/src/main/java/com/threerings/media/image/CompositeMirage.java
similarity index 100%
rename from src/java/com/threerings/media/image/CompositeMirage.java
rename to src/main/java/com/threerings/media/image/CompositeMirage.java
diff --git a/src/java/com/threerings/media/image/ImageDataProvider.java b/src/main/java/com/threerings/media/image/ImageDataProvider.java
similarity index 100%
rename from src/java/com/threerings/media/image/ImageDataProvider.java
rename to src/main/java/com/threerings/media/image/ImageDataProvider.java
diff --git a/src/java/com/threerings/media/image/ImageManager.java b/src/main/java/com/threerings/media/image/ImageManager.java
similarity index 100%
rename from src/java/com/threerings/media/image/ImageManager.java
rename to src/main/java/com/threerings/media/image/ImageManager.java
diff --git a/src/java/com/threerings/media/image/ImageUtil.java b/src/main/java/com/threerings/media/image/ImageUtil.java
similarity index 100%
rename from src/java/com/threerings/media/image/ImageUtil.java
rename to src/main/java/com/threerings/media/image/ImageUtil.java
diff --git a/src/java/com/threerings/media/image/Mirage.java b/src/main/java/com/threerings/media/image/Mirage.java
similarity index 100%
rename from src/java/com/threerings/media/image/Mirage.java
rename to src/main/java/com/threerings/media/image/Mirage.java
diff --git a/src/java/com/threerings/media/image/MirageIcon.java b/src/main/java/com/threerings/media/image/MirageIcon.java
similarity index 100%
rename from src/java/com/threerings/media/image/MirageIcon.java
rename to src/main/java/com/threerings/media/image/MirageIcon.java
diff --git a/src/java/com/threerings/media/image/NinePatch.java b/src/main/java/com/threerings/media/image/NinePatch.java
similarity index 100%
rename from src/java/com/threerings/media/image/NinePatch.java
rename to src/main/java/com/threerings/media/image/NinePatch.java
diff --git a/src/java/com/threerings/media/image/NinePatchMirage.java b/src/main/java/com/threerings/media/image/NinePatchMirage.java
similarity index 100%
rename from src/java/com/threerings/media/image/NinePatchMirage.java
rename to src/main/java/com/threerings/media/image/NinePatchMirage.java
diff --git a/src/java/com/threerings/media/image/Quantize.java b/src/main/java/com/threerings/media/image/Quantize.java
similarity index 100%
rename from src/java/com/threerings/media/image/Quantize.java
rename to src/main/java/com/threerings/media/image/Quantize.java
diff --git a/src/java/com/threerings/media/image/SolidMirage.java b/src/main/java/com/threerings/media/image/SolidMirage.java
similarity index 100%
rename from src/java/com/threerings/media/image/SolidMirage.java
rename to src/main/java/com/threerings/media/image/SolidMirage.java
diff --git a/src/java/com/threerings/media/image/TransformedMirage.java b/src/main/java/com/threerings/media/image/TransformedMirage.java
similarity index 100%
rename from src/java/com/threerings/media/image/TransformedMirage.java
rename to src/main/java/com/threerings/media/image/TransformedMirage.java
diff --git a/src/java/com/threerings/media/image/VolatileMirage.java b/src/main/java/com/threerings/media/image/VolatileMirage.java
similarity index 100%
rename from src/java/com/threerings/media/image/VolatileMirage.java
rename to src/main/java/com/threerings/media/image/VolatileMirage.java
diff --git a/src/java/com/threerings/media/image/tools/DumpColorPository.java b/src/main/java/com/threerings/media/image/tools/DumpColorPository.java
similarity index 100%
rename from src/java/com/threerings/media/image/tools/DumpColorPository.java
rename to src/main/java/com/threerings/media/image/tools/DumpColorPository.java
diff --git a/src/java/com/threerings/media/image/tools/xml/ColorPositoryParser.java b/src/main/java/com/threerings/media/image/tools/xml/ColorPositoryParser.java
similarity index 100%
rename from src/java/com/threerings/media/image/tools/xml/ColorPositoryParser.java
rename to src/main/java/com/threerings/media/image/tools/xml/ColorPositoryParser.java
diff --git a/src/java/com/threerings/media/sound/JavaSoundPlayer.java b/src/main/java/com/threerings/media/sound/JavaSoundPlayer.java
similarity index 100%
rename from src/java/com/threerings/media/sound/JavaSoundPlayer.java
rename to src/main/java/com/threerings/media/sound/JavaSoundPlayer.java
diff --git a/src/java/com/threerings/media/sound/SoundCodes.java b/src/main/java/com/threerings/media/sound/SoundCodes.java
similarity index 100%
rename from src/java/com/threerings/media/sound/SoundCodes.java
rename to src/main/java/com/threerings/media/sound/SoundCodes.java
diff --git a/src/java/com/threerings/media/sound/SoundEnabledObserver.java b/src/main/java/com/threerings/media/sound/SoundEnabledObserver.java
similarity index 100%
rename from src/java/com/threerings/media/sound/SoundEnabledObserver.java
rename to src/main/java/com/threerings/media/sound/SoundEnabledObserver.java
diff --git a/src/java/com/threerings/media/sound/SoundLoader.java b/src/main/java/com/threerings/media/sound/SoundLoader.java
similarity index 100%
rename from src/java/com/threerings/media/sound/SoundLoader.java
rename to src/main/java/com/threerings/media/sound/SoundLoader.java
diff --git a/src/java/com/threerings/media/sound/SoundManager.java b/src/main/java/com/threerings/media/sound/SoundManager.java
similarity index 100%
rename from src/java/com/threerings/media/sound/SoundManager.java
rename to src/main/java/com/threerings/media/sound/SoundManager.java
diff --git a/src/java/com/threerings/media/sound/SoundPlayer.java b/src/main/java/com/threerings/media/sound/SoundPlayer.java
similarity index 100%
rename from src/java/com/threerings/media/sound/SoundPlayer.java
rename to src/main/java/com/threerings/media/sound/SoundPlayer.java
diff --git a/src/java/com/threerings/media/sound/Sounds.java b/src/main/java/com/threerings/media/sound/Sounds.java
similarity index 100%
rename from src/java/com/threerings/media/sound/Sounds.java
rename to src/main/java/com/threerings/media/sound/Sounds.java
diff --git a/src/java/com/threerings/media/sprite/ButtonSprite.java b/src/main/java/com/threerings/media/sprite/ButtonSprite.java
similarity index 100%
rename from src/java/com/threerings/media/sprite/ButtonSprite.java
rename to src/main/java/com/threerings/media/sprite/ButtonSprite.java
diff --git a/src/java/com/threerings/media/sprite/FadableImageSprite.java b/src/main/java/com/threerings/media/sprite/FadableImageSprite.java
similarity index 100%
rename from src/java/com/threerings/media/sprite/FadableImageSprite.java
rename to src/main/java/com/threerings/media/sprite/FadableImageSprite.java
diff --git a/src/java/com/threerings/media/sprite/ImageSprite.java b/src/main/java/com/threerings/media/sprite/ImageSprite.java
similarity index 100%
rename from src/java/com/threerings/media/sprite/ImageSprite.java
rename to src/main/java/com/threerings/media/sprite/ImageSprite.java
diff --git a/src/java/com/threerings/media/sprite/LabelSprite.java b/src/main/java/com/threerings/media/sprite/LabelSprite.java
similarity index 100%
rename from src/java/com/threerings/media/sprite/LabelSprite.java
rename to src/main/java/com/threerings/media/sprite/LabelSprite.java
diff --git a/src/java/com/threerings/media/sprite/OrientableImageSprite.java b/src/main/java/com/threerings/media/sprite/OrientableImageSprite.java
similarity index 100%
rename from src/java/com/threerings/media/sprite/OrientableImageSprite.java
rename to src/main/java/com/threerings/media/sprite/OrientableImageSprite.java
diff --git a/src/java/com/threerings/media/sprite/PathAdapter.java b/src/main/java/com/threerings/media/sprite/PathAdapter.java
similarity index 100%
rename from src/java/com/threerings/media/sprite/PathAdapter.java
rename to src/main/java/com/threerings/media/sprite/PathAdapter.java
diff --git a/src/java/com/threerings/media/sprite/PathObserver.java b/src/main/java/com/threerings/media/sprite/PathObserver.java
similarity index 100%
rename from src/java/com/threerings/media/sprite/PathObserver.java
rename to src/main/java/com/threerings/media/sprite/PathObserver.java
diff --git a/src/java/com/threerings/media/sprite/Sprite.java b/src/main/java/com/threerings/media/sprite/Sprite.java
similarity index 100%
rename from src/java/com/threerings/media/sprite/Sprite.java
rename to src/main/java/com/threerings/media/sprite/Sprite.java
diff --git a/src/java/com/threerings/media/sprite/SpriteIcon.java b/src/main/java/com/threerings/media/sprite/SpriteIcon.java
similarity index 100%
rename from src/java/com/threerings/media/sprite/SpriteIcon.java
rename to src/main/java/com/threerings/media/sprite/SpriteIcon.java
diff --git a/src/java/com/threerings/media/sprite/SpriteManager.java b/src/main/java/com/threerings/media/sprite/SpriteManager.java
similarity index 100%
rename from src/java/com/threerings/media/sprite/SpriteManager.java
rename to src/main/java/com/threerings/media/sprite/SpriteManager.java
diff --git a/src/java/com/threerings/media/sprite/action/ActionSprite.java b/src/main/java/com/threerings/media/sprite/action/ActionSprite.java
similarity index 100%
rename from src/java/com/threerings/media/sprite/action/ActionSprite.java
rename to src/main/java/com/threerings/media/sprite/action/ActionSprite.java
diff --git a/src/java/com/threerings/media/sprite/action/ArmingSprite.java b/src/main/java/com/threerings/media/sprite/action/ArmingSprite.java
similarity index 100%
rename from src/java/com/threerings/media/sprite/action/ArmingSprite.java
rename to src/main/java/com/threerings/media/sprite/action/ArmingSprite.java
diff --git a/src/java/com/threerings/media/sprite/action/CommandSprite.java b/src/main/java/com/threerings/media/sprite/action/CommandSprite.java
similarity index 100%
rename from src/java/com/threerings/media/sprite/action/CommandSprite.java
rename to src/main/java/com/threerings/media/sprite/action/CommandSprite.java
diff --git a/src/java/com/threerings/media/sprite/action/DisableableSprite.java b/src/main/java/com/threerings/media/sprite/action/DisableableSprite.java
similarity index 100%
rename from src/java/com/threerings/media/sprite/action/DisableableSprite.java
rename to src/main/java/com/threerings/media/sprite/action/DisableableSprite.java
diff --git a/src/java/com/threerings/media/sprite/action/HoverSprite.java b/src/main/java/com/threerings/media/sprite/action/HoverSprite.java
similarity index 100%
rename from src/java/com/threerings/media/sprite/action/HoverSprite.java
rename to src/main/java/com/threerings/media/sprite/action/HoverSprite.java
diff --git a/src/java/com/threerings/media/tile/BaseSizableTileSet.java b/src/main/java/com/threerings/media/tile/BaseSizableTileSet.java
similarity index 100%
rename from src/java/com/threerings/media/tile/BaseSizableTileSet.java
rename to src/main/java/com/threerings/media/tile/BaseSizableTileSet.java
diff --git a/src/java/com/threerings/media/tile/IMImageProvider.java b/src/main/java/com/threerings/media/tile/IMImageProvider.java
similarity index 100%
rename from src/java/com/threerings/media/tile/IMImageProvider.java
rename to src/main/java/com/threerings/media/tile/IMImageProvider.java
diff --git a/src/java/com/threerings/media/tile/ImageProvider.java b/src/main/java/com/threerings/media/tile/ImageProvider.java
similarity index 100%
rename from src/java/com/threerings/media/tile/ImageProvider.java
rename to src/main/java/com/threerings/media/tile/ImageProvider.java
diff --git a/src/java/com/threerings/media/tile/NoSuchTileSetException.java b/src/main/java/com/threerings/media/tile/NoSuchTileSetException.java
similarity index 100%
rename from src/java/com/threerings/media/tile/NoSuchTileSetException.java
rename to src/main/java/com/threerings/media/tile/NoSuchTileSetException.java
diff --git a/src/java/com/threerings/media/tile/ObjectTile.java b/src/main/java/com/threerings/media/tile/ObjectTile.java
similarity index 100%
rename from src/java/com/threerings/media/tile/ObjectTile.java
rename to src/main/java/com/threerings/media/tile/ObjectTile.java
diff --git a/src/java/com/threerings/media/tile/ObjectTileSet.java b/src/main/java/com/threerings/media/tile/ObjectTileSet.java
similarity index 100%
rename from src/java/com/threerings/media/tile/ObjectTileSet.java
rename to src/main/java/com/threerings/media/tile/ObjectTileSet.java
diff --git a/src/java/com/threerings/media/tile/RecolorableTileSet.java b/src/main/java/com/threerings/media/tile/RecolorableTileSet.java
similarity index 100%
rename from src/java/com/threerings/media/tile/RecolorableTileSet.java
rename to src/main/java/com/threerings/media/tile/RecolorableTileSet.java
diff --git a/src/java/com/threerings/media/tile/SimpleCachingImageProvider.java b/src/main/java/com/threerings/media/tile/SimpleCachingImageProvider.java
similarity index 100%
rename from src/java/com/threerings/media/tile/SimpleCachingImageProvider.java
rename to src/main/java/com/threerings/media/tile/SimpleCachingImageProvider.java
diff --git a/src/java/com/threerings/media/tile/SwissArmyTileSet.java b/src/main/java/com/threerings/media/tile/SwissArmyTileSet.java
similarity index 100%
rename from src/java/com/threerings/media/tile/SwissArmyTileSet.java
rename to src/main/java/com/threerings/media/tile/SwissArmyTileSet.java
diff --git a/src/java/com/threerings/media/tile/Tile.java b/src/main/java/com/threerings/media/tile/Tile.java
similarity index 100%
rename from src/java/com/threerings/media/tile/Tile.java
rename to src/main/java/com/threerings/media/tile/Tile.java
diff --git a/src/java/com/threerings/media/tile/TileIcon.java b/src/main/java/com/threerings/media/tile/TileIcon.java
similarity index 100%
rename from src/java/com/threerings/media/tile/TileIcon.java
rename to src/main/java/com/threerings/media/tile/TileIcon.java
diff --git a/src/java/com/threerings/media/tile/TileManager.java b/src/main/java/com/threerings/media/tile/TileManager.java
similarity index 100%
rename from src/java/com/threerings/media/tile/TileManager.java
rename to src/main/java/com/threerings/media/tile/TileManager.java
diff --git a/src/java/com/threerings/media/tile/TileMultiFrameImage.java b/src/main/java/com/threerings/media/tile/TileMultiFrameImage.java
similarity index 100%
rename from src/java/com/threerings/media/tile/TileMultiFrameImage.java
rename to src/main/java/com/threerings/media/tile/TileMultiFrameImage.java
diff --git a/src/java/com/threerings/media/tile/TileSet.java b/src/main/java/com/threerings/media/tile/TileSet.java
similarity index 100%
rename from src/java/com/threerings/media/tile/TileSet.java
rename to src/main/java/com/threerings/media/tile/TileSet.java
diff --git a/src/java/com/threerings/media/tile/TileSetIDBroker.java b/src/main/java/com/threerings/media/tile/TileSetIDBroker.java
similarity index 100%
rename from src/java/com/threerings/media/tile/TileSetIDBroker.java
rename to src/main/java/com/threerings/media/tile/TileSetIDBroker.java
diff --git a/src/java/com/threerings/media/tile/TileSetRepository.java b/src/main/java/com/threerings/media/tile/TileSetRepository.java
similarity index 100%
rename from src/java/com/threerings/media/tile/TileSetRepository.java
rename to src/main/java/com/threerings/media/tile/TileSetRepository.java
diff --git a/src/java/com/threerings/media/tile/TileSubsetMultiFrameImage.java b/src/main/java/com/threerings/media/tile/TileSubsetMultiFrameImage.java
similarity index 100%
rename from src/java/com/threerings/media/tile/TileSubsetMultiFrameImage.java
rename to src/main/java/com/threerings/media/tile/TileSubsetMultiFrameImage.java
diff --git a/src/java/com/threerings/media/tile/TileUtil.java b/src/main/java/com/threerings/media/tile/TileUtil.java
similarity index 100%
rename from src/java/com/threerings/media/tile/TileUtil.java
rename to src/main/java/com/threerings/media/tile/TileUtil.java
diff --git a/src/java/com/threerings/media/tile/TrimmedObjectTileSet.java b/src/main/java/com/threerings/media/tile/TrimmedObjectTileSet.java
similarity index 100%
rename from src/java/com/threerings/media/tile/TrimmedObjectTileSet.java
rename to src/main/java/com/threerings/media/tile/TrimmedObjectTileSet.java
diff --git a/src/java/com/threerings/media/tile/TrimmedTile.java b/src/main/java/com/threerings/media/tile/TrimmedTile.java
similarity index 100%
rename from src/java/com/threerings/media/tile/TrimmedTile.java
rename to src/main/java/com/threerings/media/tile/TrimmedTile.java
diff --git a/src/java/com/threerings/media/tile/TrimmedTileSet.java b/src/main/java/com/threerings/media/tile/TrimmedTileSet.java
similarity index 100%
rename from src/java/com/threerings/media/tile/TrimmedTileSet.java
rename to src/main/java/com/threerings/media/tile/TrimmedTileSet.java
diff --git a/src/java/com/threerings/media/tile/UniformTileSet.java b/src/main/java/com/threerings/media/tile/UniformTileSet.java
similarity index 100%
rename from src/java/com/threerings/media/tile/UniformTileSet.java
rename to src/main/java/com/threerings/media/tile/UniformTileSet.java
diff --git a/src/java/com/threerings/media/tile/bundle/BundleUtil.java b/src/main/java/com/threerings/media/tile/bundle/BundleUtil.java
similarity index 100%
rename from src/java/com/threerings/media/tile/bundle/BundleUtil.java
rename to src/main/java/com/threerings/media/tile/bundle/BundleUtil.java
diff --git a/src/java/com/threerings/media/tile/bundle/BundledTileSetRepository.java b/src/main/java/com/threerings/media/tile/bundle/BundledTileSetRepository.java
similarity index 100%
rename from src/java/com/threerings/media/tile/bundle/BundledTileSetRepository.java
rename to src/main/java/com/threerings/media/tile/bundle/BundledTileSetRepository.java
diff --git a/src/java/com/threerings/media/tile/bundle/TileSetBundle.java b/src/main/java/com/threerings/media/tile/bundle/TileSetBundle.java
similarity index 100%
rename from src/java/com/threerings/media/tile/bundle/TileSetBundle.java
rename to src/main/java/com/threerings/media/tile/bundle/TileSetBundle.java
diff --git a/src/java/com/threerings/media/tile/bundle/tools/DirectoryTileSetBundler.java b/src/main/java/com/threerings/media/tile/bundle/tools/DirectoryTileSetBundler.java
similarity index 100%
rename from src/java/com/threerings/media/tile/bundle/tools/DirectoryTileSetBundler.java
rename to src/main/java/com/threerings/media/tile/bundle/tools/DirectoryTileSetBundler.java
diff --git a/src/java/com/threerings/media/tile/bundle/tools/DirectoryTileSetBundlerTask.java b/src/main/java/com/threerings/media/tile/bundle/tools/DirectoryTileSetBundlerTask.java
similarity index 100%
rename from src/java/com/threerings/media/tile/bundle/tools/DirectoryTileSetBundlerTask.java
rename to src/main/java/com/threerings/media/tile/bundle/tools/DirectoryTileSetBundlerTask.java
diff --git a/src/java/com/threerings/media/tile/bundle/tools/DumpBundle.java b/src/main/java/com/threerings/media/tile/bundle/tools/DumpBundle.java
similarity index 100%
rename from src/java/com/threerings/media/tile/bundle/tools/DumpBundle.java
rename to src/main/java/com/threerings/media/tile/bundle/tools/DumpBundle.java
diff --git a/src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java b/src/main/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java
similarity index 100%
rename from src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java
rename to src/main/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java
diff --git a/src/java/com/threerings/media/tile/bundle/tools/TileSetBundlerTask.java b/src/main/java/com/threerings/media/tile/bundle/tools/TileSetBundlerTask.java
similarity index 100%
rename from src/java/com/threerings/media/tile/bundle/tools/TileSetBundlerTask.java
rename to src/main/java/com/threerings/media/tile/bundle/tools/TileSetBundlerTask.java
diff --git a/src/java/com/threerings/media/tile/tools/DumpTileSetMap.java b/src/main/java/com/threerings/media/tile/tools/DumpTileSetMap.java
similarity index 100%
rename from src/java/com/threerings/media/tile/tools/DumpTileSetMap.java
rename to src/main/java/com/threerings/media/tile/tools/DumpTileSetMap.java
diff --git a/src/java/com/threerings/media/tile/tools/MapFileTileSetIDBroker.java b/src/main/java/com/threerings/media/tile/tools/MapFileTileSetIDBroker.java
similarity index 100%
rename from src/java/com/threerings/media/tile/tools/MapFileTileSetIDBroker.java
rename to src/main/java/com/threerings/media/tile/tools/MapFileTileSetIDBroker.java
diff --git a/src/java/com/threerings/media/tile/tools/RenameTileSet.java b/src/main/java/com/threerings/media/tile/tools/RenameTileSet.java
similarity index 100%
rename from src/java/com/threerings/media/tile/tools/RenameTileSet.java
rename to src/main/java/com/threerings/media/tile/tools/RenameTileSet.java
diff --git a/src/java/com/threerings/media/tile/tools/xml/ObjectTileSetRuleSet.java b/src/main/java/com/threerings/media/tile/tools/xml/ObjectTileSetRuleSet.java
similarity index 100%
rename from src/java/com/threerings/media/tile/tools/xml/ObjectTileSetRuleSet.java
rename to src/main/java/com/threerings/media/tile/tools/xml/ObjectTileSetRuleSet.java
diff --git a/src/java/com/threerings/media/tile/tools/xml/SwissArmyTileSetRuleSet.java b/src/main/java/com/threerings/media/tile/tools/xml/SwissArmyTileSetRuleSet.java
similarity index 100%
rename from src/java/com/threerings/media/tile/tools/xml/SwissArmyTileSetRuleSet.java
rename to src/main/java/com/threerings/media/tile/tools/xml/SwissArmyTileSetRuleSet.java
diff --git a/src/java/com/threerings/media/tile/tools/xml/TileSetRuleSet.java b/src/main/java/com/threerings/media/tile/tools/xml/TileSetRuleSet.java
similarity index 100%
rename from src/java/com/threerings/media/tile/tools/xml/TileSetRuleSet.java
rename to src/main/java/com/threerings/media/tile/tools/xml/TileSetRuleSet.java
diff --git a/src/java/com/threerings/media/tile/tools/xml/UniformTileSetRuleSet.java b/src/main/java/com/threerings/media/tile/tools/xml/UniformTileSetRuleSet.java
similarity index 100%
rename from src/java/com/threerings/media/tile/tools/xml/UniformTileSetRuleSet.java
rename to src/main/java/com/threerings/media/tile/tools/xml/UniformTileSetRuleSet.java
diff --git a/src/java/com/threerings/media/tile/tools/xml/XMLTileSetParser.java b/src/main/java/com/threerings/media/tile/tools/xml/XMLTileSetParser.java
similarity index 100%
rename from src/java/com/threerings/media/tile/tools/xml/XMLTileSetParser.java
rename to src/main/java/com/threerings/media/tile/tools/xml/XMLTileSetParser.java
diff --git a/src/java/com/threerings/media/tile/util/TileSetTrimmer.java b/src/main/java/com/threerings/media/tile/util/TileSetTrimmer.java
similarity index 100%
rename from src/java/com/threerings/media/tile/util/TileSetTrimmer.java
rename to src/main/java/com/threerings/media/tile/util/TileSetTrimmer.java
diff --git a/src/java/com/threerings/media/timer/CalibratingTimer.java b/src/main/java/com/threerings/media/timer/CalibratingTimer.java
similarity index 100%
rename from src/java/com/threerings/media/timer/CalibratingTimer.java
rename to src/main/java/com/threerings/media/timer/CalibratingTimer.java
diff --git a/src/java/com/threerings/media/timer/MediaTimer.java b/src/main/java/com/threerings/media/timer/MediaTimer.java
similarity index 100%
rename from src/java/com/threerings/media/timer/MediaTimer.java
rename to src/main/java/com/threerings/media/timer/MediaTimer.java
diff --git a/src/java/com/threerings/media/timer/MillisTimer.java b/src/main/java/com/threerings/media/timer/MillisTimer.java
similarity index 100%
rename from src/java/com/threerings/media/timer/MillisTimer.java
rename to src/main/java/com/threerings/media/timer/MillisTimer.java
diff --git a/src/java/com/threerings/media/timer/NanoTimer.java b/src/main/java/com/threerings/media/timer/NanoTimer.java
similarity index 100%
rename from src/java/com/threerings/media/timer/NanoTimer.java
rename to src/main/java/com/threerings/media/timer/NanoTimer.java
diff --git a/src/java/com/threerings/media/timer/PerfTimer.java b/src/main/java/com/threerings/media/timer/PerfTimer.java
similarity index 100%
rename from src/java/com/threerings/media/timer/PerfTimer.java
rename to src/main/java/com/threerings/media/timer/PerfTimer.java
diff --git a/src/java/com/threerings/media/tools/RecolorImage.java b/src/main/java/com/threerings/media/tools/RecolorImage.java
similarity index 100%
rename from src/java/com/threerings/media/tools/RecolorImage.java
rename to src/main/java/com/threerings/media/tools/RecolorImage.java
diff --git a/src/java/com/threerings/media/tools/ResourceIndexerTask.java b/src/main/java/com/threerings/media/tools/ResourceIndexerTask.java
similarity index 100%
rename from src/java/com/threerings/media/tools/ResourceIndexerTask.java
rename to src/main/java/com/threerings/media/tools/ResourceIndexerTask.java
diff --git a/src/java/com/threerings/media/util/AStarPathUtil.java b/src/main/java/com/threerings/media/util/AStarPathUtil.java
similarity index 100%
rename from src/java/com/threerings/media/util/AStarPathUtil.java
rename to src/main/java/com/threerings/media/util/AStarPathUtil.java
diff --git a/src/java/com/threerings/media/util/ArcPath.java b/src/main/java/com/threerings/media/util/ArcPath.java
similarity index 100%
rename from src/java/com/threerings/media/util/ArcPath.java
rename to src/main/java/com/threerings/media/util/ArcPath.java
diff --git a/src/java/com/threerings/media/util/BackgroundTiler.java b/src/main/java/com/threerings/media/util/BackgroundTiler.java
similarity index 100%
rename from src/java/com/threerings/media/util/BackgroundTiler.java
rename to src/main/java/com/threerings/media/util/BackgroundTiler.java
diff --git a/src/java/com/threerings/media/util/BobblePath.java b/src/main/java/com/threerings/media/util/BobblePath.java
similarity index 100%
rename from src/java/com/threerings/media/util/BobblePath.java
rename to src/main/java/com/threerings/media/util/BobblePath.java
diff --git a/src/java/com/threerings/media/util/DelayPath.java b/src/main/java/com/threerings/media/util/DelayPath.java
similarity index 100%
rename from src/java/com/threerings/media/util/DelayPath.java
rename to src/main/java/com/threerings/media/util/DelayPath.java
diff --git a/src/java/com/threerings/media/util/DelegatingPathable.java b/src/main/java/com/threerings/media/util/DelegatingPathable.java
similarity index 100%
rename from src/java/com/threerings/media/util/DelegatingPathable.java
rename to src/main/java/com/threerings/media/util/DelegatingPathable.java
diff --git a/src/java/com/threerings/media/util/FrameSequencer.java b/src/main/java/com/threerings/media/util/FrameSequencer.java
similarity index 100%
rename from src/java/com/threerings/media/util/FrameSequencer.java
rename to src/main/java/com/threerings/media/util/FrameSequencer.java
diff --git a/src/java/com/threerings/media/util/LinePath.java b/src/main/java/com/threerings/media/util/LinePath.java
similarity index 100%
rename from src/java/com/threerings/media/util/LinePath.java
rename to src/main/java/com/threerings/media/util/LinePath.java
diff --git a/src/java/com/threerings/media/util/LineSegmentPath.java b/src/main/java/com/threerings/media/util/LineSegmentPath.java
similarity index 100%
rename from src/java/com/threerings/media/util/LineSegmentPath.java
rename to src/main/java/com/threerings/media/util/LineSegmentPath.java
diff --git a/src/java/com/threerings/media/util/LinearTimeFunction.java b/src/main/java/com/threerings/media/util/LinearTimeFunction.java
similarity index 100%
rename from src/java/com/threerings/media/util/LinearTimeFunction.java
rename to src/main/java/com/threerings/media/util/LinearTimeFunction.java
diff --git a/src/java/com/threerings/media/util/MathUtil.java b/src/main/java/com/threerings/media/util/MathUtil.java
similarity index 100%
rename from src/java/com/threerings/media/util/MathUtil.java
rename to src/main/java/com/threerings/media/util/MathUtil.java
diff --git a/src/java/com/threerings/media/util/ModeUtil.java b/src/main/java/com/threerings/media/util/ModeUtil.java
similarity index 100%
rename from src/java/com/threerings/media/util/ModeUtil.java
rename to src/main/java/com/threerings/media/util/ModeUtil.java
diff --git a/src/java/com/threerings/media/util/MultiFrameImage.java b/src/main/java/com/threerings/media/util/MultiFrameImage.java
similarity index 100%
rename from src/java/com/threerings/media/util/MultiFrameImage.java
rename to src/main/java/com/threerings/media/util/MultiFrameImage.java
diff --git a/src/java/com/threerings/media/util/MultiFrameImageImpl.java b/src/main/java/com/threerings/media/util/MultiFrameImageImpl.java
similarity index 100%
rename from src/java/com/threerings/media/util/MultiFrameImageImpl.java
rename to src/main/java/com/threerings/media/util/MultiFrameImageImpl.java
diff --git a/src/java/com/threerings/media/util/Path.java b/src/main/java/com/threerings/media/util/Path.java
similarity index 100%
rename from src/java/com/threerings/media/util/Path.java
rename to src/main/java/com/threerings/media/util/Path.java
diff --git a/src/java/com/threerings/media/util/PathNode.java b/src/main/java/com/threerings/media/util/PathNode.java
similarity index 100%
rename from src/java/com/threerings/media/util/PathNode.java
rename to src/main/java/com/threerings/media/util/PathNode.java
diff --git a/src/java/com/threerings/media/util/PathSequence.java b/src/main/java/com/threerings/media/util/PathSequence.java
similarity index 100%
rename from src/java/com/threerings/media/util/PathSequence.java
rename to src/main/java/com/threerings/media/util/PathSequence.java
diff --git a/src/java/com/threerings/media/util/Pathable.java b/src/main/java/com/threerings/media/util/Pathable.java
similarity index 100%
rename from src/java/com/threerings/media/util/Pathable.java
rename to src/main/java/com/threerings/media/util/Pathable.java
diff --git a/src/java/com/threerings/media/util/PerformanceMonitor.java b/src/main/java/com/threerings/media/util/PerformanceMonitor.java
similarity index 100%
rename from src/java/com/threerings/media/util/PerformanceMonitor.java
rename to src/main/java/com/threerings/media/util/PerformanceMonitor.java
diff --git a/src/java/com/threerings/media/util/PerformanceObserver.java b/src/main/java/com/threerings/media/util/PerformanceObserver.java
similarity index 100%
rename from src/java/com/threerings/media/util/PerformanceObserver.java
rename to src/main/java/com/threerings/media/util/PerformanceObserver.java
diff --git a/src/java/com/threerings/media/util/SingleFrameImageImpl.java b/src/main/java/com/threerings/media/util/SingleFrameImageImpl.java
similarity index 100%
rename from src/java/com/threerings/media/util/SingleFrameImageImpl.java
rename to src/main/java/com/threerings/media/util/SingleFrameImageImpl.java
diff --git a/src/java/com/threerings/media/util/SingleTileImageImpl.java b/src/main/java/com/threerings/media/util/SingleTileImageImpl.java
similarity index 100%
rename from src/java/com/threerings/media/util/SingleTileImageImpl.java
rename to src/main/java/com/threerings/media/util/SingleTileImageImpl.java
diff --git a/src/java/com/threerings/media/util/SmoothBobblePath.java b/src/main/java/com/threerings/media/util/SmoothBobblePath.java
similarity index 100%
rename from src/java/com/threerings/media/util/SmoothBobblePath.java
rename to src/main/java/com/threerings/media/util/SmoothBobblePath.java
diff --git a/src/java/com/threerings/media/util/TiledArea.java b/src/main/java/com/threerings/media/util/TiledArea.java
similarity index 100%
rename from src/java/com/threerings/media/util/TiledArea.java
rename to src/main/java/com/threerings/media/util/TiledArea.java
diff --git a/src/java/com/threerings/media/util/TimeFunction.java b/src/main/java/com/threerings/media/util/TimeFunction.java
similarity index 100%
rename from src/java/com/threerings/media/util/TimeFunction.java
rename to src/main/java/com/threerings/media/util/TimeFunction.java
diff --git a/src/java/com/threerings/media/util/TimedPath.java b/src/main/java/com/threerings/media/util/TimedPath.java
similarity index 100%
rename from src/java/com/threerings/media/util/TimedPath.java
rename to src/main/java/com/threerings/media/util/TimedPath.java
diff --git a/src/java/com/threerings/media/util/TrailingAverage.java b/src/main/java/com/threerings/media/util/TrailingAverage.java
similarity index 100%
rename from src/java/com/threerings/media/util/TrailingAverage.java
rename to src/main/java/com/threerings/media/util/TrailingAverage.java
diff --git a/src/java/com/threerings/miso/Log.java b/src/main/java/com/threerings/miso/Log.java
similarity index 100%
rename from src/java/com/threerings/miso/Log.java
rename to src/main/java/com/threerings/miso/Log.java
diff --git a/src/java/com/threerings/miso/MisoConfig.java b/src/main/java/com/threerings/miso/MisoConfig.java
similarity index 100%
rename from src/java/com/threerings/miso/MisoConfig.java
rename to src/main/java/com/threerings/miso/MisoConfig.java
diff --git a/src/java/com/threerings/miso/MisoPrefs.java b/src/main/java/com/threerings/miso/MisoPrefs.java
similarity index 100%
rename from src/java/com/threerings/miso/MisoPrefs.java
rename to src/main/java/com/threerings/miso/MisoPrefs.java
diff --git a/src/java/com/threerings/miso/client/DirtyItemList.java b/src/main/java/com/threerings/miso/client/DirtyItemList.java
similarity index 100%
rename from src/java/com/threerings/miso/client/DirtyItemList.java
rename to src/main/java/com/threerings/miso/client/DirtyItemList.java
diff --git a/src/java/com/threerings/miso/client/MisoScenePanel.java b/src/main/java/com/threerings/miso/client/MisoScenePanel.java
similarity index 100%
rename from src/java/com/threerings/miso/client/MisoScenePanel.java
rename to src/main/java/com/threerings/miso/client/MisoScenePanel.java
diff --git a/src/java/com/threerings/miso/client/MultiTileSprite.java b/src/main/java/com/threerings/miso/client/MultiTileSprite.java
similarity index 100%
rename from src/java/com/threerings/miso/client/MultiTileSprite.java
rename to src/main/java/com/threerings/miso/client/MultiTileSprite.java
diff --git a/src/java/com/threerings/miso/client/ObjectActionHandler.java b/src/main/java/com/threerings/miso/client/ObjectActionHandler.java
similarity index 100%
rename from src/java/com/threerings/miso/client/ObjectActionHandler.java
rename to src/main/java/com/threerings/miso/client/ObjectActionHandler.java
diff --git a/src/java/com/threerings/miso/client/ResolutionView.java b/src/main/java/com/threerings/miso/client/ResolutionView.java
similarity index 100%
rename from src/java/com/threerings/miso/client/ResolutionView.java
rename to src/main/java/com/threerings/miso/client/ResolutionView.java
diff --git a/src/java/com/threerings/miso/client/RethinkOp.java b/src/main/java/com/threerings/miso/client/RethinkOp.java
similarity index 100%
rename from src/java/com/threerings/miso/client/RethinkOp.java
rename to src/main/java/com/threerings/miso/client/RethinkOp.java
diff --git a/src/java/com/threerings/miso/client/SceneBlock.java b/src/main/java/com/threerings/miso/client/SceneBlock.java
similarity index 100%
rename from src/java/com/threerings/miso/client/SceneBlock.java
rename to src/main/java/com/threerings/miso/client/SceneBlock.java
diff --git a/src/java/com/threerings/miso/client/SceneBlockResolver.java b/src/main/java/com/threerings/miso/client/SceneBlockResolver.java
similarity index 100%
rename from src/java/com/threerings/miso/client/SceneBlockResolver.java
rename to src/main/java/com/threerings/miso/client/SceneBlockResolver.java
diff --git a/src/java/com/threerings/miso/client/SceneObject.java b/src/main/java/com/threerings/miso/client/SceneObject.java
similarity index 100%
rename from src/java/com/threerings/miso/client/SceneObject.java
rename to src/main/java/com/threerings/miso/client/SceneObject.java
diff --git a/src/java/com/threerings/miso/client/SceneObjectActionEvent.java b/src/main/java/com/threerings/miso/client/SceneObjectActionEvent.java
similarity index 100%
rename from src/java/com/threerings/miso/client/SceneObjectActionEvent.java
rename to src/main/java/com/threerings/miso/client/SceneObjectActionEvent.java
diff --git a/src/java/com/threerings/miso/client/SceneObjectIndicator.java b/src/main/java/com/threerings/miso/client/SceneObjectIndicator.java
similarity index 100%
rename from src/java/com/threerings/miso/client/SceneObjectIndicator.java
rename to src/main/java/com/threerings/miso/client/SceneObjectIndicator.java
diff --git a/src/java/com/threerings/miso/client/SceneObjectTip.java b/src/main/java/com/threerings/miso/client/SceneObjectTip.java
similarity index 100%
rename from src/java/com/threerings/miso/client/SceneObjectTip.java
rename to src/main/java/com/threerings/miso/client/SceneObjectTip.java
diff --git a/src/java/com/threerings/miso/client/TileOp.java b/src/main/java/com/threerings/miso/client/TileOp.java
similarity index 100%
rename from src/java/com/threerings/miso/client/TileOp.java
rename to src/main/java/com/threerings/miso/client/TileOp.java
diff --git a/src/java/com/threerings/miso/client/TileOpApplicator.java b/src/main/java/com/threerings/miso/client/TileOpApplicator.java
similarity index 100%
rename from src/java/com/threerings/miso/client/TileOpApplicator.java
rename to src/main/java/com/threerings/miso/client/TileOpApplicator.java
diff --git a/src/java/com/threerings/miso/client/TilePath.java b/src/main/java/com/threerings/miso/client/TilePath.java
similarity index 100%
rename from src/java/com/threerings/miso/client/TilePath.java
rename to src/main/java/com/threerings/miso/client/TilePath.java
diff --git a/src/java/com/threerings/miso/data/MisoSceneModel.java b/src/main/java/com/threerings/miso/data/MisoSceneModel.java
similarity index 100%
rename from src/java/com/threerings/miso/data/MisoSceneModel.java
rename to src/main/java/com/threerings/miso/data/MisoSceneModel.java
diff --git a/src/java/com/threerings/miso/data/ObjectInfo.java b/src/main/java/com/threerings/miso/data/ObjectInfo.java
similarity index 100%
rename from src/java/com/threerings/miso/data/ObjectInfo.java
rename to src/main/java/com/threerings/miso/data/ObjectInfo.java
diff --git a/src/java/com/threerings/miso/data/SimpleMisoSceneModel.java b/src/main/java/com/threerings/miso/data/SimpleMisoSceneModel.java
similarity index 100%
rename from src/java/com/threerings/miso/data/SimpleMisoSceneModel.java
rename to src/main/java/com/threerings/miso/data/SimpleMisoSceneModel.java
diff --git a/src/java/com/threerings/miso/data/SparseMisoSceneModel.java b/src/main/java/com/threerings/miso/data/SparseMisoSceneModel.java
similarity index 100%
rename from src/java/com/threerings/miso/data/SparseMisoSceneModel.java
rename to src/main/java/com/threerings/miso/data/SparseMisoSceneModel.java
diff --git a/src/java/com/threerings/miso/data/VirtualMisoSceneModel.java b/src/main/java/com/threerings/miso/data/VirtualMisoSceneModel.java
similarity index 100%
rename from src/java/com/threerings/miso/data/VirtualMisoSceneModel.java
rename to src/main/java/com/threerings/miso/data/VirtualMisoSceneModel.java
diff --git a/src/java/com/threerings/miso/tile/AutoFringer.java b/src/main/java/com/threerings/miso/tile/AutoFringer.java
similarity index 100%
rename from src/java/com/threerings/miso/tile/AutoFringer.java
rename to src/main/java/com/threerings/miso/tile/AutoFringer.java
diff --git a/src/java/com/threerings/miso/tile/BaseTile.java b/src/main/java/com/threerings/miso/tile/BaseTile.java
similarity index 100%
rename from src/java/com/threerings/miso/tile/BaseTile.java
rename to src/main/java/com/threerings/miso/tile/BaseTile.java
diff --git a/src/java/com/threerings/miso/tile/BaseTileSet.java b/src/main/java/com/threerings/miso/tile/BaseTileSet.java
similarity index 100%
rename from src/java/com/threerings/miso/tile/BaseTileSet.java
rename to src/main/java/com/threerings/miso/tile/BaseTileSet.java
diff --git a/src/java/com/threerings/miso/tile/FringeConfiguration.java b/src/main/java/com/threerings/miso/tile/FringeConfiguration.java
similarity index 100%
rename from src/java/com/threerings/miso/tile/FringeConfiguration.java
rename to src/main/java/com/threerings/miso/tile/FringeConfiguration.java
diff --git a/src/java/com/threerings/miso/tile/MisoTileManager.java b/src/main/java/com/threerings/miso/tile/MisoTileManager.java
similarity index 100%
rename from src/java/com/threerings/miso/tile/MisoTileManager.java
rename to src/main/java/com/threerings/miso/tile/MisoTileManager.java
diff --git a/src/java/com/threerings/miso/tile/tools/CompileFringeConfigurationTask.java b/src/main/java/com/threerings/miso/tile/tools/CompileFringeConfigurationTask.java
similarity index 100%
rename from src/java/com/threerings/miso/tile/tools/CompileFringeConfigurationTask.java
rename to src/main/java/com/threerings/miso/tile/tools/CompileFringeConfigurationTask.java
diff --git a/src/java/com/threerings/miso/tile/tools/xml/BaseTileSetRuleSet.java b/src/main/java/com/threerings/miso/tile/tools/xml/BaseTileSetRuleSet.java
similarity index 100%
rename from src/java/com/threerings/miso/tile/tools/xml/BaseTileSetRuleSet.java
rename to src/main/java/com/threerings/miso/tile/tools/xml/BaseTileSetRuleSet.java
diff --git a/src/java/com/threerings/miso/tile/tools/xml/FringeConfigurationParser.java b/src/main/java/com/threerings/miso/tile/tools/xml/FringeConfigurationParser.java
similarity index 100%
rename from src/java/com/threerings/miso/tile/tools/xml/FringeConfigurationParser.java
rename to src/main/java/com/threerings/miso/tile/tools/xml/FringeConfigurationParser.java
diff --git a/src/java/com/threerings/miso/tools/xml/SimpleMisoSceneParser.java b/src/main/java/com/threerings/miso/tools/xml/SimpleMisoSceneParser.java
similarity index 100%
rename from src/java/com/threerings/miso/tools/xml/SimpleMisoSceneParser.java
rename to src/main/java/com/threerings/miso/tools/xml/SimpleMisoSceneParser.java
diff --git a/src/java/com/threerings/miso/tools/xml/SimpleMisoSceneRuleSet.java b/src/main/java/com/threerings/miso/tools/xml/SimpleMisoSceneRuleSet.java
similarity index 100%
rename from src/java/com/threerings/miso/tools/xml/SimpleMisoSceneRuleSet.java
rename to src/main/java/com/threerings/miso/tools/xml/SimpleMisoSceneRuleSet.java
diff --git a/src/java/com/threerings/miso/tools/xml/SimpleMisoSceneWriter.java b/src/main/java/com/threerings/miso/tools/xml/SimpleMisoSceneWriter.java
similarity index 100%
rename from src/java/com/threerings/miso/tools/xml/SimpleMisoSceneWriter.java
rename to src/main/java/com/threerings/miso/tools/xml/SimpleMisoSceneWriter.java
diff --git a/src/java/com/threerings/miso/tools/xml/SparseMisoSceneParser.java b/src/main/java/com/threerings/miso/tools/xml/SparseMisoSceneParser.java
similarity index 100%
rename from src/java/com/threerings/miso/tools/xml/SparseMisoSceneParser.java
rename to src/main/java/com/threerings/miso/tools/xml/SparseMisoSceneParser.java
diff --git a/src/java/com/threerings/miso/tools/xml/SparseMisoSceneRuleSet.java b/src/main/java/com/threerings/miso/tools/xml/SparseMisoSceneRuleSet.java
similarity index 100%
rename from src/java/com/threerings/miso/tools/xml/SparseMisoSceneRuleSet.java
rename to src/main/java/com/threerings/miso/tools/xml/SparseMisoSceneRuleSet.java
diff --git a/src/java/com/threerings/miso/tools/xml/SparseMisoSceneWriter.java b/src/main/java/com/threerings/miso/tools/xml/SparseMisoSceneWriter.java
similarity index 100%
rename from src/java/com/threerings/miso/tools/xml/SparseMisoSceneWriter.java
rename to src/main/java/com/threerings/miso/tools/xml/SparseMisoSceneWriter.java
diff --git a/src/java/com/threerings/miso/util/MisoContext.java b/src/main/java/com/threerings/miso/util/MisoContext.java
similarity index 100%
rename from src/java/com/threerings/miso/util/MisoContext.java
rename to src/main/java/com/threerings/miso/util/MisoContext.java
diff --git a/src/java/com/threerings/miso/util/MisoSceneMetrics.java b/src/main/java/com/threerings/miso/util/MisoSceneMetrics.java
similarity index 100%
rename from src/java/com/threerings/miso/util/MisoSceneMetrics.java
rename to src/main/java/com/threerings/miso/util/MisoSceneMetrics.java
diff --git a/src/java/com/threerings/miso/util/MisoUtil.java b/src/main/java/com/threerings/miso/util/MisoUtil.java
similarity index 100%
rename from src/java/com/threerings/miso/util/MisoUtil.java
rename to src/main/java/com/threerings/miso/util/MisoUtil.java
diff --git a/src/java/com/threerings/miso/util/ObjectSet.java b/src/main/java/com/threerings/miso/util/ObjectSet.java
similarity index 100%
rename from src/java/com/threerings/miso/util/ObjectSet.java
rename to src/main/java/com/threerings/miso/util/ObjectSet.java
diff --git a/src/java/com/threerings/openal/BlankSound.java b/src/main/java/com/threerings/openal/BlankSound.java
similarity index 100%
rename from src/java/com/threerings/openal/BlankSound.java
rename to src/main/java/com/threerings/openal/BlankSound.java
diff --git a/src/java/com/threerings/openal/Buffer.java b/src/main/java/com/threerings/openal/Buffer.java
similarity index 100%
rename from src/java/com/threerings/openal/Buffer.java
rename to src/main/java/com/threerings/openal/Buffer.java
diff --git a/src/java/com/threerings/openal/Clip.java b/src/main/java/com/threerings/openal/Clip.java
similarity index 100%
rename from src/java/com/threerings/openal/Clip.java
rename to src/main/java/com/threerings/openal/Clip.java
diff --git a/src/java/com/threerings/openal/ClipBuffer.java b/src/main/java/com/threerings/openal/ClipBuffer.java
similarity index 100%
rename from src/java/com/threerings/openal/ClipBuffer.java
rename to src/main/java/com/threerings/openal/ClipBuffer.java
diff --git a/src/java/com/threerings/openal/ClipProvider.java b/src/main/java/com/threerings/openal/ClipProvider.java
similarity index 100%
rename from src/java/com/threerings/openal/ClipProvider.java
rename to src/main/java/com/threerings/openal/ClipProvider.java
diff --git a/src/java/com/threerings/openal/FileStream.java b/src/main/java/com/threerings/openal/FileStream.java
similarity index 100%
rename from src/java/com/threerings/openal/FileStream.java
rename to src/main/java/com/threerings/openal/FileStream.java
diff --git a/src/java/com/threerings/openal/Listener.java b/src/main/java/com/threerings/openal/Listener.java
similarity index 100%
rename from src/java/com/threerings/openal/Listener.java
rename to src/main/java/com/threerings/openal/Listener.java
diff --git a/src/java/com/threerings/openal/Log.java b/src/main/java/com/threerings/openal/Log.java
similarity index 100%
rename from src/java/com/threerings/openal/Log.java
rename to src/main/java/com/threerings/openal/Log.java
diff --git a/src/java/com/threerings/openal/Mp3StreamDecoder.java b/src/main/java/com/threerings/openal/Mp3StreamDecoder.java
similarity index 100%
rename from src/java/com/threerings/openal/Mp3StreamDecoder.java
rename to src/main/java/com/threerings/openal/Mp3StreamDecoder.java
diff --git a/src/java/com/threerings/openal/OggStreamDecoder.java b/src/main/java/com/threerings/openal/OggStreamDecoder.java
similarity index 100%
rename from src/java/com/threerings/openal/OggStreamDecoder.java
rename to src/main/java/com/threerings/openal/OggStreamDecoder.java
diff --git a/src/java/com/threerings/openal/OpenALSoundPlayer.java b/src/main/java/com/threerings/openal/OpenALSoundPlayer.java
similarity index 100%
rename from src/java/com/threerings/openal/OpenALSoundPlayer.java
rename to src/main/java/com/threerings/openal/OpenALSoundPlayer.java
diff --git a/src/java/com/threerings/openal/Sound.java b/src/main/java/com/threerings/openal/Sound.java
similarity index 100%
rename from src/java/com/threerings/openal/Sound.java
rename to src/main/java/com/threerings/openal/Sound.java
diff --git a/src/java/com/threerings/openal/SoundGroup.java b/src/main/java/com/threerings/openal/SoundGroup.java
similarity index 100%
rename from src/java/com/threerings/openal/SoundGroup.java
rename to src/main/java/com/threerings/openal/SoundGroup.java
diff --git a/src/java/com/threerings/openal/SoundManager.java b/src/main/java/com/threerings/openal/SoundManager.java
similarity index 100%
rename from src/java/com/threerings/openal/SoundManager.java
rename to src/main/java/com/threerings/openal/SoundManager.java
diff --git a/src/java/com/threerings/openal/Source.java b/src/main/java/com/threerings/openal/Source.java
similarity index 100%
rename from src/java/com/threerings/openal/Source.java
rename to src/main/java/com/threerings/openal/Source.java
diff --git a/src/java/com/threerings/openal/Stream.java b/src/main/java/com/threerings/openal/Stream.java
similarity index 100%
rename from src/java/com/threerings/openal/Stream.java
rename to src/main/java/com/threerings/openal/Stream.java
diff --git a/src/java/com/threerings/openal/StreamDecoder.java b/src/main/java/com/threerings/openal/StreamDecoder.java
similarity index 100%
rename from src/java/com/threerings/openal/StreamDecoder.java
rename to src/main/java/com/threerings/openal/StreamDecoder.java
diff --git a/src/java/com/threerings/openal/WaveDataClipProvider.java b/src/main/java/com/threerings/openal/WaveDataClipProvider.java
similarity index 100%
rename from src/java/com/threerings/openal/WaveDataClipProvider.java
rename to src/main/java/com/threerings/openal/WaveDataClipProvider.java
diff --git a/src/java/com/threerings/resource/FastImageIO.java b/src/main/java/com/threerings/resource/FastImageIO.java
similarity index 100%
rename from src/java/com/threerings/resource/FastImageIO.java
rename to src/main/java/com/threerings/resource/FastImageIO.java
diff --git a/src/java/com/threerings/resource/FileResourceBundle.java b/src/main/java/com/threerings/resource/FileResourceBundle.java
similarity index 100%
rename from src/java/com/threerings/resource/FileResourceBundle.java
rename to src/main/java/com/threerings/resource/FileResourceBundle.java
diff --git a/src/java/com/threerings/resource/Handler.java b/src/main/java/com/threerings/resource/Handler.java
similarity index 100%
rename from src/java/com/threerings/resource/Handler.java
rename to src/main/java/com/threerings/resource/Handler.java
diff --git a/src/java/com/threerings/resource/KnownAvailabilityResourceBundle.java b/src/main/java/com/threerings/resource/KnownAvailabilityResourceBundle.java
similarity index 100%
rename from src/java/com/threerings/resource/KnownAvailabilityResourceBundle.java
rename to src/main/java/com/threerings/resource/KnownAvailabilityResourceBundle.java
diff --git a/src/java/com/threerings/resource/Log.java b/src/main/java/com/threerings/resource/Log.java
similarity index 100%
rename from src/java/com/threerings/resource/Log.java
rename to src/main/java/com/threerings/resource/Log.java
diff --git a/src/java/com/threerings/resource/NetworkResourceBundle.java b/src/main/java/com/threerings/resource/NetworkResourceBundle.java
similarity index 100%
rename from src/java/com/threerings/resource/NetworkResourceBundle.java
rename to src/main/java/com/threerings/resource/NetworkResourceBundle.java
diff --git a/src/java/com/threerings/resource/ResourceBundle.java b/src/main/java/com/threerings/resource/ResourceBundle.java
similarity index 100%
rename from src/java/com/threerings/resource/ResourceBundle.java
rename to src/main/java/com/threerings/resource/ResourceBundle.java
diff --git a/src/java/com/threerings/resource/ResourceManager.java b/src/main/java/com/threerings/resource/ResourceManager.java
similarity index 100%
rename from src/java/com/threerings/resource/ResourceManager.java
rename to src/main/java/com/threerings/resource/ResourceManager.java
diff --git a/src/java/com/threerings/tools/CompiledConfigTask.java b/src/main/java/com/threerings/tools/CompiledConfigTask.java
similarity index 100%
rename from src/java/com/threerings/tools/CompiledConfigTask.java
rename to src/main/java/com/threerings/tools/CompiledConfigTask.java
diff --git a/src/java/com/threerings/tools/xml/CompiledConfigParser.java b/src/main/java/com/threerings/tools/xml/CompiledConfigParser.java
similarity index 100%
rename from src/java/com/threerings/tools/xml/CompiledConfigParser.java
rename to src/main/java/com/threerings/tools/xml/CompiledConfigParser.java
diff --git a/src/java/com/threerings/tools/xml/NestableRuleSet.java b/src/main/java/com/threerings/tools/xml/NestableRuleSet.java
similarity index 100%
rename from src/java/com/threerings/tools/xml/NestableRuleSet.java
rename to src/main/java/com/threerings/tools/xml/NestableRuleSet.java
diff --git a/src/java/com/threerings/tools/xml/NestableWriter.java b/src/main/java/com/threerings/tools/xml/NestableWriter.java
similarity index 100%
rename from src/java/com/threerings/tools/xml/NestableWriter.java
rename to src/main/java/com/threerings/tools/xml/NestableWriter.java
diff --git a/src/java/com/threerings/util/BrowserUtil.java b/src/main/java/com/threerings/util/BrowserUtil.java
similarity index 100%
rename from src/java/com/threerings/util/BrowserUtil.java
rename to src/main/java/com/threerings/util/BrowserUtil.java
diff --git a/src/java/com/threerings/util/CompiledConfig.java b/src/main/java/com/threerings/util/CompiledConfig.java
similarity index 100%
rename from src/java/com/threerings/util/CompiledConfig.java
rename to src/main/java/com/threerings/util/CompiledConfig.java
diff --git a/src/java/com/threerings/util/DirectionCodes.java b/src/main/java/com/threerings/util/DirectionCodes.java
similarity index 100%
rename from src/java/com/threerings/util/DirectionCodes.java
rename to src/main/java/com/threerings/util/DirectionCodes.java
diff --git a/src/java/com/threerings/util/DirectionUtil.java b/src/main/java/com/threerings/util/DirectionUtil.java
similarity index 100%
rename from src/java/com/threerings/util/DirectionUtil.java
rename to src/main/java/com/threerings/util/DirectionUtil.java
diff --git a/src/java/com/threerings/util/FileUtil.java b/src/main/java/com/threerings/util/FileUtil.java
similarity index 100%
rename from src/java/com/threerings/util/FileUtil.java
rename to src/main/java/com/threerings/util/FileUtil.java
diff --git a/src/java/com/threerings/util/IdleTracker.java b/src/main/java/com/threerings/util/IdleTracker.java
similarity index 100%
rename from src/java/com/threerings/util/IdleTracker.java
rename to src/main/java/com/threerings/util/IdleTracker.java
diff --git a/src/java/com/threerings/util/KeyDispatcher.java b/src/main/java/com/threerings/util/KeyDispatcher.java
similarity index 100%
rename from src/java/com/threerings/util/KeyDispatcher.java
rename to src/main/java/com/threerings/util/KeyDispatcher.java
diff --git a/src/java/com/threerings/util/KeyTranslator.java b/src/main/java/com/threerings/util/KeyTranslator.java
similarity index 100%
rename from src/java/com/threerings/util/KeyTranslator.java
rename to src/main/java/com/threerings/util/KeyTranslator.java
diff --git a/src/java/com/threerings/util/KeyTranslatorImpl.java b/src/main/java/com/threerings/util/KeyTranslatorImpl.java
similarity index 100%
rename from src/java/com/threerings/util/KeyTranslatorImpl.java
rename to src/main/java/com/threerings/util/KeyTranslatorImpl.java
diff --git a/src/java/com/threerings/util/KeyboardManager.java b/src/main/java/com/threerings/util/KeyboardManager.java
similarity index 100%
rename from src/java/com/threerings/util/KeyboardManager.java
rename to src/main/java/com/threerings/util/KeyboardManager.java
diff --git a/src/java/com/threerings/util/keybd/Keyboard.java b/src/main/java/com/threerings/util/keybd/Keyboard.java
similarity index 100%
rename from src/java/com/threerings/util/keybd/Keyboard.java
rename to src/main/java/com/threerings/util/keybd/Keyboard.java
diff --git a/src/java/com/threerings/util/keybd/Linux/Makefile b/src/main/java/com/threerings/util/keybd/Linux/Makefile
similarity index 100%
rename from src/java/com/threerings/util/keybd/Linux/Makefile
rename to src/main/java/com/threerings/util/keybd/Linux/Makefile
diff --git a/src/java/com/threerings/util/keybd/Linux/com_threerings_util_keybd_Keyboard.c b/src/main/java/com/threerings/util/keybd/Linux/com_threerings_util_keybd_Keyboard.c
similarity index 100%
rename from src/java/com/threerings/util/keybd/Linux/com_threerings_util_keybd_Keyboard.c
rename to src/main/java/com/threerings/util/keybd/Linux/com_threerings_util_keybd_Keyboard.c
diff --git a/src/java/com/threerings/util/keybd/Linux/libkeybd.so b/src/main/java/com/threerings/util/keybd/Linux/libkeybd.so
similarity index 100%
rename from src/java/com/threerings/util/keybd/Linux/libkeybd.so
rename to src/main/java/com/threerings/util/keybd/Linux/libkeybd.so
diff --git a/src/java/com/threerings/util/keybd/Mac OS X/Makefile b/src/main/java/com/threerings/util/keybd/Mac OS X/Makefile
similarity index 100%
rename from src/java/com/threerings/util/keybd/Mac OS X/Makefile
rename to src/main/java/com/threerings/util/keybd/Mac OS X/Makefile
diff --git a/src/java/com/threerings/util/keybd/Windows/Makefile b/src/main/java/com/threerings/util/keybd/Windows/Makefile
similarity index 100%
rename from src/java/com/threerings/util/keybd/Windows/Makefile
rename to src/main/java/com/threerings/util/keybd/Windows/Makefile
diff --git a/src/java/com/threerings/util/keybd/Windows/com_threerings_util_keybd_Keyboard.c b/src/main/java/com/threerings/util/keybd/Windows/com_threerings_util_keybd_Keyboard.c
similarity index 100%
rename from src/java/com/threerings/util/keybd/Windows/com_threerings_util_keybd_Keyboard.c
rename to src/main/java/com/threerings/util/keybd/Windows/com_threerings_util_keybd_Keyboard.c
diff --git a/src/java/com/threerings/util/keybd/com_threerings_util_keybd_Keyboard.h b/src/main/java/com/threerings/util/keybd/com_threerings_util_keybd_Keyboard.h
similarity index 100%
rename from src/java/com/threerings/util/keybd/com_threerings_util_keybd_Keyboard.h
rename to src/main/java/com/threerings/util/keybd/com_threerings_util_keybd_Keyboard.h
diff --git a/src/java/com/threerings/util/unsafe/Darwin b/src/main/java/com/threerings/util/unsafe/Darwin
similarity index 100%
rename from src/java/com/threerings/util/unsafe/Darwin
rename to src/main/java/com/threerings/util/unsafe/Darwin
diff --git a/src/java/com/threerings/util/unsafe/FreeBSD/Makefile b/src/main/java/com/threerings/util/unsafe/FreeBSD/Makefile
similarity index 100%
rename from src/java/com/threerings/util/unsafe/FreeBSD/Makefile
rename to src/main/java/com/threerings/util/unsafe/FreeBSD/Makefile
diff --git a/src/java/com/threerings/util/unsafe/FreeBSD/com_threerings_util_unsafe_Unsafe.c b/src/main/java/com/threerings/util/unsafe/FreeBSD/com_threerings_util_unsafe_Unsafe.c
similarity index 100%
rename from src/java/com/threerings/util/unsafe/FreeBSD/com_threerings_util_unsafe_Unsafe.c
rename to src/main/java/com/threerings/util/unsafe/FreeBSD/com_threerings_util_unsafe_Unsafe.c
diff --git a/src/java/com/threerings/util/unsafe/FreeBSD/libunsafe.so b/src/main/java/com/threerings/util/unsafe/FreeBSD/libunsafe.so
similarity index 100%
rename from src/java/com/threerings/util/unsafe/FreeBSD/libunsafe.so
rename to src/main/java/com/threerings/util/unsafe/FreeBSD/libunsafe.so
diff --git a/src/java/com/threerings/util/unsafe/Linux/Makefile b/src/main/java/com/threerings/util/unsafe/Linux/Makefile
similarity index 100%
rename from src/java/com/threerings/util/unsafe/Linux/Makefile
rename to src/main/java/com/threerings/util/unsafe/Linux/Makefile
diff --git a/src/java/com/threerings/util/unsafe/Linux/com_threerings_util_unsafe_Unsafe.c b/src/main/java/com/threerings/util/unsafe/Linux/com_threerings_util_unsafe_Unsafe.c
similarity index 100%
rename from src/java/com/threerings/util/unsafe/Linux/com_threerings_util_unsafe_Unsafe.c
rename to src/main/java/com/threerings/util/unsafe/Linux/com_threerings_util_unsafe_Unsafe.c
diff --git a/src/java/com/threerings/util/unsafe/Linux/libunsafe.so b/src/main/java/com/threerings/util/unsafe/Linux/libunsafe.so
similarity index 100%
rename from src/java/com/threerings/util/unsafe/Linux/libunsafe.so
rename to src/main/java/com/threerings/util/unsafe/Linux/libunsafe.so
diff --git a/src/java/com/threerings/util/unsafe/Mac OS X/Makefile b/src/main/java/com/threerings/util/unsafe/Mac OS X/Makefile
similarity index 100%
rename from src/java/com/threerings/util/unsafe/Mac OS X/Makefile
rename to src/main/java/com/threerings/util/unsafe/Mac OS X/Makefile
diff --git a/src/java/com/threerings/util/unsafe/Mac OS X/com_threerings_util_unsafe_Unsafe.c b/src/main/java/com/threerings/util/unsafe/Mac OS X/com_threerings_util_unsafe_Unsafe.c
similarity index 100%
rename from src/java/com/threerings/util/unsafe/Mac OS X/com_threerings_util_unsafe_Unsafe.c
rename to src/main/java/com/threerings/util/unsafe/Mac OS X/com_threerings_util_unsafe_Unsafe.c
diff --git a/src/java/com/threerings/util/unsafe/Mac OS X/libunsafe.jnilib b/src/main/java/com/threerings/util/unsafe/Mac OS X/libunsafe.jnilib
similarity index 100%
rename from src/java/com/threerings/util/unsafe/Mac OS X/libunsafe.jnilib
rename to src/main/java/com/threerings/util/unsafe/Mac OS X/libunsafe.jnilib
diff --git a/src/java/com/threerings/util/unsafe/Unsafe.java b/src/main/java/com/threerings/util/unsafe/Unsafe.java
similarity index 100%
rename from src/java/com/threerings/util/unsafe/Unsafe.java
rename to src/main/java/com/threerings/util/unsafe/Unsafe.java
diff --git a/src/java/com/threerings/util/unsafe/Windows/Makefile b/src/main/java/com/threerings/util/unsafe/Windows/Makefile
similarity index 100%
rename from src/java/com/threerings/util/unsafe/Windows/Makefile
rename to src/main/java/com/threerings/util/unsafe/Windows/Makefile
diff --git a/src/java/com/threerings/util/unsafe/Windows/com_threerings_util_unsafe_Unsafe.c b/src/main/java/com/threerings/util/unsafe/Windows/com_threerings_util_unsafe_Unsafe.c
similarity index 100%
rename from src/java/com/threerings/util/unsafe/Windows/com_threerings_util_unsafe_Unsafe.c
rename to src/main/java/com/threerings/util/unsafe/Windows/com_threerings_util_unsafe_Unsafe.c
diff --git a/src/java/com/threerings/util/unsafe/com_threerings_util_unsafe_Unsafe.h b/src/main/java/com/threerings/util/unsafe/com_threerings_util_unsafe_Unsafe.h
similarity index 100%
rename from src/java/com/threerings/util/unsafe/com_threerings_util_unsafe_Unsafe.h
rename to src/main/java/com/threerings/util/unsafe/com_threerings_util_unsafe_Unsafe.h